From patchwork Fri Feb 17 19:46:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marth64 X-Patchwork-Id: 40428 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:5494:b0:bf:7b3a:fd32 with SMTP id i20csp84605pzk; Fri, 17 Feb 2023 11:46:52 -0800 (PST) X-Google-Smtp-Source: AK7set+ZcwhAx69LSdZMLv8ahv7D/XecAacGnLwrcgJF4VnFBteqY1IW4DtHYofgMdVXQ3UAxzfM X-Received: by 2002:aa7:cd77:0:b0:4ac:bbdb:462a with SMTP id ca23-20020aa7cd77000000b004acbbdb462amr1674512edb.14.1676663212006; Fri, 17 Feb 2023 11:46:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676663211; cv=none; d=google.com; s=arc-20160816; b=wK0CiuuiIay22+/XqY16lP5ywLZQMUPw6MtCR9MV2w1+V8FDpQ8GngU8EtfarJduiP QZvgUELEouwRBtD0RKZDd/6rYSxAAuEEjIIn2T/WwpyXOw8dTG1LdiVbvo3g5KM+vttv Ygmmfwn/VWg0gAb/OVl9irb+whGMvPl4PKGXmHzI1X/hg/hU09+dx/pl/t82+aa4hbAA 5LZX1bkHMOwOvHCC3Y05vaHCZVuhA0H4zOZQL/F+mTd0XAD8Xa3Hmsy9TLwX5lFxDtDq i/a/Bj2cmpbhaU4C0lN1Ril0GO7pAjp2uuHT8NjHB6AWU6AsipZ+gov68gLWfnB+xfsu BuQQ== 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=DzKQASfkzcEoMIPSGxHjew2b3MdgKzvvIGELN+tOIFI=; b=sNxYF6NXVCtfJi9i4074Rku6oqYYPjTj1f/sG+X0BJ59o98pKOFyzlmG+rztAW0Vqp BgSw8Yo8wuUXi06HPbxZa9/lpJvyNSWi1N2EFtflLsPLXF+wTXQ/j9Y3scKiOqA7BWBZ 4ZxLzYe1IEJmPCDW4eKE62pZPGayWoG8i6rBmWPCrEvpOufoJeKz/P3eRDqhvvG/7k7E VZZaDZxi9y0aW//Laz8XgVjLqSXDik8BsdvPYUcCsfRKOz0r1ttRZSqD1jwteTRILrma jxviTllY9rRkfTSgIhtmPZYoKTxufX6naY/77GwPfILeJs9ZcZGLwaeTN652UP8nktqw dWhQ== 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 s13-20020aa7d78d000000b004acb7e10eb1si6175740edq.238.2023.02.17.11.46.51; Fri, 17 Feb 2023 11:46: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 4B1DB68B8BF; Fri, 17 Feb 2023 21:46:47 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f180.google.com (mail-qt1-f180.google.com [209.85.160.180]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 501DF68B14C for ; Fri, 17 Feb 2023 21:46:40 +0200 (EET) Received: by mail-qt1-f180.google.com with SMTP id f22so1647606qtb.8 for ; Fri, 17 Feb 2023 11:46:40 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1676663198; 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=JYAW7RIIl2xacPFrJi+6yrBwN7mwNkU7vsnaNSLKyoc=; b=vgW2TIyfc2THGimdykblstAS6AT5qt1iDf/6Keg6RGMZjyX0JXps993PgrkifMxVvd EcGmfnqb3W9AQM8mgNcdqX5bexn3+ol0N0YmI/7CAyaYji1WpH2Bx3hHUr396BHXcYxU XjLZ8/NrAWEIQvo8ueunP6G+oUco3LLtxnKYJYPN/p1cIPFrEyh0bCtMM44X7BiFp3hP aJIoERPSNvJr3vykmWBHyc1DDtcYLHPcU30aq1/yOo7AoX7cvoaEfjbCXqsr0LJu7Aa8 0F1EXv27TkeXCcrXN2k9JQsyJQAgJoH+6M6BgiItSQ8VKD0RxC7l4TklM5n2BkkgaNmm rx2g== X-Gm-Message-State: AO0yUKX7ybvIAwltApchZobUG0n0WzNpVYT5pR74cKOqyXJfewqeHW6t Uld3lUkmWAw4lUX8u9ub7FpzT8qOxcTHFDAh+BrS+3d4j/pKTm1NspWUYT6JP2+ZVpnyeoUsZNZ 2GdUoC6DrPmBaiRP4DonFlqjgKSW7gWnzGO36eMEDJH4xMp3piv3nQklnOjx3x3hf5xURCQ== X-Received: by 2002:ac8:5783:0:b0:3b9:a4d4:7f37 with SMTP id v3-20020ac85783000000b003b9a4d47f37mr4576831qta.3.1676663198272; Fri, 17 Feb 2023 11:46:38 -0800 (PST) Received: from localhost.localdomain ([76.141.0.17]) by smtp.gmail.com with ESMTPSA id c186-20020a37b3c3000000b0072a375c291csm3844706qkf.30.2023.02.17.11.46.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Feb 2023 11:46:37 -0800 (PST) From: Marth64 To: ffmpeg-devel@ffmpeg.org Date: Fri, 17 Feb 2023 13:46:34 -0600 Message-Id: <20230217194634.4154710-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] ffprobe/eac3/mlp/dca: add detection of spatial audio extensions 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: MHmnZbfWPZRG Signed-off-by: Marth64 --- Update doc/APIchanges and update libavcodec minor version doc/APIchanges | 4 ++++ libavcodec/ac3dec.c | 4 ++++ libavcodec/ac3dec.h | 1 + libavcodec/avcodec.h | 18 ++++++++++++------ libavcodec/codec_desc.c | 2 ++ libavcodec/dca_syncwords.h | 3 +++ libavcodec/dca_xll.c | 27 ++++++++++++++++++++++++++- libavcodec/dca_xll.h | 3 +++ libavcodec/eac3dec.c | 11 ++++++++++- libavcodec/mlpdec.c | 15 +++++++++++++-- libavcodec/profiles.c | 24 ++++++++++++++++++------ libavcodec/profiles.h | 2 ++ libavcodec/version.h | 2 +- 13 files changed, 99 insertions(+), 17 deletions(-) diff --git a/doc/APIchanges b/doc/APIchanges index 6baf914760..04dda4132e 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -14,6 +14,10 @@ libavutil: 2021-04-27 API changes, most recent first: +2023-0x-xx - xxxxxxxxxx - lavc 59.64.100 + 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-0x-xx - xxxxxxxxxx - lavc 59.63.100 Allow AV_CODEC_FLAG_COPY_OPAQUE to be used with decoders. diff --git a/libavcodec/ac3dec.c b/libavcodec/ac3dec.c index 0b120e6140..d7070645e6 100644 --- a/libavcodec/ac3dec.c +++ b/libavcodec/ac3dec.c @@ -43,6 +43,7 @@ #include "ac3dec.h" #include "ac3dec_data.h" #include "ac3defs.h" +#include "avcodec.h" #include "decode.h" #include "kbdwin.h" @@ -1714,6 +1715,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 755e543fac..2d3a7a4625 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -1616,12 +1616,18 @@ 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_HD_MA_X 61 +#define FF_PROFILE_DTS_HD_MA_X_IMAX 62 +#define FF_PROFILE_DTS_EXPRESS 70 + +#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 diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c index 57d0f98211..f33bbcd124 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, @@ -2959,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/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..802ad1197d 100644 --- a/libavcodec/dca_xll.c +++ b/libavcodec/dca_xll.c @@ -19,6 +19,7 @@ */ #include "libavutil/channel_layout.h" +#include "avcodec.h" #include "dcadec.h" #include "dcadata.h" #include "dcamath.h" @@ -1054,10 +1055,27 @@ 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; } + return ret; } @@ -1428,8 +1446,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/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/mlpdec.c b/libavcodec/mlpdec.c index 0ee1f0982c..e95357e35a 100644 --- a/libavcodec/mlpdec.c +++ b/libavcodec/mlpdec.c @@ -28,20 +28,21 @@ #include -#include "avcodec.h" #include "libavutil/internal.h" #include "libavutil/intreadwrite.h" #include "libavutil/channel_layout.h" #include "libavutil/mem_internal.h" #include "libavutil/thread.h" #include "libavutil/opt.h" +#include "avcodec.h" #include "codec_internal.h" +#include "config.h" #include "decode.h" #include "get_bits.h" #include "mlp_parse.h" #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 7af7fbeb13..52066185b1 100644 --- a/libavcodec/profiles.c +++ b/libavcodec/profiles.c @@ -36,15 +36,27 @@ 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 }, }; +const AVProfile ff_eac3_profiles[] = { + { FF_PROFILE_EAC3_DDP_ATMOS, "Dolby Digital Plus + Dolby Atmos"}, + { 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 41a19aa9ad..1d523992fc 100644 --- a/libavcodec/profiles.h +++ b/libavcodec/profiles.h @@ -58,6 +58,8 @@ 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[]; diff --git a/libavcodec/version.h b/libavcodec/version.h index a80dc4776d..80d3aae05e 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -29,7 +29,7 @@ #include "version_major.h" -#define LIBAVCODEC_VERSION_MINOR 63 +#define LIBAVCODEC_VERSION_MINOR 64 #define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \