frame_muxer: Use optimal NTSC cadence.

git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/trunk@1923 362d55ac-95cf-4e76-9f9a-cbaa9c17b72d

diff --git a/modules/ffmpeg/producer/muxer/frame_muxer.cpp b/modules/ffmpeg/producer/muxer/frame_muxer.cpp
index 102a66f91b03a702fa4540039b963d3bb82fc429..86143143b7c0ad8509c9477fb32542d74a2d2ee8 100644 (file)
--- a/modules/ffmpeg/producer/muxer/frame_muxer.cpp
+++ b/modules/ffmpeg/producer/muxer/frame_muxer.cpp
@@ -96,8 +96,10 @@ struct frame_muxer::implementation : boost::noncopyable
        {\r
                video_streams_.push(std::queue<safe_ptr<write_frame>>());\r
                audio_streams_.push(core::audio_buffer());\r
-               boost::range::sort(audio_cadence_);\r
-               boost::range::reverse(audio_cadence_);\r
+               \r
+               // Note: Uses 1 step rotated cadence for 1001 modes (1602, 1602, 1601, 1602, 1601)\r
+               // This cadence fills the audio mixer most optimally.\r
+               boost::range::rotate(audio_cadence_, std::end(audio_cadence_)-1);\r
        }\r
 \r
        void push(const std::shared_ptr<AVFrame>& video_frame, int hints)\r