[FFmpeg-devel] [PATCH] avformat/riffdec: don't unconditionally overwrite WAVEFORMATEXTENSIBLE layout

[FFmpeg-devel] [PATCH] avformat/riffdec: don't unconditionally overwrite WAVEFORMATEXTENSIBLE layout

[James Almer]

Do it only if the value conflicts with the previous channels value.
Fixes ticket #9912

Signed-off-by: James Almer <jamrial@gmail.com>
---
 libavformat/riffdec.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/libavformat/riffdec.c b/libavformat/riffdec.c
index 3946ecb72f..aef6b6625a 100644
--- a/libavformat/riffdec.c
+++ b/libavformat/riffdec.c
@@ -102,6 +102,8 @@ int ff_get_wav_header(AVFormatContext *s, AVIOContext *pb,
         return AVERROR_INVALIDDATA;
     }
 
+    av_channel_layout_uninit(&par->ch_layout);
+
     par->codec_type  = AVMEDIA_TYPE_AUDIO;
     if (!big_endian) {
         id                 = avio_rl16(pb);
@@ -189,9 +191,13 @@ int ff_get_wav_header(AVFormatContext *s, AVIOContext *pb,
     if (par->codec_id == AV_CODEC_ID_ADPCM_G726 && par->sample_rate)
         par->bits_per_coded_sample = par->bit_rate / par->sample_rate;
 
-    av_channel_layout_uninit(&par->ch_layout);
-    par->ch_layout.order       = AV_CHANNEL_ORDER_UNSPEC;
-    par->ch_layout.nb_channels = channels;
+    /* ignore WAVEFORMATEXTENSIBLE layout if different from channel count */
+    if (par->ch_layout.order == AV_CHANNEL_ORDER_NATIVE &&
+        channels != par->ch_layout.nb_channels) {
+        av_channel_layout_uninit(&par->ch_layout);
+        par->ch_layout.order       = AV_CHANNEL_ORDER_UNSPEC;
+        par->ch_layout.nb_channels = channels;
+    }
 
     return 0;
 }
-- 
2.37.2

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

[FFmpeg-devel] [PATCH v2] avformat/riffdec: don't unconditionally overwrite WAVEFORMATEXTENSIBLE layout

[James Almer]

Do it only if the value conflicts with the previous channels value.

Fixes ticket #9912

Signed-off-by: James Almer <jamrial@gmail.com>
---
 libavformat/riffdec.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/libavformat/riffdec.c b/libavformat/riffdec.c
index 3946ecb72f..c1e4a04550 100644
--- a/libavformat/riffdec.c
+++ b/libavformat/riffdec.c
@@ -102,6 +102,8 @@ int ff_get_wav_header(AVFormatContext *s, AVIOContext *pb,
         return AVERROR_INVALIDDATA;
     }
 
+    av_channel_layout_uninit(&par->ch_layout);
+
     par->codec_type  = AVMEDIA_TYPE_AUDIO;
     if (!big_endian) {
         id                 = avio_rl16(pb);
@@ -189,9 +191,12 @@ int ff_get_wav_header(AVFormatContext *s, AVIOContext *pb,
     if (par->codec_id == AV_CODEC_ID_ADPCM_G726 && par->sample_rate)
         par->bits_per_coded_sample = par->bit_rate / par->sample_rate;
 
-    av_channel_layout_uninit(&par->ch_layout);
-    par->ch_layout.order       = AV_CHANNEL_ORDER_UNSPEC;
-    par->ch_layout.nb_channels = channels;
+    /* ignore WAVEFORMATEXTENSIBLE layout if different from channel count */
+    if (channels != par->ch_layout.nb_channels) {
+        av_channel_layout_uninit(&par->ch_layout);
+        par->ch_layout.order       = AV_CHANNEL_ORDER_UNSPEC;
+        par->ch_layout.nb_channels = channels;
+    }
 
     return 0;
 }
-- 
2.37.2

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

Re: [FFmpeg-devel] [PATCH v2] avformat/riffdec: don't unconditionally overwrite WAVEFORMATEXTENSIBLE layout

[James Almer]

On 9/10/2022 10:56 AM, James Almer wrote:
> Do it only if the value conflicts with the previous channels value.
> 
> Fixes ticket #9912
> 
> Signed-off-by: James Almer <jamrial@gmail.com>
> ---
>   libavformat/riffdec.c | 11 ++++++++---
>   1 file changed, 8 insertions(+), 3 deletions(-)
> 
> diff --git a/libavformat/riffdec.c b/libavformat/riffdec.c
> index 3946ecb72f..c1e4a04550 100644
> --- a/libavformat/riffdec.c
> +++ b/libavformat/riffdec.c
> @@ -102,6 +102,8 @@ int ff_get_wav_header(AVFormatContext *s, AVIOContext *pb,
>           return AVERROR_INVALIDDATA;
>       }
>   
> +    av_channel_layout_uninit(&par->ch_layout);
> +
>       par->codec_type  = AVMEDIA_TYPE_AUDIO;
>       if (!big_endian) {
>           id                 = avio_rl16(pb);
> @@ -189,9 +191,12 @@ int ff_get_wav_header(AVFormatContext *s, AVIOContext *pb,
>       if (par->codec_id == AV_CODEC_ID_ADPCM_G726 && par->sample_rate)
>           par->bits_per_coded_sample = par->bit_rate / par->sample_rate;
>   
> -    av_channel_layout_uninit(&par->ch_layout);
> -    par->ch_layout.order       = AV_CHANNEL_ORDER_UNSPEC;
> -    par->ch_layout.nb_channels = channels;
> +    /* ignore WAVEFORMATEXTENSIBLE layout if different from channel count */
> +    if (channels != par->ch_layout.nb_channels) {
> +        av_channel_layout_uninit(&par->ch_layout);
> +        par->ch_layout.order       = AV_CHANNEL_ORDER_UNSPEC;
> +        par->ch_layout.nb_channels = channels;
> +    }
>   
>       return 0;
>   }

Will apply
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".