Add clock + revert swresample use.