Revert "[servicemp3] simplify finding audio/video sinks"

This reverts commit 3acc4c8700859f8e46f654f254f6eb9d6f5f3aa9.