From patchwork Wed Dec 20 19:58:09 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aurelien Jacobs X-Patchwork-Id: 6877 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.79.195 with SMTP id r64csp3371169jad; Wed, 20 Dec 2017 11:59:08 -0800 (PST) X-Google-Smtp-Source: ACJfBotrBrYy99QSpbcJPiR+zgcWGzgxgL5xtRsr/W/i18Kgu7Yyn1lPP7+dWE0XYaD8Kkq8IIBX X-Received: by 10.28.191.132 with SMTP id o4mr7355935wmi.157.1513799948770; Wed, 20 Dec 2017 11:59:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1513799948; cv=none; d=google.com; s=arc-20160816; b=YWDVFVmDLcV1r78hGOWTo0To/rhYLCbd1XDoLnqKoJXKOQ/0sXqLBbyHfbnEYlTc4j WEkeO6/2ijTyTPcNg+CO+NkQ/elynf3M4N57b8DHbhEfBbVaOFIh6t8vyCkILMTjLegW /voyj7v5Ii9m4QHDkZ4qEWyq0YPRIubLYRXMkrh3v77zrjwGNqyPYri5R/jvGxiZflgK YkTBBGYdwUtolTcXdoXpcni3GdRf2SnRgnj0NpXPsiiDOQgEdpibrLzwe04xiIP+2F3f d1A7QwxQKJLAL+Uu9/26Q/vYwz1PxPRfsNqkZXd8rSRGK+V24zL0UlqOp1u+Pnwse3aU IUkQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:delivered-to:arc-authentication-results; bh=+UgLweD6QRAIZB90by2m2zQz8HDFElh1t8Al6ZzCREE=; b=YNUt8rZWgUsevJVPIEg+Sslm3LITWZX2t1Nd2N/i3VDyA6AbO71ukHSLdmlzy1+PPf AfUFmSFBkUHInz2XIPPmDflYB5eFO8eea0waJEmSC1O+MhoQTC8Ejjt2QhcTHO/aIJLQ yIdzdlQ/1T6RtOswxEWozHt5QSq2vbPH8O/JHoT/Nv/J8mC4P+z2cmVaxpyUD5xpphF+ U7JirYqjA/ZDuGAAia6Fivk1IODqPct75fsiq5aqQK5pvTnD07evolKpwXwFLRP0JqFg npA5OrgPObUQ761hBvYrbNOCUJ2wv6hIP0qDshMMEmr2A0+H4UEB6YWPX7xaieFgeeS4 UD8g== 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 y8si14730792wrg.408.2017.12.20.11.59.08; Wed, 20 Dec 2017 11:59:08 -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 3AD2068076D; Wed, 20 Dec 2017 21:58:37 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from smtp6-g21.free.fr (smtp6-g21.free.fr [212.27.42.6]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5805668076D for ; Wed, 20 Dec 2017 21:58:30 +0200 (EET) Received: from marge.gnuage.org (unknown [IPv6:2a01:e35:2e26:9790::10]) by smtp6-g21.free.fr (Postfix) with ESMTPS id 61304780313 for ; Wed, 20 Dec 2017 20:58:41 +0100 (CET) Received: from [2a01:e35:2e26:9790:bc8a:b994:5b68:84cc] (helo=xps) by marge.gnuage.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1eRkVj-00073a-Ur; Wed, 20 Dec 2017 20:58:40 +0100 Received: from aurel by xps with local (Exim 4.90_RC4) (envelope-from ) id 1eRkVj-0004lj-S3; Wed, 20 Dec 2017 20:58:39 +0100 From: Aurelien Jacobs To: FFmpeg development discussions and patches Date: Wed, 20 Dec 2017 20:58:09 +0100 Message-Id: <20171220195814.18269-5-aurel@gnuage.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20171220195814.18269-1-aurel@gnuage.org> References: <20171220195814.18269-1-aurel@gnuage.org> X-SA-Exim-Connect-IP: 2a01:e35:2e26:9790:bc8a:b994:5b68:84cc X-SA-Exim-Mail-From: aurel@gnuage.org X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on marge.gnuage.org X-Spam-Level: X-Spam-Status: No, score=-0.2 required=3.0 tests=BAYES_00, FSL_HELO_NON_FQDN_1, RDNS_NONE autolearn=no autolearn_force=no version=3.4.1 X-SA-Exim-Version: 4.2.1 (built Tue, 02 Aug 2016 21:08:31 +0000) X-SA-Exim-Scanned: Yes (on marge.gnuage.org) Subject: [FFmpeg-devel] [PATCH 05/10] sbc: add raw demuxer for SBC 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: Aurelien Jacobs MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- doc/general.texi | 1 + libavformat/Makefile | 2 ++ libavformat/allformats.c | 2 ++ libavformat/rawdec.c | 24 ++++++++++++++++++++++++ 4 files changed, 29 insertions(+) diff --git a/doc/general.texi b/doc/general.texi index ed137f999f..65aee47f2a 100644 --- a/doc/general.texi +++ b/doc/general.texi @@ -466,6 +466,7 @@ library: @item raw NULL @tab X @tab @item raw video @tab X @tab X @item raw id RoQ @tab X @tab +@item raw SBC @tab @tab X @item raw Shorten @tab @tab X @item raw TAK @tab @tab X @item raw TrueHD @tab X @tab X diff --git a/libavformat/Makefile b/libavformat/Makefile index cb70eac920..88d2cbd2b3 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -447,6 +447,8 @@ OBJS-$(CONFIG_S337M_DEMUXER) += s337m.o spdif.o OBJS-$(CONFIG_SAMI_DEMUXER) += samidec.o subtitles.o OBJS-$(CONFIG_SAP_DEMUXER) += sapdec.o OBJS-$(CONFIG_SAP_MUXER) += sapenc.o +OBJS-$(CONFIG_SBC_DEMUXER) += rawdec.o +OBJS-$(CONFIG_MSBC_DEMUXER) += rawdec.o OBJS-$(CONFIG_SBG_DEMUXER) += sbgdec.o OBJS-$(CONFIG_SCC_DEMUXER) += sccdec.o subtitles.o OBJS-$(CONFIG_SCC_MUXER) += sccenc.o subtitles.o diff --git a/libavformat/allformats.c b/libavformat/allformats.c index 6a9b9883c9..a6b72715bd 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -211,6 +211,7 @@ static void register_all(void) REGISTER_MUXDEMUX(MPJPEG, mpjpeg); REGISTER_DEMUXER (MPL2, mpl2); REGISTER_DEMUXER (MPSUB, mpsub); + REGISTER_DEMUXER (MSBC, msbc); REGISTER_DEMUXER (MSF, msf); REGISTER_DEMUXER (MSNWC_TCP, msnwc_tcp); REGISTER_DEMUXER (MTAF, mtaf); @@ -277,6 +278,7 @@ static void register_all(void) REGISTER_DEMUXER (S337M, s337m); REGISTER_DEMUXER (SAMI, sami); REGISTER_MUXDEMUX(SAP, sap); + REGISTER_DEMUXER (SBC, sbc); REGISTER_DEMUXER (SBG, sbg); REGISTER_MUXDEMUX(SCC, scc); REGISTER_DEMUXER (SDP, sdp); diff --git a/libavformat/rawdec.c b/libavformat/rawdec.c index e926549a60..d94f4972cb 100644 --- a/libavformat/rawdec.c +++ b/libavformat/rawdec.c @@ -191,3 +191,27 @@ static int mjpeg_probe(AVProbeData *p) FF_DEF_RAWVIDEO_DEMUXER2(mjpeg, "raw MJPEG video", mjpeg_probe, "mjpg,mjpeg,mpo", AV_CODEC_ID_MJPEG, AVFMT_GENERIC_INDEX|AVFMT_NOTIMESTAMPS) #endif + +#if CONFIG_SBC_DEMUXER +AVInputFormat ff_sbc_demuxer = { + .name = "sbc", + .long_name = NULL_IF_CONFIG_SMALL("raw SBC (low-complexity subband codec)"), + .extensions = "sbc", + .raw_codec_id = AV_CODEC_ID_SBC, + .read_header = ff_raw_audio_read_header, + .read_packet = ff_raw_read_partial_packet, + .flags = AVFMT_GENERIC_INDEX, +}; +#endif + +#if CONFIG_MSBC_DEMUXER +AVInputFormat ff_msbc_demuxer = { + .name = "msbc", + .long_name = NULL_IF_CONFIG_SMALL("raw mSBC (wideband speech mono SBC)"), + .extensions = "msbc", + .raw_codec_id = AV_CODEC_ID_MSBC, + .read_header = ff_raw_audio_read_header, + .read_packet = ff_raw_read_partial_packet, + .flags = AVFMT_GENERIC_INDEX, +}; +#endif