| Message ID | 20220729210816.267-1-jamrial@gmail.com |
|---|---|
| State | Accepted |
| Commit | 6ca16906439f689e4627b7cb4e6466bd45cc696f |
| Headers | show |
| Series | [FFmpeg-devel] avcodec/alac: don't fail if channels aren't set during init() when extradata is valid | expand |
| Context | Check | Description |
|---|---|---|
| andriy/make_x86 | success | Make finished |
| andriy/make_fate_x86 | success | Make fate finished |
On Sat, Jul 30, 2022 at 12:09 AM James Almer <jamrial@gmail.com> wrote: > > The decoder is meant to use it as a fallback if the value in extradata is > invalid. > > Regression since d199099be. > Had the person doing API client usage who reported this to me test the patch, it fixes the issue. LGTM. Would probably be worth it to back-port this to release/5.1 . Jan
On Sat, 30 Jul 2022, at 11:41, Jan Ekström wrote: > Had the person doing API client usage who reported this to me test the > patch, it fixes the issue. > > LGTM. > > Would probably be worth it to back-port this to release/5.1 . I agree.
On 7/30/2022 7:40 AM, Jean-Baptiste Kempf wrote: > On Sat, 30 Jul 2022, at 11:41, Jan Ekström wrote: >> Had the person doing API client usage who reported this to me test the >> patch, it fixes the issue. >> >> LGTM. >> >> Would probably be worth it to back-port this to release/5.1 . > > I agree. Applied and backported, thanks.
diff --git a/libavcodec/alac.c b/libavcodec/alac.c index b232514169..8b87d78dd3 100644 --- a/libavcodec/alac.c +++ b/libavcodec/alac.c @@ -574,13 +574,15 @@ static av_cold int alac_decode_init(AVCodecContext * avctx) avctx->bits_per_raw_sample = alac->sample_size; avctx->sample_rate = alac->sample_rate; - if (alac->channels < 1 || alac->channels > ALAC_MAX_CHANNELS) { + if (alac->channels < 1) { av_log(avctx, AV_LOG_WARNING, "Invalid channel count\n"); + if (avctx->ch_layout.nb_channels < 1) + return AVERROR(EINVAL); alac->channels = avctx->ch_layout.nb_channels; } - if (avctx->ch_layout.nb_channels > ALAC_MAX_CHANNELS || avctx->ch_layout.nb_channels <= 0 ) { + if (alac->channels > ALAC_MAX_CHANNELS) { avpriv_report_missing_feature(avctx, "Channel count %d", - avctx->ch_layout.nb_channels); + alac->channels); return AVERROR_PATCHWELCOME; } av_channel_layout_uninit(&avctx->ch_layout);
The decoder is meant to use it as a fallback if the value in extradata is invalid. Regression since d199099be. Signed-off-by: James Almer <jamrial@gmail.com> --- libavcodec/alac.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)