From patchwork Wed Oct 25 11:12:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 44354 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4999:b0:15d:8365:d4b8 with SMTP id fs25csp323261pzb; Wed, 25 Oct 2023 04:04:39 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFylUXFF4mrym8cYa7zFrjGEo15ize2bv/RfBJ8nPM9L2KwD7tSadHOKFpHz8Cwdwb/H6Wo X-Received: by 2002:a17:907:84d:b0:9ae:588e:142 with SMTP id ww13-20020a170907084d00b009ae588e0142mr11301736ejb.67.1698231878645; Wed, 25 Oct 2023 04:04:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698231878; cv=none; d=google.com; s=arc-20160816; b=I3zN7L4G39UVJBMZ5YHBRrb8g2aOAT5fpE53y8VBDnHGXYBw+1m0F5FFJcuW8Cf1EE c4RR2Pt5ZbdP9eD9XL/yV3IaBEFCTjPmXLK808/QT52i2BKJBzQ8TJQtBH6H9i2YG593 ZnSq5AGjOHfR6fmK6ixpezzOAOFWVmpnFGBpWs4M1PyQB0Qps6NSynG3UaI+yMPaZMpy VR08qnLcgSnkE+wtJaQ/UnXrenetLMwEXjYMG/TJR6+sUqyOme4TGS/Ao/FnepENQHfU tezcU2wMzmDU7xyh0xwNj72INR4j3fhWOx/ULWlZnOTQAO0TjrHtPqkUVCs+wEvPJd2w rtPQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject:to :message-id:date:from:mime-version:dkim-signature:delivered-to; bh=iode+8g9CGcBA+elm+bYHR0vto/qV1CABLTtHH/MPU0=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=whvQ4FphRCpULBrk3HGyF4d9kArI4aFjk6Gg3fTKt0dIi0JIjIGom2N/vI2p3Zl8dZ rzRJV1xcw6dO7PQUraaRWNIOCApUwJyLQt4VtUlhsCQUg1q73tyt+JHcvsbLnuDm5/qf 6kPAGAGqjgPdurFbZ/yYlaYSMUdW1a9aAbduc8vaLmQfKDlgKNJcijFU8KE6BVoQezf0 1Hez+hU7S85EHRSt3Pe0wzPdwYemPHHy5ywnMUE91u2fkR4S5KJ+ZIqkWKly3utEHbNK K08LprHwOx8IhWqZQtBM6crNT9l9kPPdve6FIpqRCpMZtnjkMco/8M+ZZ+Td5uSaIAm+ mfig== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=XGQSsHN9; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id sa39-20020a1709076d2700b0099da220412csi5481023ejc.1053.2023.10.25.04.04.15; Wed, 25 Oct 2023 04:04:38 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=XGQSsHN9; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9E54068CAE7; Wed, 25 Oct 2023 14:04:11 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ua1-f45.google.com (mail-ua1-f45.google.com [209.85.222.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 00A4268C9BB for ; Wed, 25 Oct 2023 14:04:04 +0300 (EEST) Received: by mail-ua1-f45.google.com with SMTP id a1e0cc1a2514c-7b6d6773d05so1991945241.2 for ; Wed, 25 Oct 2023 04:04:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1698231843; x=1698836643; darn=ffmpeg.org; h=to:subject:message-id:date:from:mime-version:from:to:cc:subject :date:message-id:reply-to; bh=OAQCRRWQFy9Z4FF6aZrEK+vAveirznwL5vfEWz3WxbY=; b=XGQSsHN9cbiUHB06QXYEMhLiqjx9GcQjTgGygGLylNtQ4++SzJ/LX9WO9/xC+BKSbF cAyLzIWvvahdqCQMaZ8WsORsLxn0XCMjtvHaQqJoQLjNg7VvkRP6VCqto/8C5LxFxbsI 74JMt/6+JwqeVyC0KrkduSWokesXBwFE3pUuPcpznoB8p8D20BRo1R+Y5c+C0dISK318 xNcsu7TOjvF6UUWL74V49Y5KWjQoa8YLrUPjLTzU/Igdb4OLXThSMNK2WviAGT6myq4m PgU99xlCbm9F9hgztdElDMXnzpTOEwSBv6JyO2N913npV7RY6ihawcRKH4jRKe/UV1uP wI9Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698231843; x=1698836643; h=to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=OAQCRRWQFy9Z4FF6aZrEK+vAveirznwL5vfEWz3WxbY=; b=HpRaY0dOby2XqIf8ZAWwpsK42Hz0aO8c8q236jQY5JqqmTfB/JbktuRzgt44vnpvrE F28MnwyqsgDhLBzbyGThOJPnblCJ2EkFKyIg7BU5eCmuYmETKv6siXG6KbpcgLx9Kwmq xfBZxEsP2TQ6RU1+2NiyZgEG+oOU35DWvzNu9JdGAhU/wColb/sNJ5xX6bU6JYgG7dBZ kE77B4dOau5IcVCnDXr2jzTF56Mv92aSXBR+BThTOp/aAetX98S2EGUHLNEojOhcafSl hN7QdgIZ3k+pKux73Os6czriCj6MpfrZ6tzVmBbIkME7mXAXn4S/14umzUC6fZrsGgUd VSsw== X-Gm-Message-State: AOJu0Ywz+gh9HXJMyTY2Dq5iZEjDE8/pPSKMP5Tax39pHQ8lOWms0Mg/ jfeIK2WazPd30K4LnVEWjvD/vXsJhFNm8UptrEDSf47tKBg= X-Received: by 2002:a67:b703:0:b0:457:c2ff:ad98 with SMTP id h3-20020a67b703000000b00457c2ffad98mr14269107vsf.13.1698231843195; Wed, 25 Oct 2023 04:04:03 -0700 (PDT) MIME-Version: 1.0 From: Paul B Mahol Date: Wed, 25 Oct 2023 13:12:04 +0200 Message-ID: To: FFmpeg development discussions and patches X-Content-Filtered-By: Mailman/MimeDel 2.1.29 Subject: [FFmpeg-devel] [PATCH] avcodec/mlp*: improvements 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: zu6C1Ja8St9C Set attached. From 310979c0394ab8572b34754ae1436537512c5afd Mon Sep 17 00:00:00 2001 From: Paul B Mahol Date: Wed, 25 Oct 2023 11:05:35 +0200 Subject: [PATCH 2/4] avcodec/mlpenc: add 3.1 ch layout support for truehd Signed-off-by: Paul B Mahol --- libavcodec/mlpenc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavcodec/mlpenc.c b/libavcodec/mlpenc.c index 27ef5f2c82..3a7893b3f0 100644 --- a/libavcodec/mlpenc.c +++ b/libavcodec/mlpenc.c @@ -600,6 +600,7 @@ static av_cold int mlp_encode_init(AVCodecContext *avctx) break; case AV_CH_LAYOUT_2POINT1: case AV_CH_LAYOUT_SURROUND: + case AV_CH_LAYOUT_3POINT1: case AV_CH_LAYOUT_5POINT0: case AV_CH_LAYOUT_5POINT1: ctx->ch2_presentation_mod= 0; @@ -2399,12 +2400,13 @@ const FFCodec ff_truehd_encoder = { .p.priv_class = &mlp_class, .p.sample_fmts = (const enum AVSampleFormat[]) {AV_SAMPLE_FMT_S16P, AV_SAMPLE_FMT_S32P, AV_SAMPLE_FMT_NONE}, .p.supported_samplerates = (const int[]) {44100, 48000, 88200, 96000, 176400, 192000, 0}, - CODEC_OLD_CHANNEL_LAYOUTS(AV_CH_LAYOUT_MONO, AV_CH_LAYOUT_STEREO, AV_CH_LAYOUT_2POINT1, AV_CH_LAYOUT_SURROUND, AV_CH_LAYOUT_5POINT0, AV_CH_LAYOUT_5POINT1) + CODEC_OLD_CHANNEL_LAYOUTS(AV_CH_LAYOUT_MONO, AV_CH_LAYOUT_STEREO, AV_CH_LAYOUT_2POINT1, AV_CH_LAYOUT_SURROUND, AV_CH_LAYOUT_3POINT1, AV_CH_LAYOUT_5POINT0, AV_CH_LAYOUT_5POINT1) .p.ch_layouts = (const AVChannelLayout[]) { AV_CHANNEL_LAYOUT_MONO, AV_CHANNEL_LAYOUT_STEREO, AV_CHANNEL_LAYOUT_2POINT1, AV_CHANNEL_LAYOUT_SURROUND, + AV_CHANNEL_LAYOUT_3POINT1, AV_CHANNEL_LAYOUT_5POINT0, AV_CHANNEL_LAYOUT_5POINT1, { 0 } -- 2.42.0