Revert "Remove osc encoder thread:"

Doesn't make any clear improvement of perf and will potentially create
race conditions. Hold back this kind of thing until post v2.1

This reverts commit b504d7b86dd404f0217d1a15aece63730c85f67c.