Revert "Add videoWrapper"

This reverts commit 8c786af0071cb1976f9a447dee19c09644829c9e.
Revert "Revert "Add videoWrapper""

This reverts commit 8a3588e93fa5e329d146dff04cbeca419e843f05.