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 }, };