FS-5519 --resolve
refactor some of the video passthru code