Adjust webm and mp4 options to stable 2 audio channels, small refactor