[ffmpeg] use implicit constructor of video_format_desc for clarity

[casparcg] / modules / ffmpeg / ffmpeg_pipeline_backend_internal.cpp

diff --git a/modules/ffmpeg/ffmpeg_pipeline_backend_internal.cpp b/modules/ffmpeg/ffmpeg_pipeline_backend_internal.cpp
index f512ebfdc9133812929555fa32c7f537f323c8c7..a652689433988d1df09f76c1dc363c13810e82b9 100644 (file)
--- a/modules/ffmpeg/ffmpeg_pipeline_backend_internal.cpp
+++ b/modules/ffmpeg/ffmpeg_pipeline_backend_internal.cpp
@@ -17,6 +17,7 @@
 * along with CasparCG. If not, see <http://www.gnu.org/licenses/>.
 *
 * Author: Helge Norberg, helge.norberg@svt.se
+* Author: Robert Nagy, ronag89@gmail.com
 */
 
 #include "StdAfx.h"
@@ -181,7 +182,7 @@ public:
                {
                        try
                        {
-                               audio_decoders_.push_back(spl::make_shared<audio_decoder>(*input_, core::video_format_desc(), i));
+                               audio_decoders_.push_back(spl::make_shared<audio_decoder>(*input_, core::video_format::invalid, i));
                        }
                        catch (...)
                        {
@@ -859,8 +860,9 @@ public:
 
 struct audio_stream_info
 {
-       int                             num_channels = 0;
-       AVSampleFormat  sampleformat = AVSampleFormat::AV_SAMPLE_FMT_NONE;
+       int                             num_channels    = 0;
+       AVSampleFormat  sampleformat    = AVSampleFormat::AV_SAMPLE_FMT_NONE;
+       uint64_t                channel_layout  = 0;
 };
 
 struct video_stream_info
@@ -1193,8 +1195,13 @@ private:
                        auto& av_frame  = *av_frames_per_stream.at(i);
                        auto& stream    = source_audio_streams_.at(i);
 
+                       auto channel_layout = av_frame.channel_layout == 0
+                                       ? av_get_default_channel_layout(av_frame.channels)
+                                       : av_frame.channel_layout;
+
                        set_if_changed(changed, stream.sampleformat, static_cast<AVSampleFormat>(av_frame.format));
                        set_if_changed(changed, stream.num_channels, av_frame.channels);
+                       set_if_changed(changed, stream.channel_layout, channel_layout);
                }
 
                if (changed)
@@ -1212,7 +1219,7 @@ private:
                                        boost::rational<int>(1, source_->samplerate()),
                                        source_->samplerate(),
                                        source_audio_stream.sampleformat,
-                                       av_get_default_channel_layout(source_audio_stream.num_channels));
+                                       source_audio_stream.channel_layout);
                }
 
                auto total_num_channels = cpplinq::from(source_audio_streams_)