From patchwork Tue Aug 6 11:50:43 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gaullier Nicolas X-Patchwork-Id: 14265 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 6817B44A215 for ; Tue, 6 Aug 2019 14:51:00 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 596DC68AAAA; Tue, 6 Aug 2019 14:51:00 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from smtp-2.arkena.net (smtp-2.arkena.net [95.81.173.75]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 788956805E0 for ; Tue, 6 Aug 2019 14:50:51 +0300 (EEST) Received: from secu2 (unknown [10.180.103.10]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp-2.arkena.net (Postfix) with ESMTPSA id 462tHv0HfdzHh9j; Tue, 6 Aug 2019 11:50:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=arkena.com; s=20150421; t=1565092251; bh=hTbF66S1Gu1LOpbxFZbOjU5v1CpfsuACBGseP1mVx3o=; h=From:To:Cc:Subject:Date:Message-Id; b=Csme7WLfEGy9k+1LSrpKnWEgWFLvn9zVmUbaXKZbqNNC7TEvuh4mxlYsWnJg9qrAL dSQPaekOC8iPPEoHDsSFMxMDE7DGmiNi4k0+FOigb36jqUOChLK43R2Nrp8x8bwxpF 6CNKsqNb76KgGGhw51F7qdanaK9pKCy35vfgDsbM= Received: from arkena.com (unknown [172.16.3.159]) by secu2 (Postfix) with ESMTP id 971823FA6D; Tue, 6 Aug 2019 13:28:02 +0200 (CEST) From: Nicolas Gaullier To: ffmpeg-devel@ffmpeg.org Date: Tue, 6 Aug 2019 13:50:43 +0200 Message-Id: <20190806115044.4116-5-nicolas.gaullier@arkena.com> X-Mailer: git-send-email 2.14.1.windows.1 In-Reply-To: <20190806115044.4116-1-nicolas.gaullier@arkena.com> References: <20190806115044.4116-1-nicolas.gaullier@arkena.com> Subject: [FFmpeg-devel] [PATCH v2 4/5] avformat/wavdec: s337m support X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Enabled by AVOption dolbyeprobe Requires stereo --- libavformat/s337m.h | 1 + libavformat/wavdec.c | 41 ++++++++++++++++++++++++++++++++++------- 2 files changed, 35 insertions(+), 7 deletions(-) diff --git a/libavformat/s337m.h b/libavformat/s337m.h index bfe2a5d457..0c3fbf1990 100644 --- a/libavformat/s337m.h +++ b/libavformat/s337m.h @@ -32,6 +32,7 @@ #define S337M_MIN_OFFSET 1601*4 #define S337M_MAX_OFFSET 2002*6 +#define S337M_MAX_RECOMMENDED_PROBE_SIZE 2*S337M_MAX_OFFSET #define S337M_PHASE_PROBE_MIN 0.000000 #define DOLBY_E_PHASE_MIN 0.000610 diff --git a/libavformat/wavdec.c b/libavformat/wavdec.c index 52194f54ef..fdcd7233f7 100644 --- a/libavformat/wavdec.c +++ b/libavformat/wavdec.c @@ -41,6 +41,9 @@ #include "riff.h" #include "w64.h" #include "spdif.h" +#if CONFIG_S337M_DEMUXER +#include "s337m.h" +#endif typedef struct WAVDemuxContext { const AVClass *class; @@ -59,6 +62,9 @@ typedef struct WAVDemuxContext { 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 +#if CONFIG_S337M_DEMUXER + int dolby_e_probe; +#endif } WAVDemuxContext; static void set_spdif(AVFormatContext *s, WAVDemuxContext *wav) @@ -593,6 +599,10 @@ break_loop: } else if (st->codecpar->codec_id == AV_CODEC_ID_ADPCM_MS && st->codecpar->channels > 2) { st->codecpar->block_align *= st->codecpar->channels; } +#if CONFIG_S337M_DEMUXER + if (wav->dolby_e_probe) + avpriv_s337m_probe_stream((void *)s, s->pb, &st, FFMIN(S337M_MAX_RECOMMENDED_PROBE_SIZE, wav->data_end - avio_tell(pb))); +#endif ff_metadata_conv_ctx(s, NULL, wav_metadata_conv); ff_metadata_conv_ctx(s, NULL, ff_riff_info_conv); @@ -701,14 +711,24 @@ smv_out: wav->data_end = avio_tell(s->pb) + left; } - size = MAX_SIZE; - if (st->codecpar->block_align > 1) { - if (size < st->codecpar->block_align) - size = st->codecpar->block_align; - size = (size / st->codecpar->block_align) * st->codecpar->block_align; +#if CONFIG_S337M_DEMUXER + if (st->codecpar->codec_id != AV_CODEC_ID_DOLBY_E) { +#endif + size = MAX_SIZE; + if (st->codecpar->block_align > 1) { + if (size < st->codecpar->block_align) + size = st->codecpar->block_align; + size = (size / st->codecpar->block_align) * st->codecpar->block_align; + } + size = FFMIN(size, left); + ret = av_get_packet(s->pb, pkt, size); +#if CONFIG_S337M_DEMUXER + } else { + size = FFMIN(S337M_MAX_RECOMMENDED_PROBE_SIZE, left); + ret = avpriv_s337m_get_packet((void *)s, s->pb, pkt, size, 0); } - size = FFMIN(size, left); - ret = av_get_packet(s->pb, pkt, size); +#endif + if (ret < 0) return ret; pkt->stream_index = 0; @@ -754,6 +774,9 @@ static int wav_read_seek(AVFormatContext *s, #define DEC AV_OPT_FLAG_DECODING_PARAM static const AVOption demux_options[] = { { "ignore_length", "Ignore length", OFFSET(ignore_length), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, DEC }, +#if CONFIG_S337M_DEMUXER + {"dolbyeprobe", "probe Dolby E in pcm/stereo streams", OFFSET(dolby_e_probe), AV_OPT_TYPE_BOOL, {.i64 = 0 }, 0, 1, DEC }, +#endif { NULL }, }; @@ -895,6 +918,10 @@ static int w64_read_header(AVFormatContext *s) st->need_parsing = AVSTREAM_PARSE_FULL_RAW; avio_seek(pb, data_ofs, SEEK_SET); +#if CONFIG_S337M_DEMUXER + if (wav->dolby_e_probe) + avpriv_s337m_probe_stream((void *)s, s->pb, &st, FFMIN(S337M_MAX_RECOMMENDED_PROBE_SIZE, wav->data_end - avio_tell(pb))); +#endif set_spdif(s, wav);