From patchwork Mon Feb 13 18:09:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Gaullier X-Patchwork-Id: 40382 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:5494:b0:bf:7b3a:fd32 with SMTP id i20csp3676858pzk; Mon, 13 Feb 2023 10:10:16 -0800 (PST) X-Google-Smtp-Source: AK7set9FvMpACNLjpunUDHVYS9W8XHZFfbyB9rj8aePW4q9iH5aDN/+0icuaSrKLpYmLrzAIHBYm X-Received: by 2002:a50:cc97:0:b0:4ab:16a8:bc61 with SMTP id q23-20020a50cc97000000b004ab16a8bc61mr18815946edi.23.1676311815912; Mon, 13 Feb 2023 10:10:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676311815; cv=none; d=google.com; s=arc-20160816; b=BzpHQyfOAt2ZkGa+1HeKy42QWc/P7esq7GRhGHJlsA0UaMgb00WxcYhUwp/XnnCj3j ObMZfp7y85KHgEzpCeS9in+WTyjJWMLoUNz9c9xBEoM98t2AUF1Uo2J6MisxdkpoKPIA f+TUOAgcAoecjOOOydOYB7ogKpRfqDgaRZ5z5nuo2daqfpsy6xZXQjuvKi4syK9P4Rr2 dGs0B/QNqa6djSqF0BI3lUk1HS7DurQaAu6M+BjkxdP+Rf6L/7Jd640PqlFnExRyC4yL Q9wPjKZFGoonpDZB6mDSgQCedu1X3tAV1uPbYxOAbrcAz5oiNa/62ekSzykHwGdvbDAy 5jOg== 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=xxmGZ/JmJ18UE0nY9iqqXsVC5IlivLZ9Ww4hGV2Y3lQ=; b=ToWJ65ymH6/P1kZHxDam01grCi20iUuQwUaaMyOz/+hCGFksIKzII8qVSBNRFzKDxx /LOl5MqMqRvYH/UtFX4ZaKkI0KGxu59LpZeAtXDcZ3OeYebGr/KFFYEu+8CLSLR/ZGY9 Y8HpWxAkBk24rv6QJiow+6xRUdrTLkutyy8HGnyNz2+VST91XXMRg8xQ3byIhmQUINDe VB6JbHDlrXwA2R4Ax/ZadQctvQRNRUYJ5wFNqdM6AlEVuW5HjjQmhj96wFayXH6ZUQhW n+9mXyRdDm7ODgiH+b6+aGiFvhY6M1BzJ8+YzZz8p6cQC0XeBvMoV+uRwAlAuL5UTpjB HvJQ== 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 v21-20020a056402185500b004acd45d6a8fsi826189edy.323.2023.02.13.10.10.15; Mon, 13 Feb 2023 10:10:15 -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 4AEE268BE6E; Mon, 13 Feb 2023 20:09:53 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from srv-infra-2.infra.inf.glb.tvvideoms.com (www.inf.tvvideoms.com [213.205.126.156]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DA7F468BD42 for ; Mon, 13 Feb 2023 20:09:44 +0200 (EET) Received: from cji.paris (unknown [172.16.3.159]) by srv-infra-2.infra.inf.glb.tvvideoms.com (Postfix) with ESMTP id 557D242C46; Mon, 13 Feb 2023 18:09:44 +0000 (UTC) From: Nicolas Gaullier To: ffmpeg-devel@ffmpeg.org Date: Mon, 13 Feb 2023 19:09:32 +0100 Message-Id: <20230213180936.815-3-nicolas.gaullier@cji.paris> X-Mailer: git-send-email 2.39.1.windows.1 In-Reply-To: <20230213180936.815-1-nicolas.gaullier@cji.paris> References: <20230213180936.815-1-nicolas.gaullier@cji.paris> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/6] avformat/s337m: Consider container bit resolution 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: Nicolas Gaullier Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: OdlfY1J3NmPt Prepare the support of s337m in muxers other than raw (ex: wav). For example, this forbids reading 16 bits DolbyE stream from a 24 bit wav file. --- libavformat/s337m.c | 21 +++++++++++++++------ libavformat/s337m.h | 3 ++- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/libavformat/s337m.c b/libavformat/s337m.c index 582c8b3670..2a566e3cba 100644 --- a/libavformat/s337m.c +++ b/libavformat/s337m.c @@ -35,7 +35,7 @@ static int s337m_get_offset_and_codec(void *avc, uint64_t state, - int data_type, int data_size, + int data_type, int data_size, int container_word_bits, int *offset, enum AVCodecID *codec) { int word_bits; @@ -56,6 +56,12 @@ static int s337m_get_offset_and_codec(void *avc, avpriv_report_missing_feature(avc, "Data type %#x in SMPTE 337M", data_type & 0x1F); return AVERROR_PATCHWELCOME; } + if (container_word_bits && + !(container_word_bits == 16 && word_bits == 16) && + !(container_word_bits == 24 && word_bits == 20) && + !(container_word_bits == 24 && word_bits == 24)) { + return AVERROR_INVALIDDATA; + } if (codec) *codec = AV_CODEC_ID_DOLBY_E; @@ -105,7 +111,7 @@ static int s337m_probe(const AVProbeData *p) data_size = AV_RL24(buf + 3); } - if (s337m_get_offset_and_codec(NULL, state, data_type, data_size, &offset, NULL)) + if (s337m_get_offset_and_codec(NULL, state, data_type, data_size, 0, &offset, NULL)) continue; i = IS_16LE_MARKER(state) ? 0 : IS_20LE_MARKER(state) ? 1 : 2; @@ -143,13 +149,16 @@ static void bswap_buf24(uint8_t *data, int size) FFSWAP(uint8_t, data[0], data[2]); } -int ff_s337m_get_packet(AVIOContext *pb, AVPacket *pkt, int size, enum AVCodecID *codec, void *avc) +int ff_s337m_get_packet(AVIOContext *pb, AVPacket *pkt, int size, enum AVCodecID *codec, void *avc, int container_word_bits) { uint64_t state = 0; int ret, data_type, data_size, offset; int64_t orig_pos = avio_tell(pb); - while (!IS_LE_MARKER(state)) { + if (container_word_bits && container_word_bits != 16 && container_word_bits != 24) + return AVERROR_INVALIDDATA; + while ((container_word_bits == 24 || !IS_16LE_MARKER(state)) + && (container_word_bits == 16 || !IS_20LE_MARKER(state) && !IS_24LE_MARKER(state))) { state = (state << 8) | avio_r8(pb); if (avio_feof(pb)) return AVERROR_EOF; @@ -167,7 +176,7 @@ int ff_s337m_get_packet(AVIOContext *pb, AVPacket *pkt, int size, enum AVCodecID data_size = avio_rl24(pb); } - if ((ret = s337m_get_offset_and_codec(avc, state, data_type, data_size, &offset, codec)) < 0) + if ((ret = s337m_get_offset_and_codec(avc, state, data_type, data_size, container_word_bits, &offset, codec)) < 0) return ret; offset = FFMIN(offset, size - (avio_tell(pb) - orig_pos)); @@ -187,7 +196,7 @@ static int s337m_read_packet(AVFormatContext *s, AVPacket *pkt) enum AVCodecID codec; int ret; - if ((ret = ff_s337m_get_packet(s->pb, pkt, avio_size(s->pb), &codec, s)) < 0) + if ((ret = ff_s337m_get_packet(s->pb, pkt, avio_size(s->pb), &codec, s, 0)) < 0) return ret; if (!s->nb_streams) { diff --git a/libavformat/s337m.h b/libavformat/s337m.h index f7bd0c16f6..af2c4c85a3 100644 --- a/libavformat/s337m.h +++ b/libavformat/s337m.h @@ -30,8 +30,9 @@ * @param size Maximum IO read size available for reading at current position * @param codec Returns AV_CODEC_ID_DOLBY_E * @param avc For av_log + * @param container_word_bits 16,24, or 0 for autodetect * @return = 0 on success (an error is raised if no s337m was found) */ -int ff_s337m_get_packet(AVIOContext *pb, AVPacket *pkt, int size, enum AVCodecID *codec, void *avc); +int ff_s337m_get_packet(AVIOContext *pb, AVPacket *pkt, int size, enum AVCodecID *codec, void *avc, int container_word_bits); #endif /* AVFORMAT_S337M_H */