| Message ID | GV1P250MB0737539D867988A8DF4ACE758F4A9@GV1P250MB0737.EURP250.PROD.OUTLOOK.COM |
|---|---|
| State | Accepted |
| Commit | 03fb801cd97ab203a6beb5bdfc495f16801cc13e |
| Headers | show |
| Series | [FFmpeg-devel,01/17] avcodec/avcodec: Uninitialize AVChannelLayout before overwriting it | expand |
| Context | Check | Description |
|---|---|---|
| yinshiyou/make_loongarch64 | success | Make finished |
| yinshiyou/make_fate_loongarch64 | success | Make fate finished |
| andriy/make_x86 | success | Make finished |
| andriy/make_fate_x86 | success | Make fate finished |
On 9/18/22, Andreas Rheinhardt <andreas.rheinhardt@outlook.com> wrote: > The encoder actually creates files with side channels, not back > channels. See thd_layout in mlp_parse.h. > > Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> > --- > libavcodec/mlpenc.c | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > lgtm > diff --git a/libavcodec/mlpenc.c b/libavcodec/mlpenc.c > index b66f3a3067..463332593f 100644 > --- a/libavcodec/mlpenc.c > +++ b/libavcodec/mlpenc.c > @@ -628,14 +628,14 @@ static av_cold int mlp_encode_init(AVCodecContext > *avctx) > ctx->channel_arrangement = 1; > ctx->thd_substream_info = 0x14; > } else if (!av_channel_layout_compare(&avctx->ch_layout, > - > &(AVChannelLayout)AV_CHANNEL_LAYOUT_5POINT0_BACK)) { > + > &(AVChannelLayout)AV_CHANNEL_LAYOUT_5POINT0)) { > ctx->ch_modifier_thd0 = 1; > ctx->ch_modifier_thd1 = 1; > ctx->ch_modifier_thd2 = 1; > ctx->channel_arrangement = 11; > ctx->thd_substream_info = 0x104; > } else if (!av_channel_layout_compare(&avctx->ch_layout, > - > &(AVChannelLayout)AV_CHANNEL_LAYOUT_5POINT1_BACK)) { > + > &(AVChannelLayout)AV_CHANNEL_LAYOUT_5POINT1)) { > ctx->ch_modifier_thd0 = 2; > ctx->ch_modifier_thd1 = 1; > ctx->ch_modifier_thd2 = 2; > @@ -2277,13 +2277,13 @@ const FFCodec ff_truehd_encoder = { > .p.sample_fmts = (const enum AVSampleFormat[]) > {AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_S32, AV_SAMPLE_FMT_NONE}, > .p.supported_samplerates = (const int[]) {44100, 48000, 88200, 96000, > 176400, 192000, 0}, > #if FF_API_OLD_CHANNEL_LAYOUT > - .p.channel_layouts = (const uint64_t[]) {AV_CH_LAYOUT_MONO, > AV_CH_LAYOUT_STEREO, AV_CH_LAYOUT_5POINT0_BACK, AV_CH_LAYOUT_5POINT1_BACK, > 0}, > + .p.channel_layouts = (const uint64_t[]) { AV_CH_LAYOUT_MONO, > AV_CH_LAYOUT_STEREO, AV_CH_LAYOUT_5POINT0, AV_CH_LAYOUT_5POINT1, 0 }, > #endif > .p.ch_layouts = (const AVChannelLayout[]) { > AV_CHANNEL_LAYOUT_MONO, > AV_CHANNEL_LAYOUT_STEREO, > - AV_CHANNEL_LAYOUT_5POINT0_BACK, > - AV_CHANNEL_LAYOUT_5POINT1_BACK, > + AV_CHANNEL_LAYOUT_5POINT0, > + AV_CHANNEL_LAYOUT_5POINT1, > { 0 } > }, > .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, > -- > 2.34.1 > > _______________________________________________ > 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". >
diff --git a/libavcodec/mlpenc.c b/libavcodec/mlpenc.c index b66f3a3067..463332593f 100644 --- a/libavcodec/mlpenc.c +++ b/libavcodec/mlpenc.c @@ -628,14 +628,14 @@ static av_cold int mlp_encode_init(AVCodecContext *avctx) ctx->channel_arrangement = 1; ctx->thd_substream_info = 0x14; } else if (!av_channel_layout_compare(&avctx->ch_layout, - &(AVChannelLayout)AV_CHANNEL_LAYOUT_5POINT0_BACK)) { + &(AVChannelLayout)AV_CHANNEL_LAYOUT_5POINT0)) { ctx->ch_modifier_thd0 = 1; ctx->ch_modifier_thd1 = 1; ctx->ch_modifier_thd2 = 1; ctx->channel_arrangement = 11; ctx->thd_substream_info = 0x104; } else if (!av_channel_layout_compare(&avctx->ch_layout, - &(AVChannelLayout)AV_CHANNEL_LAYOUT_5POINT1_BACK)) { + &(AVChannelLayout)AV_CHANNEL_LAYOUT_5POINT1)) { ctx->ch_modifier_thd0 = 2; ctx->ch_modifier_thd1 = 1; ctx->ch_modifier_thd2 = 2; @@ -2277,13 +2277,13 @@ const FFCodec ff_truehd_encoder = { .p.sample_fmts = (const enum AVSampleFormat[]) {AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_S32, AV_SAMPLE_FMT_NONE}, .p.supported_samplerates = (const int[]) {44100, 48000, 88200, 96000, 176400, 192000, 0}, #if FF_API_OLD_CHANNEL_LAYOUT - .p.channel_layouts = (const uint64_t[]) {AV_CH_LAYOUT_MONO, AV_CH_LAYOUT_STEREO, AV_CH_LAYOUT_5POINT0_BACK, AV_CH_LAYOUT_5POINT1_BACK, 0}, + .p.channel_layouts = (const uint64_t[]) { AV_CH_LAYOUT_MONO, AV_CH_LAYOUT_STEREO, AV_CH_LAYOUT_5POINT0, AV_CH_LAYOUT_5POINT1, 0 }, #endif .p.ch_layouts = (const AVChannelLayout[]) { AV_CHANNEL_LAYOUT_MONO, AV_CHANNEL_LAYOUT_STEREO, - AV_CHANNEL_LAYOUT_5POINT0_BACK, - AV_CHANNEL_LAYOUT_5POINT1_BACK, + AV_CHANNEL_LAYOUT_5POINT0, + AV_CHANNEL_LAYOUT_5POINT1, { 0 } }, .caps_internal = FF_CODEC_CAP_INIT_CLEANUP,
The encoder actually creates files with side channels, not back channels. See thd_layout in mlp_parse.h. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> --- libavcodec/mlpenc.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)