From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 3E869446D4 for ; Wed, 21 Sep 2022 07:14:04 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 53F2368BB52; Wed, 21 Sep 2022 10:14:01 +0300 (EEST) Received: from mail-yw1-f182.google.com (mail-yw1-f182.google.com [209.85.128.182]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 16FFB68B7BF for ; Wed, 21 Sep 2022 10:13:55 +0300 (EEST) Received: by mail-yw1-f182.google.com with SMTP id 00721157ae682-3450a7358baso53541547b3.13 for ; Wed, 21 Sep 2022 00:13:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=cc:to:subject:message-id:date:from:references:in-reply-to :mime-version:from:to:cc:subject:date; bh=trGV6zs7qDgGpFC8EjFjDlNd2SaDwQ51jR2no5eFkoo=; b=dZmK3I8v/bZebrh+0PuTpymb9B/caE2aXfGqt+qsuo0hPICfggUMCLc12p9ZnJ2qoL Y0HPEeA1s8+vWx+/5tcOhfe+ywL1pXeJWJKywflPG86LT8tIf2wJh2FKCPpYApfzLb47 Vvd9z6fDUQI/wTquu7jI8FtWcejcnmbaBtzjThFTARUzvYVSpprfnB4dn/Eg6x86AWrC SxrWp6+uJ23tr0ZA+YhzS8u26uP5p/cx61Z5QrGZxtktB2jBWdxOZpnr6BsNVHNvL9MV Aad5bL0x/ovojDkigNSoyX+Y412ikPvMTGkDp5uTtSO+ZVbS5TlPNfRF7JRHrtVMOQYc p60w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:subject:message-id:date:from:references:in-reply-to :mime-version:x-gm-message-state:from:to:cc:subject:date; bh=trGV6zs7qDgGpFC8EjFjDlNd2SaDwQ51jR2no5eFkoo=; b=xpo0XOPmwZ5Tu41ApiTcoXVgkdjI0C2K8GDTPf5eLkaj/in2j59eNi4DBDb7AXhTE1 jWBJvDKi95Nja4dXPTl984t3MlsV0oB4J5x25m9bu2Ee93vdP+wq/nu/yspV+deDG5JF grh7Qgkd91JgJa6oJWMXiZ169eFfOD5DvlgHbTpXgotnP7rJkq2oYiWRY/a1Pg0Suf6h sbnyeer15OBmJG/Nd+9NJaIiNZpyjBELChaaD6hl9JYjbVDgnrGMNYa8NiPhy2w9uQzX 6gH/AgwQyyPMipdtAtB3uZAE+61NnxLidmn5yXXwU/RD8eJLQxv+O/cmzWYj2PnvAOKv aukg== X-Gm-Message-State: ACrzQf3nwpMXQeJ08qSctXltS5p9A70VT30ujLDBfkzddG0zDEd5QPx5 B4Y6mFraQhGKb41jkpqNbYpghehK2SBa1Q1WwRj8rIDR X-Google-Smtp-Source: AMsMyM4meNzdDSvL+8dJi2Gx5mqji4T1oxeBNvLjna+IvvxNfGpSxnZaeq8lIfO6kgfA43De5Xu0qGa/fPE4rlZluZo= X-Received: by 2002:a81:6f57:0:b0:349:e6a5:75f8 with SMTP id k84-20020a816f57000000b00349e6a575f8mr22798836ywc.40.1663744433516; Wed, 21 Sep 2022 00:13:53 -0700 (PDT) MIME-Version: 1.0 Received: by 2002:a81:7402:0:0:0:0:0 with HTTP; Wed, 21 Sep 2022 00:13:53 -0700 (PDT) In-Reply-To: References: From: Paul B Mahol Date: Wed, 21 Sep 2022 09:13:53 +0200 Message-ID: To: FFmpeg development discussions and patches Subject: Re: [FFmpeg-devel] [PATCH 13/17] avcodec/mlpenc: Fix channel layouts X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Andreas Rheinhardt Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On 9/18/22, Andreas Rheinhardt wrote: > The encoder actually creates files with side channels, not back > channels. See thd_layout in mlp_parse.h. > > Signed-off-by: Andreas Rheinhardt > --- > 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". > _______________________________________________ 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".