Adding more configuration and code cleanup for video player. #616