Revert "Only lock  when needed."

This reverts commit 1c20855f29274068d9d0570b2df776ac423445ea.
Enhancement to video stream input thread