fixed an issue with audio formats that have no channel layout specified - now taking the default layout

Raveler · Raveler · commit d871b7fc07b8 · 2019-07-11T11:26:21.000+02:00
diff --git a/source/ffmpeg-cpp/ffmpeg-cpp/Frame Sinks/Filter.cpp b/source/ffmpeg-cpp/ffmpeg-cpp/Frame Sinks/Filter.cpp
@@ -147,10 +147,12 @@ namespace ffmpegcpp
 		// this is an audio input stream
 		else if (metaData->type == AVMEDIA_TYPE_AUDIO)
 		{
+			uint64_t channelLayout = frame->channel_layout;
+			if (channelLayout == 0) channelLayout = av_get_default_channel_layout(frame->channels);
 			snprintf(args, argsLength,
 				"time_base=%d/%d:sample_rate=%d:sample_fmt=%s:channel_layout=0x%d",
 				metaData->timeBase.num, metaData->timeBase.den, frame->sample_rate,
-				av_get_sample_fmt_name((AVSampleFormat)frame->format), frame->channel_layout);
+				av_get_sample_fmt_name((AVSampleFormat)frame->format), channelLayout);
 		}
 
 		// not supported

Original file line number	Diff line number	Diff line change
`@@ -147,10 +147,12 @@ namespace ffmpegcpp`
`147`	`147`	`// this is an audio input stream`
`148`	`148`	`else if (metaData->type == AVMEDIA_TYPE_AUDIO)`
`149`	`149`	`{`
	`150`	`+ uint64_t channelLayout = frame->channel_layout;`
	`151`	`+ if (channelLayout == 0) channelLayout = av_get_default_channel_layout(frame->channels);`
`150`	`152`	`snprintf(args, argsLength,`
`151`	`153`	`"time_base=%d/%d:sample_rate=%d:sample_fmt=%s:channel_layout=0x%d",`
`152`	`154`	`metaData->timeBase.num, metaData->timeBase.den, frame->sample_rate,`
`153`		`- av_get_sample_fmt_name((AVSampleFormat)frame->format), frame->channel_layout);`
	`155`	`+ av_get_sample_fmt_name((AVSampleFormat)frame->format), channelLayout);`
`154`	`156`	`}`
`155`	`157`
`156`	`158`	`// not supported`