From patchwork Sat Feb 18 19:43:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marth64 X-Patchwork-Id: 40444 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:5494:b0:bf:7b3a:fd32 with SMTP id i20csp773883pzk; Sat, 18 Feb 2023 11:43:18 -0800 (PST) X-Google-Smtp-Source: AK7set+ibna+G3ytcwJE6tkbo0y+I6iV2exmXJbs4zi2g6IEUCT3gqpM6PWpEyG0cUgZSIMW2utZ X-Received: by 2002:aa7:de83:0:b0:4ac:bbaa:867a with SMTP id j3-20020aa7de83000000b004acbbaa867amr4556048edv.24.1676749398831; Sat, 18 Feb 2023 11:43:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676749398; cv=none; d=google.com; s=arc-20160816; b=INTAiIkDQ9ymFEDp7WRob9jSwnGkKmP0gVlCSEwyLkhXGgYSed7ZRrCUCVVZ8vavlo GJEBsyfeESJafZ0Tg583pU6XtTOkWU3vLzkAP9aVUDoHr2thh4Rj/miNz6U0eJzz6SWT NeHXBwQ8HZKiRiUX8fTJdNJJ+V/ZlTuEH0nbm4v5iavJucxLaKNhyE4tSFsbScRR523x Bz7k/i2W2sg4WSSD06xR7ZpZk9JnGoK+At1fZfoJ8LHMuAAqrLIGbgv/2FsGdvIdBMZ4 OtoQBL5jHgDnnpIW4MMGZTi7EoSjKe8g4OZKyb1aa/STWxAu3OjumIQPq7UzPbGYFeIG NPKA== 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=7d5cBTlWejfnsOAoEXTMi/I/Jgvl5EYlNErtMLVmmys=; b=okTROG3zl2e0FdUaGsSZKzSqHaMDNykkZlMzWljYu1rZGU0f4LfViAkHcz3iCOlGLw kFTC7c97NIL1MEqH2OveA+za/BrzZ3LxqrVXNAR7vzt8ApYt6wJ6RJBydLtvpd7rylKz dcfl8QDK5NVVvDq3ejg70cAn/6r++coppFwBbq+OieQihFI2aqiTb42ELxSPwbJjJT63 qV9GKG6VmofPxTYb2r9f6Ng4VWnixuk3JD+uDHGgNIVQ94wx43z6tPXoG7KCE9F5jet7 9R3PQphGTUhpo6eu2yFcL+HNOIYajEmapudna1IdCuBbT6O1n0lylOeylOLDTdcSn1BP WOPw== 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 bc18-20020a056402205200b004ad5218fffasi1309454edb.272.2023.02.18.11.43.18; Sat, 18 Feb 2023 11:43:18 -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 BADC868BEF8; Sat, 18 Feb 2023 21:43:15 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f178.google.com (mail-qt1-f178.google.com [209.85.160.178]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1298168BEEC for ; Sat, 18 Feb 2023 21:43:10 +0200 (EET) Received: by mail-qt1-f178.google.com with SMTP id ci25so819169qtb.0 for ; Sat, 18 Feb 2023 11:43:10 -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=AhaM9MNY0ABVwLeufaaRGDf1ylFVgd6pcpqHwXePLCc=; b=qe1r8rOrBd1ymCWgWWb97ht9xwvfg9wwQO8AusbUEtSsiKMZFvP1Ys2D4tw/TjY761 4DV0Z49vFP2AxcSqJ7ZsAezPEjs+JEHrtq2+3TbFa8xoJNWufUmyM43Vld8VhTfjJ2Dj iNNHc0rRhYnPyjjQlrQE+Ovz3sdcwYrjQuFlF+TWel+mwxYI+56kRqIKQFaUfL7bYsKk nAzxDXptTeoFz73kDe3bFIO+JrQFHZFtULnvjG/Fj4MBnpwJoGMaovDcdWcMLVbpwWTJ D2+wplU1vHF85QbmkkVJqP2EG1PT86i7/nvlXCXFs/QtFrlkGSx2GLInGvpGQgFISGUk J8vQ== X-Gm-Message-State: AO0yUKU7FQ2ffeaw6cb3OMUNAsFX+gC4iyYzP7POVZxcRCvNvu/HBXyT I49856BHsm+7LSaVsD56yL7blgk0jNj0KkZuKlFQsYmJa2ZTRfpqfsL7f5LfgNO6bw2R3dpilVr WzInyq/b39JP0Chg3IbZGKpMkhvQHYQ8Sff/7kPUivGHDkzQjQbo0DqVQ5LZbwWgZYuoWaQ== X-Received: by 2002:a05:622a:241:b0:3bb:7875:1bc1 with SMTP id c1-20020a05622a024100b003bb78751bc1mr11184796qtx.4.1676749388281; Sat, 18 Feb 2023 11:43:08 -0800 (PST) Received: from localhost.localdomain ([76.141.0.17]) by smtp.gmail.com with ESMTPSA id he29-20020a05622a601d00b003bd0f0b26b0sm4943397qtb.77.2023.02.18.11.43.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Feb 2023 11:43:07 -0800 (PST) From: Marth64 To: ffmpeg-devel@ffmpeg.org Date: Sat, 18 Feb 2023 13:43:00 -0600 Message-Id: <20230218194259.377430-1-marth64@proxyid.net> X-Mailer: git-send-email 2.25.1 In-Reply-To: <306728> References: <306728> 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: wIfe/Aww2fbD Signed-off-by: Marth64 --- - Fix if() statement oversight libavcodec/ac3dec.c | 1 + libavcodec/ac3dec.h | 1 + libavcodec/ac3dec_float.c | 2 ++ libavcodec/avcodec.h | 2 ++ libavcodec/codec_desc.c | 1 + libavcodec/eac3dec.c | 11 ++++++++++- libavcodec/profiles.c | 5 +++++ libavcodec/profiles.h | 1 + 8 files changed, 23 insertions(+), 1 deletion(-) diff --git a/libavcodec/ac3dec.c b/libavcodec/ac3dec.c index 0b120e6140..fc0cbeb493 100644 --- a/libavcodec/ac3dec.c +++ b/libavcodec/ac3dec.c @@ -1714,6 +1714,7 @@ skip: if (!err) { avctx->sample_rate = s->sample_rate; avctx->bit_rate = s->bit_rate + s->prev_bit_rate; + avctx->profile = s->eac3_extension_type_a == 1 ? FF_PROFILE_EAC3_DDP_ATMOS : FF_PROFILE_UNKNOWN; } 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/ac3dec_float.c b/libavcodec/ac3dec_float.c index b8868d8ee1..39d3cbd282 100644 --- a/libavcodec/ac3dec_float.c +++ b/libavcodec/ac3dec_float.c @@ -33,6 +33,7 @@ #include "ac3dec.h" #include "codec_internal.h" +#include "profiles.h" #include "eac3dec.c" #include "ac3dec.c" @@ -92,6 +93,7 @@ const FFCodec ff_eac3_decoder = { .p.sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_NONE }, .p.priv_class = &ac3_eac3_decoder_class, + .p.profiles = NULL_IF_CONFIG_SMALL(ff_eac3_profiles), .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, }; #endif 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[];