LSMASHAudioSource: initialize channel layout only if necessary (#63)

Asd-g · Asd-g · commit 2689e4ac2fa6 · 2024-04-08T04:41:36.000+03:00
diff --git a/common/libavsmash.c b/common/libavsmash.c
@@ -925,7 +925,10 @@ void update_configuration
             lsmash_audio_summary_t *audio = (lsmash_audio_summary_t *)summary;
             codecpar->sample_rate           = config->queue.sample_rate     ? config->queue.sample_rate     : audio->frequency;
             codecpar->bits_per_coded_sample = config->queue.bits_per_sample ? config->queue.bits_per_sample : audio->sample_size;
-            av_channel_layout_default(&codecpar->ch_layout, config->queue.channels ? config->queue.channels : audio->channels);
+            if (config->queue.channels)
+                av_channel_layout_default(&codecpar->ch_layout, config->queue.channels);
+            else if (codecpar->ch_layout.order == AV_CHANNEL_ORDER_UNSPEC)
+                av_channel_layout_default(&codecpar->ch_layout, audio->channels);
         }
         if( codec->id == AV_CODEC_ID_DTS )
         {

Original file line number	Diff line number	Diff line change
`@@ -925,7 +925,10 @@ void update_configuration`
`925`	`925`	`lsmash_audio_summary_t audio = (lsmash_audio_summary_t )summary;`
`926`	`926`	`codecpar->sample_rate = config->queue.sample_rate ? config->queue.sample_rate : audio->frequency;`
`927`	`927`	`codecpar->bits_per_coded_sample = config->queue.bits_per_sample ? config->queue.bits_per_sample : audio->sample_size;`
`928`		`- av_channel_layout_default(&codecpar->ch_layout, config->queue.channels ? config->queue.channels : audio->channels);`
	`928`	`+ if (config->queue.channels)`
	`929`	`+ av_channel_layout_default(&codecpar->ch_layout, config->queue.channels);`
	`930`	`+ else if (codecpar->ch_layout.order == AV_CHANNEL_ORDER_UNSPEC)`
	`931`	`+ av_channel_layout_default(&codecpar->ch_layout, audio->channels);`
`929`	`932`	`}`
`930`	`933`	`if( codec->id == AV_CODEC_ID_DTS )`
`931`	`934`	`{`