diff options
| author | James Almer <jamrial@gmail.com> | 2023-07-23 17:14:54 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2023-07-25 14:13:42 -0300 |
| commit | c92948de407d30ab25ae40f0ef7a7c7cafb9b6f9 (patch) | |
| tree | f59131fd40d093d174473baf9020c099a4bf5e9b | |
| parent | d383ae43c266b160348db04f2fd17ccf30286784 (diff) | |
| download | ffmpeg-c92948de407d30ab25ae40f0ef7a7c7cafb9b6f9.tar.gz | |
avcodec/decode: consistently set channel info when parsing param change side data
avctx->ch_layout was being left unchanged.
Signed-off-by: James Almer <jamrial@gmail.com>
| -rw-r--r-- | libavcodec/decode.c | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/libavcodec/decode.c b/libavcodec/decode.c index f0e6acc03e..53c90cddb7 100644 --- a/libavcodec/decode.c +++ b/libavcodec/decode.c @@ -104,15 +104,26 @@ FF_DISABLE_DEPRECATION_WARNINGS ret = AVERROR_INVALIDDATA; goto fail2; } - avctx->channels = val; + av_channel_layout_uninit(&avctx->ch_layout); + avctx->ch_layout.nb_channels = val; + avctx->ch_layout.order = AV_CHANNEL_ORDER_UNSPEC; size -= 4; } if (flags & AV_SIDE_DATA_PARAM_CHANGE_CHANNEL_LAYOUT) { if (size < 8) goto fail; - avctx->channel_layout = bytestream_get_le64(&data); + av_channel_layout_uninit(&avctx->ch_layout); + ret = av_channel_layout_from_mask(&avctx->ch_layout, bytestream_get_le64(&data)); + if (ret < 0) + goto fail2; size -= 8; } + if (flags & (AV_SIDE_DATA_PARAM_CHANGE_CHANNEL_COUNT | + AV_SIDE_DATA_PARAM_CHANGE_CHANNEL_LAYOUT)) { + avctx->channels = avctx->ch_layout.nb_channels; + avctx->channel_layout = (avctx->ch_layout.order == AV_CHANNEL_ORDER_NATIVE) ? + avctx->ch_layout.u.mask : 0; + } FF_ENABLE_DEPRECATION_WARNINGS #endif if (flags & AV_SIDE_DATA_PARAM_CHANGE_SAMPLE_RATE) { |