From patchwork Wed Dec 20 19:58:11 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aurelien Jacobs X-Patchwork-Id: 6879 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.79.195 with SMTP id r64csp3371458jad; Wed, 20 Dec 2017 11:59:29 -0800 (PST) X-Google-Smtp-Source: ACJfBosbNMwwTi3xKH2xlqBga0wQd7nZIrFdOQF7K+aIRRsEnChkHrqCeyFV9bTOu/sGT3Uj708L X-Received: by 10.28.110.24 with SMTP id j24mr7224885wmc.100.1513799969482; Wed, 20 Dec 2017 11:59:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1513799969; cv=none; d=google.com; s=arc-20160816; b=sqsKOp8QQ8Hu/W/9JKNwmfJ27WU4/ShgCx3KGEDXDPgMKSTVMQvpSfwpWBsix4qcOD tC+fBcBV3nzcu3b9I+Yo9sk5pl7b/RzVmZss7/xQWpynrBGY+JPvCYMYPRn+vkyD47U+ XpAxorRKaOwkx2iJPRNmEpmVdIgOfhAxp6vhzvq3Io5sLHfmuCAmE/97zCJB9BcDDEE6 1LcvW/fGvWy6GizQ/jrfuqcJQcQYoMtCqs07MzjKCKnB7EuWwIt+YsJk88ta3Zd/Ar+h akByAlP3+ptXUf0msAKMfqBSKSw8Y13e24i0N+f1HE/PNNODYWvdd9nhjnOoj97+y/86 dZNg== 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=Cpx4OFVHG6Gxf0Jtss1Tbq3+um5N2vs2rWd+/K43otE=; b=Fw8ZSskay2FFZoGrb9Rk6l7xntbSQNTUnDZh+/vs4eYb5t1VRfCiuNN36kzoWQAQeI QOi2P+qF6Lh6DYXnBFpldGgfEjv+4cHDs3ucdON2hNloJ0JnXHpiMroq0yZf0IwoU4xO X5oe9Dsv91kYa+ahOJBkMHDcR02En6iyxB/paWqJhEP/uhw0nzkyG+cNobSqE/19K7Oq 68bbvxr3b83mPoDtEicWZezLjthf3EUO4TnoZyReGFO4BuG2fd1wI7NNce2RywAhYH9s hG8/yqTJVX+DGgsTmvKAotyIpW54Y0nMAjuKLPcH/xeuDIcFL14Nx5oJlNgiHXsbLM/p 7Ilw== 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 142si3557879wmq.237.2017.12.20.11.59.29; Wed, 20 Dec 2017 11:59:29 -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 20B59680A9F; Wed, 20 Dec 2017 21:58:44 +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 285DC6804BC for ; Wed, 20 Dec 2017 21:58:43 +0200 (EET) Received: from marge.gnuage.org (unknown [IPv6:2a01:e35:2e26:9790::10]) by smtp6-g21.free.fr (Postfix) with ESMTPS id 12941780333 for ; Wed, 20 Dec 2017 20:58:54 +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 1eRkVx-000746-6u; Wed, 20 Dec 2017 20:58:53 +0100 Received: from aurel by xps with local (Exim 4.90_RC4) (envelope-from ) id 1eRkVx-0004lp-2m; Wed, 20 Dec 2017 20:58:53 +0100 From: Aurelien Jacobs To: FFmpeg development discussions and patches Date: Wed, 20 Dec 2017 20:58:11 +0100 Message-Id: <20171220195814.18269-7-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 07/10] sbc: add raw muxer 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 | 2 +- libavformat/Makefile | 2 ++ libavformat/allformats.c | 4 ++-- libavformat/rawenc.c | 28 ++++++++++++++++++++++++++++ 4 files changed, 33 insertions(+), 3 deletions(-) diff --git a/doc/general.texi b/doc/general.texi index e5669b0e93..560465a4b8 100644 --- a/doc/general.texi +++ b/doc/general.texi @@ -466,7 +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 SBC @tab X @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 88d2cbd2b3..9002808ac1 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -448,7 +448,9 @@ 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_SBC_MUXER) += rawenc.o OBJS-$(CONFIG_MSBC_DEMUXER) += rawdec.o +OBJS-$(CONFIG_MSBC_MUXER) += rawenc.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 a6b72715bd..eb1d17d38c 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -211,7 +211,7 @@ static void register_all(void) REGISTER_MUXDEMUX(MPJPEG, mpjpeg); REGISTER_DEMUXER (MPL2, mpl2); REGISTER_DEMUXER (MPSUB, mpsub); - REGISTER_DEMUXER (MSBC, msbc); + REGISTER_MUXDEMUX(MSBC, msbc); REGISTER_DEMUXER (MSF, msf); REGISTER_DEMUXER (MSNWC_TCP, msnwc_tcp); REGISTER_DEMUXER (MTAF, mtaf); @@ -278,7 +278,7 @@ static void register_all(void) REGISTER_DEMUXER (S337M, s337m); REGISTER_DEMUXER (SAMI, sami); REGISTER_MUXDEMUX(SAP, sap); - REGISTER_DEMUXER (SBC, sbc); + REGISTER_MUXDEMUX(SBC, sbc); REGISTER_DEMUXER (SBG, sbg); REGISTER_MUXDEMUX(SCC, scc); REGISTER_DEMUXER (SDP, sdp); diff --git a/libavformat/rawenc.c b/libavformat/rawenc.c index aa3ef76fbf..e27b280014 100644 --- a/libavformat/rawenc.c +++ b/libavformat/rawenc.c @@ -426,6 +426,34 @@ AVOutputFormat ff_rawvideo_muxer = { }; #endif +#if CONFIG_SBC_MUXER +AVOutputFormat ff_sbc_muxer = { + .name = "sbc", + .long_name = NULL_IF_CONFIG_SMALL("raw SBC"), + .mime_type = "audio/x-sbc", + .extensions = "sbc", + .audio_codec = AV_CODEC_ID_SBC, + .video_codec = AV_CODEC_ID_NONE, + .write_header = force_one_stream, + .write_packet = ff_raw_write_packet, + .flags = AVFMT_NOTIMESTAMPS, +}; +#endif + +#if CONFIG_MSBC_MUXER +AVOutputFormat ff_msbc_muxer = { + .name = "msbc", + .long_name = NULL_IF_CONFIG_SMALL("raw mSBC"), + .mime_type = "audio/x-msbc", + .extensions = "msbc", + .audio_codec = AV_CODEC_ID_MSBC, + .video_codec = AV_CODEC_ID_NONE, + .write_header = force_one_stream, + .write_packet = ff_raw_write_packet, + .flags = AVFMT_NOTIMESTAMPS, +}; +#endif + #if CONFIG_TRUEHD_MUXER AVOutputFormat ff_truehd_muxer = { .name = "truehd",