From patchwork Mon Feb 13 18:09:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Gaullier X-Patchwork-Id: 40384 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:5494:b0:bf:7b3a:fd32 with SMTP id i20csp3677079pzk; Mon, 13 Feb 2023 10:10:34 -0800 (PST) X-Google-Smtp-Source: AK7set9JjXrUP2PM10bufAQQaR4Db94htMvsNfLEoXZrsujTANihC53/WMeCXgUlRMUtulq/wAY/ X-Received: by 2002:a17:907:7d90:b0:8b1:16b5:f7e2 with SMTP id oz16-20020a1709077d9000b008b116b5f7e2mr3524206ejc.52.1676311834214; Mon, 13 Feb 2023 10:10:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676311834; cv=none; d=google.com; s=arc-20160816; b=U1xR0jQTO9LCOY+iysrEicV9U+6EPTi7DhDIBT77yjoTaovymnPyE2DonC9sApfHea 1dHwtadi9+P4fdeWTkvo/NGYka/nEaHO2Ojf5EaHupXHTuWGzk9vhYxsZDz7iDAsqv4R P0hWOcAWcmHXdFrPkON84bJh7qwfkeEixlL3p4G2EjwwmsUiLHljBb8Y5N4JC+nbLo+7 jy9iaj6EngUybQLF1GL+t//vjzeDvg7jCDae5aGNuTzy3q+NxYLapLzAa48smJjmLn4K 1WqWdX8pOg+YMeW8mnh6r2y2lZJ8Ekebk/lt03a0EbILxeTLEoM1+5PvK6lq7IjQsfT5 DPsQ== 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=TGrTvhyfHcB1fosmo0/GywtdtNb0KtPlUNQ78bPnyWE=; b=jUSBMWoDByAk925D1xRRqVelX/yCQyDdHX612KmpOxlYGgaMUEijs3eOJTzKpmMA2Z UMh7FarlVea92wnZAPuVhwEyrU0UxS3eh9owvJCEx9Nfnh9RublmlVb5/FiQnw3Bup5h ynFXEOdYb2T7qeA//LOoGHeh56WZTVGWy51RD/C2JStq1Yr/DT3XLsSX8e+ehXGJlC/j wtDeto4dqbZA/21gP3PQMi5YiQRw/6Qh5ncEiTxwduj0qz6an93+FMguHwHFTcxZY2Gq t5IIQE9dYWIWL4j90WUwYJqob7jg/QdcUeIvZKj8nH0p4Yx76f0jtOpZ+ExAq+gwPPUz Nnaw== 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 18-20020a170906011200b0087bdb2961b5si17480620eje.886.2023.02.13.10.10.33; Mon, 13 Feb 2023 10:10:34 -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 42C3A68BE80; Mon, 13 Feb 2023 20:09:55 +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 3F42C68BD2E for ; Mon, 13 Feb 2023 20:09:45 +0200 (EET) Received: from cji.paris (unknown [172.16.3.159]) by srv-infra-2.infra.inf.glb.tvvideoms.com (Postfix) with ESMTP id B903342D5D; Mon, 13 Feb 2023 18:09:44 +0000 (UTC) From: Nicolas Gaullier To: ffmpeg-devel@ffmpeg.org Date: Mon, 13 Feb 2023 19:09:34 +0100 Message-Id: <20230213180936.815-5-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 4/6] avformat/wavdec: s337m support 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: 4ak5VEPfWxMJ Add s337m probing and demuxing similarly to spdif. Add 'non_pcm_mode' option to disable s337m demuxing (pass-through). --- libavformat/wavdec.c | 47 +++++++++++++++++++++++++++++++++++--------- 1 file changed, 38 insertions(+), 9 deletions(-) diff --git a/libavformat/wavdec.c b/libavformat/wavdec.c index e3f790fcc9..fd9ca89880 100644 --- a/libavformat/wavdec.c +++ b/libavformat/wavdec.c @@ -45,6 +45,7 @@ #include "riff.h" #include "w64.h" #include "spdif.h" +#include "s337m.h" typedef struct WAVDemuxContext { const AVClass *class; @@ -61,9 +62,11 @@ typedef struct WAVDemuxContext { int ignore_length; int max_size; int spdif; + int s337m; int smv_given_first; int unaligned; // e.g. if an odd number of bytes ID3 tag was prepended int rifx; // RIFX: integer byte order for parameters is big endian + int non_pcm_mode; } WAVDemuxContext; #define OFFSET(x) offsetof(WAVDemuxContext, x) @@ -74,12 +77,18 @@ static const AVOption demux_options[] = { { "ignore_length", "Ignore length", OFFSET(ignore_length), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, DEC }, #endif { "max_size", "max size of single packet", OFFSET(max_size), AV_OPT_TYPE_INT, { .i64 = 4096 }, 1024, 1 << 22, DEC }, +#if CONFIG_S337M_DEMUXER + {"non_pcm_mode", "Chooses what to do with s337m", OFFSET(non_pcm_mode), AV_OPT_TYPE_INT, {.i64 = 1}, 0, 1, DEC, "non_pcm_mode"}, + {"copy" , "Pass s337m through unchanged", 0, AV_OPT_TYPE_CONST, {.i64 = 0}, 0, 1, DEC, "non_pcm_mode"}, + {"demux" , "Demux s337m" , 0, AV_OPT_TYPE_CONST, {.i64 = 1}, 0, 1, DEC, "non_pcm_mode"}, +#endif { NULL }, }; -static void set_spdif(AVFormatContext *s, WAVDemuxContext *wav) +static void set_spdif_s337m(AVFormatContext *s, WAVDemuxContext *wav) { - if (CONFIG_SPDIF_DEMUXER && s->streams[0]->codecpar->codec_tag == 1) { + AVCodecParameters *par = s->streams[0]->codecpar; + if ((CONFIG_SPDIF_DEMUXER || CONFIG_S337M_DEMUXER) && par->codec_tag == 1) { enum AVCodecID codec; int len = 1<<16; int ret = ffio_ensure_seekback(s->pb, len); @@ -92,10 +101,24 @@ static void set_spdif(AVFormatContext *s, WAVDemuxContext *wav) int64_t pos = avio_tell(s->pb); len = ret = avio_read(s->pb, buf, len); if (len >= 0) { - ret = ff_spdif_probe(buf, len, &codec); - if (ret > AVPROBE_SCORE_EXTENSION) { - s->streams[0]->codecpar->codec_id = codec; - wav->spdif = 1; + if (CONFIG_SPDIF_DEMUXER) { + ret = ff_spdif_probe(buf, len, &codec); + if (ret > AVPROBE_SCORE_EXTENSION) { + par->codec_id = codec; + wav->spdif = 1; + } + } + if (CONFIG_S337M_DEMUXER && !wav->spdif + && (par->codec_id == AV_CODEC_ID_PCM_S16LE || par->codec_id == AV_CODEC_ID_PCM_S24LE) && par->ch_layout.nb_channels == 2) { + ret = ff_s337m_probe(buf, len, &codec, par->bits_per_coded_sample); + if (ret > AVPROBE_SCORE_EXTENSION) { + if (wav->non_pcm_mode) { + par->codec_id = codec; + wav->s337m = 1; + } else { + av_log(s, AV_LOG_INFO, "Passing through S337M data: codec will not be reported\n"); + } + } } } avio_seek(s->pb, pos, SEEK_SET); @@ -104,7 +127,7 @@ static void set_spdif(AVFormatContext *s, WAVDemuxContext *wav) } if (ret < 0) - av_log(s, AV_LOG_WARNING, "Cannot check for SPDIF\n"); + av_log(s, AV_LOG_WARNING, "Cannot check for SPDIF/S337M\n"); } } @@ -668,7 +691,7 @@ break_loop: ff_metadata_conv_ctx(s, NULL, wav_metadata_conv); ff_metadata_conv_ctx(s, NULL, ff_riff_info_conv); - set_spdif(s, wav); + set_spdif_s337m(s, wav); return 0; } @@ -766,6 +789,10 @@ smv_out: wav->data_end = avio_tell(s->pb) + left; } + if (CONFIG_S337M_DEMUXER && wav->s337m == 1) { + size = FFMIN(S337M_MAX_OFFSET, left); + ret = ff_s337m_get_packet(s->pb, pkt, size, NULL, s, st->codecpar->bits_per_coded_sample); + } else { size = wav->max_size; if (st->codecpar->block_align > 1) { if (size < st->codecpar->block_align) @@ -774,6 +801,8 @@ smv_out: } size = FFMIN(size, left); ret = av_get_packet(s->pb, pkt, size); + } + if (ret < 0) return ret; pkt->stream_index = 0; @@ -960,7 +989,7 @@ static int w64_read_header(AVFormatContext *s) avio_seek(pb, data_ofs, SEEK_SET); - set_spdif(s, wav); + set_spdif_s337m(s, wav); return 0; }