From: Dimitry Ishenko Date: Thu, 17 Nov 2016 14:36:04 +0000 (-0500) Subject: [ffmpeg_producer] Increase stream buffer size limit to 120 X-Git-Tag: 2.1.0_Beta2~141^2 X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=6e37731bea8024650aa8c55440b4597d19f842ac;p=casparcg [ffmpeg_producer] Increase stream buffer size limit to 120 --- diff --git a/modules/ffmpeg/producer/muxer/frame_muxer.cpp b/modules/ffmpeg/producer/muxer/frame_muxer.cpp index 6d7b6342e..0ee507054 100644 --- a/modules/ffmpeg/producer/muxer/frame_muxer.cpp +++ b/modules/ffmpeg/producer/muxer/frame_muxer.cpp @@ -129,6 +129,7 @@ std::unique_ptr create_amerge_filter(std::vector struct frame_muxer::impl : boost::noncopyable { + static constexpr std::size_t max_stream_size = 120; std::queue> video_streams_; std::queue audio_streams_; std::queue frame_buffer_; @@ -221,7 +222,7 @@ struct frame_muxer::impl : boost::noncopyable } } - if (video_streams_.back().size() > 32) + if (video_streams_.back().size() > max_stream_size) CASPAR_THROW_EXCEPTION(invalid_operation() << source_info("frame_muxer") << msg_info("video-stream overflow. This can be caused by incorrect frame-rate. Check clip meta-data.")); } @@ -263,7 +264,7 @@ struct frame_muxer::impl : boost::noncopyable } } - if (audio_streams_.back().size() > 32 * audio_cadence_.front() * audio_channel_layout_.num_channels) + if (audio_streams_.back().size() > max_stream_size * audio_cadence_.front() * audio_channel_layout_.num_channels) CASPAR_THROW_EXCEPTION(invalid_operation() << source_info("frame_muxer") << msg_info("audio-stream overflow. This can be caused by incorrect frame-rate. Check clip meta-data.")); }