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[];