Merge "Vts: refactor encoder code"