From patchwork Sat Feb 18 01:14:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marth64 X-Patchwork-Id: 40432 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:5494:b0:bf:7b3a:fd32 with SMTP id i20csp252734pzk; Fri, 17 Feb 2023 17:15:23 -0800 (PST) X-Google-Smtp-Source: AK7set+J0ZTi+O4bUOGpr1BddkTvVPOgDD6nYmjFE16SXPJbtKO43ECBSoL5mjVHCK4FA0DQuNSy X-Received: by 2002:a17:907:7b84:b0:881:f614:44ed with SMTP id ne4-20020a1709077b8400b00881f61444edmr1744535ejc.30.1676682923371; Fri, 17 Feb 2023 17:15:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676682923; cv=none; d=google.com; s=arc-20160816; b=gJdkqP5ozxCqIJ6h6RtCajU1gkGC58QSQ8jbBJk6zTJsbliKT50zmDrtQ5EIKH8p9k RUWIdoLD9NRRcyS+VIzxRB08tYL3kY2qQGjILsUg2pr1AHgaLZPYmiIratB4u0Zv7zBg 3FZ/JwyC8tVsI+QqZXtC/4WiYPprclJmu5CuV3JfUTchj2HyW0S5u75bqoQorr4N6+pU en6iNlgl3zVUZ63Dh3gEaM27pNFr4R4pGrw9VIIqYjp6Q7Y7/PJdFVACbay6xgPjvmOP NErs48yXTufnYMnK4ZESqsMlEb5U4F9AwX3v49XnR3jDVBhynE8rZnvgkyu7B1nny9pH khOw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:delivered-to; bh=MzyKCVFCvpSr0H8Pta8N/0MxKP3a33IrLDaBw6gmLSg=; b=weym/AcdZgV2lJWMc2/i6h1EtJpvdYKReae0VIkIkFH1kTukhmcLxpgwnrkbz170gC dXLOx4sNGRM8kQ9Nwq6/xY6E0lIdgh53hejrsNZ/KZZZMUs+Xkm1DqRuqK2oW9KY/1N+ NUGEG9Y+b28ojsfxH2ws9OqG9/RaobmnOXuWLnqQR25p/iOe+IRn7K0E3GbPMrwPGQ3H 47VBiQACWKt5E6Ik2E+WtkazY1vE3ZaMsDjcRHsv2iOOOLCSHwTkcVNBBWOGU2zZykl+ d0GMc4wEYh4eZHQHD9Q+uQoIps1xJ1HQWEwX38X6KQhH1iQJ1kYzflmBfqQ6+HdaNmU+ /GhA== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 26-20020a170906021a00b008b178578178si5435510ejd.576.2023.02.17.17.15.22; Fri, 17 Feb 2023 17:15:23 -0800 (PST) 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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 29E6068BE68; Sat, 18 Feb 2023 03:15:19 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f182.google.com (mail-qt1-f182.google.com [209.85.160.182]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E266568BCBC for ; Sat, 18 Feb 2023 03:15:12 +0200 (EET) Received: by mail-qt1-f182.google.com with SMTP id m11so2334983qtp.7 for ; Fri, 17 Feb 2023 17:15:12 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1676682911; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=GwolFvj5FzNAx8MqKKbfH/hB2WeQwOIxk3FPkQCeazY=; b=dO2AdEWXhNAzEBssy5Esmh+0dez9L9WGoUkmswH9qDLGgRFosKYjm3x6uarZ5C9iUH oqvSMYYhVWUTPr6VuiCPaeykZX+ehGo2wzIsf/LACIAjxK/uCx/8BpyFwvNlwb89Zem2 PCn4ntNJgnsCzmLLozlcWZPV5tyk7oU70gMnuuJRrk2WDvxQSYYGgweDu49SR4NBQK91 kNu0eamXRUzM988z1+Wpx8zT4zWGNxd12/kZODMU/eO7J67X7YOQK2gpbgGu8rPQ/fD/ S2PXF9BguD+6boItBNlaUWmUAY6zjDhSEMS8no/bbOvN8YNmvhN0pfIS8OBMCcMzW6Yr DqIg== X-Gm-Message-State: AO0yUKVXkIMgdL1ytnlUz1RDXfe7h77ZDxrsJoNq4kd3pM15CqpnuBvY X1n06j24h2ZdMBHwumjULXCvuFInST9+lxHurNTqYUuxSVimodss7/+pZFwBwKi7FP4AolutdcE J0yvmDZcWyUmIaTgTgjpbRAal1hDsGyrvjGsn8fP1X/jHDHbofOUGfIMgHYSWg9uMs7NW+A== X-Received: by 2002:ac8:590d:0:b0:3bb:75c7:9326 with SMTP id 13-20020ac8590d000000b003bb75c79326mr6160272qty.0.1676682910932; Fri, 17 Feb 2023 17:15:10 -0800 (PST) Received: from localhost.localdomain ([76.141.0.17]) by smtp.gmail.com with ESMTPSA id u127-20020a372e85000000b006fec1c0754csm4266297qkh.87.2023.02.17.17.15.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Feb 2023 17:15:10 -0800 (PST) From: Marth64 To: ffmpeg-devel@ffmpeg.org Date: Fri, 17 Feb 2023 19:14:54 -0600 Message-Id: <20230218011457.346660-1-marth64@proxyid.net> X-Mailer: git-send-email 2.25.1 In-Reply-To: <306450> References: <306450> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 1/4] avcodec/eac3dec: add detection of Atmos spatial extension profile 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: Marth64 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: ExRkWHRdueh8 Signed-off-by: Marth64 --- libavcodec/ac3dec.c | 3 +++ libavcodec/ac3dec.h | 1 + libavcodec/avcodec.h | 2 ++ libavcodec/codec_desc.c | 1 + libavcodec/eac3dec.c | 11 ++++++++++- libavcodec/profiles.c | 5 +++++ libavcodec/profiles.h | 1 + 7 files changed, 23 insertions(+), 1 deletion(-) diff --git a/libavcodec/ac3dec.c b/libavcodec/ac3dec.c index 0b120e6140..8cede139b8 100644 --- a/libavcodec/ac3dec.c +++ b/libavcodec/ac3dec.c @@ -1714,6 +1714,9 @@ skip: if (!err) { avctx->sample_rate = s->sample_rate; avctx->bit_rate = s->bit_rate + s->prev_bit_rate; + + if (s->eac3_extension_type_a == 1) + avctx->profile = FF_PROFILE_EAC3_DDP_ATMOS; } if (!avctx->sample_rate) { diff --git a/libavcodec/ac3dec.h b/libavcodec/ac3dec.h index 138b462abb..0829f4b40d 100644 --- a/libavcodec/ac3dec.h +++ b/libavcodec/ac3dec.h @@ -102,6 +102,7 @@ typedef struct AC3DecodeContext { int eac3; ///< indicates if current frame is E-AC-3 int eac3_frame_dependent_found; ///< bitstream has E-AC-3 dependent frame(s) int eac3_subsbtreamid_found; ///< bitstream has E-AC-3 additional substream(s) + int eac3_extension_type_a; ///< bitstream has E-AC-3 extension type A enabled frame(s) int dolby_surround_mode; ///< dolby surround mode (dsurmod) int dolby_surround_ex_mode; ///< dolby surround ex mode (dsurexmod) int dolby_headphone_mode; ///< dolby headphone mode (dheadphonmod) diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 39881a1d2b..0e85dd50a4 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -1591,6 +1591,8 @@ typedef struct AVCodecContext { #define FF_PROFILE_DTS_HD_MA 60 #define FF_PROFILE_DTS_EXPRESS 70 +#define FF_PROFILE_EAC3_DDP_ATMOS 30 + #define FF_PROFILE_MPEG2_422 0 #define FF_PROFILE_MPEG2_HIGH 1 #define FF_PROFILE_MPEG2_SS 2 diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c index 199f62df15..4098d4f5a5 100644 --- a/libavcodec/codec_desc.c +++ b/libavcodec/codec_desc.c @@ -2931,6 +2931,7 @@ static const AVCodecDescriptor codec_descriptors[] = { .name = "eac3", .long_name = NULL_IF_CONFIG_SMALL("ATSC A/52B (AC-3, E-AC-3)"), .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY, + .profiles = NULL_IF_CONFIG_SMALL(ff_eac3_profiles), }, { .id = AV_CODEC_ID_SIPR, diff --git a/libavcodec/eac3dec.c b/libavcodec/eac3dec.c index deca51dd3d..5c71751a0c 100644 --- a/libavcodec/eac3dec.c +++ b/libavcodec/eac3dec.c @@ -464,7 +464,16 @@ static int ff_eac3_parse_header(AC3DecodeContext *s) if (get_bits1(gbc)) { int addbsil = get_bits(gbc, 6); for (i = 0; i < addbsil + 1; i++) { - skip_bits(gbc, 8); // skip additional bit stream info + if (i == 0) { + /* In this 8 bit chunk, the LSB is equal to flag_ec3_extension_type_a + which can be used to detect Atmos presence */ + skip_bits(gbc, 7); + if (get_bits1(gbc)) { + s->eac3_extension_type_a = 1; + } + } else { + skip_bits(gbc, 8); // skip additional bit stream info + } } } diff --git a/libavcodec/profiles.c b/libavcodec/profiles.c index 7af7fbeb13..343b08f363 100644 --- a/libavcodec/profiles.c +++ b/libavcodec/profiles.c @@ -45,6 +45,11 @@ const AVProfile ff_dca_profiles[] = { { FF_PROFILE_UNKNOWN }, }; +const AVProfile ff_eac3_profiles[] = { + { FF_PROFILE_EAC3_DDP_ATMOS, "Dolby Digital Plus + Dolby Atmos"}, + { FF_PROFILE_UNKNOWN }, +}; + const AVProfile ff_dnxhd_profiles[] = { { FF_PROFILE_DNXHD, "DNXHD"}, { FF_PROFILE_DNXHR_LB, "DNXHR LB"}, diff --git a/libavcodec/profiles.h b/libavcodec/profiles.h index 41a19aa9ad..6ebedbd03f 100644 --- a/libavcodec/profiles.h +++ b/libavcodec/profiles.h @@ -58,6 +58,7 @@ extern const AVProfile ff_aac_profiles[]; extern const AVProfile ff_dca_profiles[]; +extern const AVProfile ff_eac3_profiles[]; extern const AVProfile ff_dnxhd_profiles[]; extern const AVProfile ff_h264_profiles[]; extern const AVProfile ff_hevc_profiles[]; From patchwork Sat Feb 18 01:14:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marth64 X-Patchwork-Id: 40433 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:5494:b0:bf:7b3a:fd32 with SMTP id i20csp252813pzk; Fri, 17 Feb 2023 17:15:33 -0800 (PST) X-Google-Smtp-Source: AK7set+YifPF43Ux+S/tzR2BENOgMvqaDWTU68sH39JyCSjweuTzM+HXC/D3xz9OiDX75VK/rVJ1 X-Received: by 2002:a50:ef04:0:b0:4ab:33d5:4251 with SMTP id m4-20020a50ef04000000b004ab33d54251mr3138551eds.39.1676682932995; Fri, 17 Feb 2023 17:15:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676682932; cv=none; d=google.com; s=arc-20160816; b=NeEJWvK5le2Yt0ATFa+veMReBhJlokvaLaCgzs7QijBvnIu9Y/hEYETfk5pIzxqBl7 axHkG7pt1wjsWzz0+80q3yrtN6ycOZKOeDRlXsq/dNWHjBp0o3SNXqp14hxGXg24RpqO ArPlgX53KbIVGwjxKNs87fynW6/XcNeWlkZSBSShwqGLB7pb+4u5fJF73GhAk1GbPwQg Mm8MDIbw5Vjbbg+wF6Bpg7quW7Hz+xeP+oqHjuzrtWy87xQLbcm/GDN23SUFv85oymTe zKZSNXW7j5K5m9tCJKaWguCstOBBTBbZ0VYOpzpivUe/qZa47cbzBAfB3aBjWBr3t7TK E2ug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:delivered-to; bh=NCnXPBkGRqPK30DTfdBQw1TW52Mzm3+F+2yauqiYqIM=; b=SQfhYiBVDe7UpkvWWQ8Owgi2dK3cH6lFtmJEr1yxzXv2YePSyae3xES+RuB+4X2e/y D0+2YhkSVE+7p1VEvzGlkAQXShULKhaXOnqAR1XYlUtqSoCkWYOKL9MGaCOHRHog6Cf2 vuamT0RmD21i2rHnxX9FOwEeNYvY3kTHOED4SALCMl1PCWxEbSrZzRfcHFxMYcQzFAyt Xu2A3xsyucJu605jBdzncpDP9YvAB/ejz9gnTzPsgRbsI/mRupO+qPgAogGkXdLBRCCA CPNN1UIXwdPUtOUxdeA9LI2RM0pVWfjIur/ddIzxw3yXZE55FVLufFnemzzJCYH1tsdP DYRA== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id y21-20020aa7d515000000b004ad7c1dc11csi4119390edq.491.2023.02.17.17.15.32; Fri, 17 Feb 2023 17:15:32 -0800 (PST) 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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4B8EF68BE76; Sat, 18 Feb 2023 03:15:25 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f173.google.com (mail-qt1-f173.google.com [209.85.160.173]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 03ED868BE72 for ; Sat, 18 Feb 2023 03:15:19 +0200 (EET) Received: by mail-qt1-f173.google.com with SMTP id m11so2335130qtp.7 for ; Fri, 17 Feb 2023 17:15:18 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1676682917; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=L3VoiLkpcjxMD+5MjbJ7G1bsqt1gbIDIaWrVd6rT70c=; b=UaWg+jw7TFu3xyQjTmXqYkYqwxrNnjgHg5LdbBHonlculebmjnwwcHcZ+tUz2W8BMb 5cCCbKTiDncW7rtbiAQcbRX7A8RT4FkACHB9iWbDghhkNz2WZTiYaQRfMBqLlD7uNwl9 5Mfq9i9/DZmQhkd2GGKcTWQ3P0nONdo1l4UJV5hUTeBoXTwVKknYyc6VDx0G/S+ZBRNC iP4WZGv0PVFh/UkmkASmjVodzqIAr3b/TdqwOBWyCMH+6f00HY+FnO8cJ6XZ8WnJh7uw a/A5ddg+3SKcV9P8WRKq+OuxO2g2yFYVct5PwI8/d0w3YwAQDBSrP0m3oUFs6Znux2/6 SyCw== X-Gm-Message-State: AO0yUKUbaYEylc9kDz5/aNej9JnacQVJnv7XDBiiDbevWLDtzVRpYP+H V4XxkF6naKBsrVxxcFhEBhMV5Vr3n+CdgXW3cEE+3vQmFxMgQmJU/pTZ2tFsTPSZqlMhXEjATKD mi8+xQLXONoefvCNr02edALLCTTe7TNtXrxR/q1ZkuCpUR3mIs4WjCzDIOS/TjiSvI5XNYQ== X-Received: by 2002:ac8:5e54:0:b0:39c:da22:47b8 with SMTP id i20-20020ac85e54000000b0039cda2247b8mr6830832qtx.1.1676682917327; Fri, 17 Feb 2023 17:15:17 -0800 (PST) Received: from localhost.localdomain ([76.141.0.17]) by smtp.gmail.com with ESMTPSA id u127-20020a372e85000000b006fec1c0754csm4266297qkh.87.2023.02.17.17.15.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Feb 2023 17:15:16 -0800 (PST) From: Marth64 To: ffmpeg-devel@ffmpeg.org Date: Fri, 17 Feb 2023 19:14:55 -0600 Message-Id: <20230218011457.346660-2-marth64@proxyid.net> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230218011457.346660-1-marth64@proxyid.net> References: <306450> <20230218011457.346660-1-marth64@proxyid.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 2/4] avcodec/mlpdec: add detection of Atmos spatial extension profile in TrueHD 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: Marth64 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: NYP6eu8aM+MN Signed-off-by: Marth64 --- libavcodec/avcodec.h | 2 ++ libavcodec/codec_desc.c | 1 + libavcodec/mlpdec.c | 11 +++++++++++ libavcodec/profiles.c | 5 +++++ libavcodec/profiles.h | 1 + 5 files changed, 20 insertions(+) diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 0e85dd50a4..3feab75741 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -1593,6 +1593,8 @@ typedef struct AVCodecContext { #define FF_PROFILE_EAC3_DDP_ATMOS 30 +#define FF_PROFILE_TRUEHD_ATMOS 30 + #define FF_PROFILE_MPEG2_422 0 #define FF_PROFILE_MPEG2_HIGH 1 #define FF_PROFILE_MPEG2_SS 2 diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c index 4098d4f5a5..e80ac07700 100644 --- a/libavcodec/codec_desc.c +++ b/libavcodec/codec_desc.c @@ -2960,6 +2960,7 @@ static const AVCodecDescriptor codec_descriptors[] = { .name = "truehd", .long_name = NULL_IF_CONFIG_SMALL("TrueHD"), .props = AV_CODEC_PROP_LOSSLESS, + .profiles = NULL_IF_CONFIG_SMALL(ff_truehd_profiles), }, { .id = AV_CODEC_ID_MP4ALS, diff --git a/libavcodec/mlpdec.c b/libavcodec/mlpdec.c index 0ee1f0982c..85d6207b9c 100644 --- a/libavcodec/mlpdec.c +++ b/libavcodec/mlpdec.c @@ -42,6 +42,7 @@ #include "mlpdsp.h" #include "mlp.h" #include "config.h" +#include "profiles.h" /** number of bits used for VLC lookup - longest Huffman code is 9 */ #if ARCH_ARM @@ -392,6 +393,15 @@ static int read_major_sync(MLPDecodeContext *m, GetBitContext *gb) m->num_substreams = mh.num_substreams; m->substream_info = mh.substream_info; + /* If there is a 4th substream and the MSB of substream_info is set, + * there is a 16-channel spatial presentation (Atmos in TrueHD). + */ + if (m->avctx->codec_id == AV_CODEC_ID_TRUEHD + && m->num_substreams == 4 + && m->substream_info >> 7 == 1) { + m->avctx->profile = FF_PROFILE_TRUEHD_ATMOS; + } + /* limit to decoding 3 substreams, as the 4th is used by Dolby Atmos for non-audio data */ m->max_decoded_substream = FFMIN(m->num_substreams - 1, 2); @@ -1452,5 +1462,6 @@ const FFCodec ff_truehd_decoder = { FF_CODEC_DECODE_CB(read_access_unit), .flush = mlp_decode_flush, .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_CHANNEL_CONF, + .p.profiles = NULL_IF_CONFIG_SMALL(ff_truehd_profiles), }; #endif /* CONFIG_TRUEHD_DECODER */ diff --git a/libavcodec/profiles.c b/libavcodec/profiles.c index 343b08f363..5bd91d9c5c 100644 --- a/libavcodec/profiles.c +++ b/libavcodec/profiles.c @@ -50,6 +50,11 @@ const AVProfile ff_eac3_profiles[] = { { FF_PROFILE_UNKNOWN }, }; +const AVProfile ff_truehd_profiles[] = { + { FF_PROFILE_TRUEHD_ATMOS, "Dolby TrueHD + Dolby Atmos"}, + { FF_PROFILE_UNKNOWN }, +}; + const AVProfile ff_dnxhd_profiles[] = { { FF_PROFILE_DNXHD, "DNXHD"}, { FF_PROFILE_DNXHR_LB, "DNXHR LB"}, diff --git a/libavcodec/profiles.h b/libavcodec/profiles.h index 6ebedbd03f..1d523992fc 100644 --- a/libavcodec/profiles.h +++ b/libavcodec/profiles.h @@ -59,6 +59,7 @@ extern const AVProfile ff_aac_profiles[]; extern const AVProfile ff_dca_profiles[]; extern const AVProfile ff_eac3_profiles[]; +extern const AVProfile ff_truehd_profiles[]; extern const AVProfile ff_dnxhd_profiles[]; extern const AVProfile ff_h264_profiles[]; extern const AVProfile ff_hevc_profiles[]; From patchwork Sat Feb 18 01:14:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marth64 X-Patchwork-Id: 40434 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:5494:b0:bf:7b3a:fd32 with SMTP id i20csp252877pzk; Fri, 17 Feb 2023 17:15:42 -0800 (PST) X-Google-Smtp-Source: AK7set/rDqNy5bxXGbNxDoRAJ8MeVq2S166ohfgJS/zGu4OFYmVtTRV1k48PRWzRjQk2PdZWiajL X-Received: by 2002:a17:907:3da0:b0:88d:ba89:1854 with SMTP id he32-20020a1709073da000b0088dba891854mr8694212ejc.37.1676682942592; Fri, 17 Feb 2023 17:15:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676682942; cv=none; d=google.com; s=arc-20160816; b=RHhlndrIj17JKzM1gU2laMiH/4dyYcMZv8NcpaobyMZw1jnpXmJzr+rUPd2RDYSoD4 fG69zrJPtsLaJvD1o8tBioKPX+sRhujrwtK7pLJVggBJ/dpC3hsACLhbg/ZZ/rhSjGP6 +O5G208l/eCvVcm6HLIYFJ5juEILyj9/rNpbwTugrQUL4sQq6zWmRCpZAK0GYtV0miV8 9EjYU4gbhJ6O7hMjYEe2/xAXk7G7yq7BsAXozIG1aIRxBG6DnOFEO6hXCYo11xpskOTz 4iHH4CN5gzzmfuHRHfdZ1eEAT/N7DDIH0wTKtNFcJ/tJu07GSPqZHtGpoin6gsLpo/nG EJ/A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:delivered-to; bh=aA1d718DAuysbrZqEvw+cdG244f6KdsS5cxoAIFb7og=; b=S/mgQmMlwJzarR+BWUbNXhiBi8YUH06cfxKc6LQF6foau94J5EzhZ3hSFXOv+k7Tqm i6tA7sadQA9jGy0SHON+hNZYcfhGYZF12f4V7R/c4a/rVRHT5Y2OQ0z+ZE1sFspvWwLY t2sMq3lQTrl6HOuvIybVRlJ+qhRoViClC2LWwD5x+sE65QDJNWBw8obeC8LLJEY7+wdL 9QtT+kSU0BiPVC6sK/Van3WQzZ/8vmmAno/Yhs2cSkxZsMiThAAcwbYcQBXbG+xat8xY qHd5A86End8URbhwgeUiryEdo5iSLU6auyvlYzDxtxU/Qy65x+jgwQZhrepwrBReho2C b1kQ== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id f30-20020a170906739e00b008b16b4f9c15si6948324ejl.480.2023.02.17.17.15.41; Fri, 17 Feb 2023 17:15:42 -0800 (PST) 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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6E72368BEA6; Sat, 18 Feb 2023 03:15:34 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f169.google.com (mail-qt1-f169.google.com [209.85.160.169]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9B6D068BE94 for ; Sat, 18 Feb 2023 03:15:27 +0200 (EET) Received: by mail-qt1-f169.google.com with SMTP id a8so2378379qtj.5 for ; Fri, 17 Feb 2023 17:15:27 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1676682926; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=F2uixu7gNqGZb3KjCdQjpBT7FdLCC+JKqPJqTlZHJsw=; b=CJFx3gSlYJB0+jsfrtc5KVuDcj5PEI498nAVzvz285VLKp/BntOnCEBrkcKcgKST5F ULRWDfCR6/cGUuEwetJ1iJ7B2tYnZ7Ls6wTdWdnSbqTahlBSdiLwEmwqXHoBCrEM+KSh FKhu3hetO+J3TAO2K7BcTEMIulnrpvDrpRMYJ2qbDRTqUUr94hgDtWExyXXZcoOHk8B6 1IpVKPLiWChJ68RpVuSwbm6WwJFR6tTr3A0lT0UWcDyCBGhNMrvkN2MQyi+elJVYumfZ 66tN18b7PJHZCqX7Ix/tWvc7eqeZxIcWKx2Ge4pwIcdG5iHv/zl9xw5LmLj5aaDZFOT0 nVlQ== X-Gm-Message-State: AO0yUKVMUevkGdCt3ei6FOF1yD4uFC3Ohy7T/sfNf2XAgI+xeEehAPkn jtOhDJWWjk3D+AA8VICEmWbJhzZLE3xnzwJsh0ycwfIhle1xK2FD9r7MQ0g+INeAH+OxoboiaMU KQ/FegN92dk3lzRl0SH14si+hsQk1R6stYsPB8jlhwRcxijIZ9z7rhPLXS6QXtQviRVVzJg== X-Received: by 2002:ac8:4e45:0:b0:3b8:4951:57bb with SMTP id e5-20020ac84e45000000b003b8495157bbmr6658563qtw.5.1676682926031; Fri, 17 Feb 2023 17:15:26 -0800 (PST) Received: from localhost.localdomain ([76.141.0.17]) by smtp.gmail.com with ESMTPSA id u127-20020a372e85000000b006fec1c0754csm4266297qkh.87.2023.02.17.17.15.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Feb 2023 17:15:25 -0800 (PST) From: Marth64 To: ffmpeg-devel@ffmpeg.org Date: Fri, 17 Feb 2023 19:14:56 -0600 Message-Id: <20230218011457.346660-3-marth64@proxyid.net> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230218011457.346660-1-marth64@proxyid.net> References: <306450> <20230218011457.346660-1-marth64@proxyid.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 3/4] avcodec/dca_xll: add detection of DTS:X and DTS:X IMAX 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: Marth64 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: cp6OQtPT/Jky Signed-off-by: Marth64 --- libavcodec/avcodec.h | 15 +++++++++------ libavcodec/dca_syncwords.h | 3 +++ libavcodec/dca_xll.c | 26 +++++++++++++++++++++++++- libavcodec/dca_xll.h | 3 +++ libavcodec/profiles.c | 14 ++++++++------ 5 files changed, 48 insertions(+), 13 deletions(-) diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 3feab75741..363f895302 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -1584,12 +1584,15 @@ typedef struct AVCodecContext { #define FF_PROFILE_DNXHR_HQX 4 #define FF_PROFILE_DNXHR_444 5 -#define FF_PROFILE_DTS 20 -#define FF_PROFILE_DTS_ES 30 -#define FF_PROFILE_DTS_96_24 40 -#define FF_PROFILE_DTS_HD_HRA 50 -#define FF_PROFILE_DTS_HD_MA 60 -#define FF_PROFILE_DTS_EXPRESS 70 +#define FF_PROFILE_DTS 20 +#define FF_PROFILE_DTS_ES 30 +#define FF_PROFILE_DTS_96_24 40 +#define FF_PROFILE_DTS_HD_HRA 50 +#define FF_PROFILE_DTS_HD_MA 60 +#define FF_PROFILE_DTS_EXPRESS 70 +#define FF_PROFILE_DTS_HD_MA_X 61 +#define FF_PROFILE_DTS_HD_MA_X_IMAX 62 + #define FF_PROFILE_EAC3_DDP_ATMOS 30 diff --git a/libavcodec/dca_syncwords.h b/libavcodec/dca_syncwords.h index 4d2cd5f56d..649bbd90dc 100644 --- a/libavcodec/dca_syncwords.h +++ b/libavcodec/dca_syncwords.h @@ -33,4 +33,7 @@ #define DCA_SYNCWORD_SUBSTREAM_CORE 0x02B09261U #define DCA_SYNCWORD_REV1AUX 0x9A1105A0U +#define DCA_SYNCWORD_XLL_X 0x02000850U +#define DCA_SYNCWORD_XLL_X_IMAX 0xF14000D0U + #endif /* AVCODEC_DCA_SYNCWORDS_H */ diff --git a/libavcodec/dca_xll.c b/libavcodec/dca_xll.c index fe2c766d98..b8cf37a35f 100644 --- a/libavcodec/dca_xll.c +++ b/libavcodec/dca_xll.c @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "avcodec.h" #include "libavutil/channel_layout.h" #include "dcadec.h" #include "dcadata.h" @@ -1054,6 +1055,22 @@ static int parse_frame(DCAXllDecoder *s, const uint8_t *data, int size, DCAExssA return ret; if ((ret = parse_band_data(s)) < 0) return ret; + + if (s->frame_size * 8 > FFALIGN(get_bits_count(&s->gb), 32)) { + unsigned int extradata_syncword; + + // Align to dword + skip_bits_long(&s->gb, -get_bits_count(&s->gb) & 31); + + extradata_syncword = show_bits_long(&s->gb, 32); + + if (extradata_syncword == DCA_SYNCWORD_XLL_X) { + s->x_syncword_present = 1; + } else if ((extradata_syncword >> 1) == (DCA_SYNCWORD_XLL_X_IMAX >> 1)) { + s->x_imax_syncword_present = 1; + } + } + if (ff_dca_seek_bits(&s->gb, s->frame_size * 8)) { av_log(s->avctx, AV_LOG_ERROR, "Read past end of XLL frame\n"); return AVERROR_INVALIDDATA; @@ -1428,8 +1445,15 @@ int ff_dca_xll_filter_frame(DCAXllDecoder *s, AVFrame *frame) return AVERROR(EINVAL); } + if (s->x_imax_syncword_present) { + avctx->profile = FF_PROFILE_DTS_HD_MA_X_IMAX; + } else if (s->x_syncword_present) { + avctx->profile = FF_PROFILE_DTS_HD_MA_X; + } else { + avctx->profile = FF_PROFILE_DTS_HD_MA; + } + avctx->bits_per_raw_sample = p->storage_bit_res; - avctx->profile = FF_PROFILE_DTS_HD_MA; avctx->bit_rate = 0; frame->nb_samples = nsamples = s->nframesamples << (s->nfreqbands - 1); diff --git a/libavcodec/dca_xll.h b/libavcodec/dca_xll.h index d7c1a13ec8..a22bbb8d77 100644 --- a/libavcodec/dca_xll.h +++ b/libavcodec/dca_xll.h @@ -135,6 +135,9 @@ typedef struct DCAXllDecoder { DCADSPContext *dcadsp; + int x_syncword_present; ///< Syncword for extension data at end of frame (DTS:X) is present + int x_imax_syncword_present; ///< Syncword for extension data at end of frame (DTS:X IMAX) is present + int output_mask; int32_t *output_samples[DCA_SPEAKER_COUNT]; } DCAXllDecoder; diff --git a/libavcodec/profiles.c b/libavcodec/profiles.c index 5bd91d9c5c..52066185b1 100644 --- a/libavcodec/profiles.c +++ b/libavcodec/profiles.c @@ -36,12 +36,14 @@ const AVProfile ff_aac_profiles[] = { }; const AVProfile ff_dca_profiles[] = { - { FF_PROFILE_DTS, "DTS" }, - { FF_PROFILE_DTS_ES, "DTS-ES" }, - { FF_PROFILE_DTS_96_24, "DTS 96/24" }, - { FF_PROFILE_DTS_HD_HRA, "DTS-HD HRA" }, - { FF_PROFILE_DTS_HD_MA, "DTS-HD MA" }, - { FF_PROFILE_DTS_EXPRESS, "DTS Express" }, + { FF_PROFILE_DTS, "DTS" }, + { FF_PROFILE_DTS_ES, "DTS-ES" }, + { FF_PROFILE_DTS_96_24, "DTS 96/24" }, + { FF_PROFILE_DTS_HD_HRA, "DTS-HD HRA" }, + { FF_PROFILE_DTS_HD_MA, "DTS-HD MA" }, + { FF_PROFILE_DTS_HD_MA_X, "DTS-HD MA + DTS:X" }, + { FF_PROFILE_DTS_HD_MA_X_IMAX, "DTS-HD MA + DTS:X IMAX" }, + { FF_PROFILE_DTS_EXPRESS, "DTS Express" }, { FF_PROFILE_UNKNOWN }, }; From patchwork Sat Feb 18 01:14:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marth64 X-Patchwork-Id: 40435 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:5494:b0:bf:7b3a:fd32 with SMTP id i20csp252955pzk; Fri, 17 Feb 2023 17:15:51 -0800 (PST) X-Google-Smtp-Source: AK7set+Y83q5TSI7LQytNkuBLCPDvpmwPGKR4natPnA6bv8EYNV3DqYA/oBTmxsJbKHMOHImxxiI X-Received: by 2002:a17:907:b15:b0:88f:8a5:b4cd with SMTP id h21-20020a1709070b1500b0088f08a5b4cdmr2041376ejl.1.1676682951023; Fri, 17 Feb 2023 17:15:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676682951; cv=none; d=google.com; s=arc-20160816; b=MAGteuM/nzhvXKRLfVJNSSGo4uZP0ZDjx70SjIXo995r+8LH0tWFIek05uo+D3v15t HltB8Hsi0/BAziEIVUUWy05iKHGRu7I9EU94EO+N3SSi6K1QgHV1kfAftcW7QkIFcb3+ 6fC50JHXQZoVMOa3sGP6J7dH6wZp61ii2tZxduGNcZnY/tXO+LWXf4Hny7nqiQSAud0L c+FADY5pAOgZClijs13pCiSgS26eYoS8zJXSeVTbfXT/AtRIn9HTEeeCbC08U0iVRljP s2Y9aKCoWece64bIUPcxGhisAq1mzfW5TzERNttpITRH5SkCbZqclZJIupRB6xG+dc+Y 7aXw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:delivered-to; bh=DLEzpVO84cMgF/kwLIE71cKOl4cyo1jAD2x0Nt1u+q4=; b=WuiS84p0WH9J6wwIP/pVHTm/lAYpBFP9W2yzzSN7P4pUi7y5MPXV3fPWdS51z7RAB9 TGtBzyxAEmFw50CoW9WaGvWZvSOzsvhR+uHvhx2R8F3872Gd4cOVi6pdkyfJcRgBAgqq ls7qnicRMp5BHaSINiUVANTLrzd0/4bo+LC92sHKowUPlUKvY0+dcYFXtyC0NUk2VTbq O1qUHIrA0QpjpG9DgdHdBqKvXxC1KBUDgfkyheErRsH41mRB1zDamrMGyLHjpq9c00Ml 4lbPA2luChP8yL8APczSV5gWQlr8sEKLB2Tggpcs0u4nMTKcmt0JSiatc9c9aOXBW92q xiXQ== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id fp18-20020a1709069e1200b008b12813b352si5188539ejc.573.2023.02.17.17.15.50; Fri, 17 Feb 2023 17:15:51 -0800 (PST) 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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7E2A368BEBF; Sat, 18 Feb 2023 03:15:40 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f174.google.com (mail-qt1-f174.google.com [209.85.160.174]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 88C9E68BEB5 for ; Sat, 18 Feb 2023 03:15:33 +0200 (EET) Received: by mail-qt1-f174.google.com with SMTP id a27so2470478qto.4 for ; Fri, 17 Feb 2023 17:15:33 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=PzpuqZGZRQDXouHZTKHx/TeRbkcZm9XCx6SZcchJFQg=; b=WfaWyXh9kWF7D7PWdOhLt3YokjQkbTuF6zwrzFlQIT76A+XKhd4oWHaokEIfgiKEdo WN5+AmqKUwzUdqYkLR+pjkV85h34rFhOd/ovQsc77KyMijMeEpPjme/YmzkjmDWtKPE3 t8k7A8m7TCf8mnK1hKGT8uvBWb0tiSQfksxzazwQyojQmkq8qfsWf/Q6X1oCOpQdbX3E 3NXZ3eB0vR+nKNAPI6icEmEF2uS4+yj7aCnosnyydefYC13bCmK79PSe1sBWiYE0W1Zf l1qvbM4CTsOBIAuwX58XwXystjW2BS1Y/xfPfhlQmxldqWwMH9OazJDzdCjGQFpgRXWx Q+8A== X-Gm-Message-State: AO0yUKVGe3Mwwi1Cp3MmaQfCIvMA3eg+WGIC8AlDpNgC7+AXLTxzrR2U uRvV9LUZpsTOvJZiuoh8TG0Xlr3aSDEP9lroQbqzLkD8Lmn4WxaNRRRRU8mXI2vBn1Apqp0SfyY mVKWrVSTYoJOQpZls4n5GMlKEWHSDiopwqNURq6s5in99lJrCskKUURVUkKaV/H51jq3u8A== X-Received: by 2002:a05:622a:1a29:b0:3b8:695b:aad1 with SMTP id f41-20020a05622a1a2900b003b8695baad1mr6319736qtb.1.1676682931935; Fri, 17 Feb 2023 17:15:31 -0800 (PST) Received: from localhost.localdomain ([76.141.0.17]) by smtp.gmail.com with ESMTPSA id u127-20020a372e85000000b006fec1c0754csm4266297qkh.87.2023.02.17.17.15.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Feb 2023 17:15:31 -0800 (PST) From: Marth64 To: ffmpeg-devel@ffmpeg.org Date: Fri, 17 Feb 2023 19:14:57 -0600 Message-Id: <20230218011457.346660-4-marth64@proxyid.net> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230218011457.346660-1-marth64@proxyid.net> References: <306450> <20230218011457.346660-1-marth64@proxyid.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 4/4] avcodec/version: bump minor version to accommodate spatial audio detection 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: Marth64 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: qZok790RrMAc Signed-off-by: Marth64 --- doc/APIchanges | 6 ++++++ libavcodec/version.h | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/doc/APIchanges b/doc/APIchanges index 29161e30bf..35ff906662 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -2,6 +2,12 @@ The last version increases of all libraries were on 2023-02-09 API changes, most recent first: +2023-02-xx - xxxxxxxxxx - lavc 60.3.100 - profiles.h dca_syncwords.h + Add ff_eac3_profiles and ff_truehd_profiles in profiles.h to accomodate + awareness of Atmos in EAC3/TrueHD. + Add DCA_SYNCWORD_XLL_X and DCA_SYNCWORD_XLL_X_IMAX syncword constants + as part of facilitating DTS:X and DTS:X IMAX detection. + 2023-02-16 - xxxxxxxxxx - lavf 60.2.100 - avformat.h Deprecate AVFormatContext io_close callback. The superior io_close2 callback should be used instead. diff --git a/libavcodec/version.h b/libavcodec/version.h index 0550d7b0d8..43794ea588 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -29,7 +29,7 @@ #include "version_major.h" -#define LIBAVCODEC_VERSION_MINOR 2 +#define LIBAVCODEC_VERSION_MINOR 3 #define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \