From patchwork Wed Feb 21 22:37:15 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aurelien Jacobs X-Patchwork-Id: 7705 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.150.33 with SMTP id c30csp1329224jai; Wed, 21 Feb 2018 14:39:38 -0800 (PST) X-Google-Smtp-Source: AH8x227Cif90MFxB0JvkGeEJRgQ5ytWUmQxMwYy+wXXfKuo4OZ7uGt6wNmlm9vf4dhUx7hX0HKU5 X-Received: by 10.28.210.212 with SMTP id j203mr3360334wmg.53.1519252778056; Wed, 21 Feb 2018 14:39:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519252778; cv=none; d=google.com; s=arc-20160816; b=LMViv4OzNcaOLHaEKrHDnHwcuM7nXitDGfVJz/gu8OPns05/gxyXayPpyjK8piRnjV fMhg0ffxvPp/5qJqeHYO7rbDZlC6gFFuVQqzF7fw4YlKVBags4amVe/ZjTIYcECrLnJd 7ok/cu7gF7BFP5wNNjLE/7kN0M/TkDvu9vWIp+IT1kqXLIXkcncc+HdQiQXCP1srsGG4 wmcgthEvjfyF8vVfngD5ecHZDgV8/efHNCXruwZ88ayOaPgDZu/YOX8poZ9mX6QprABZ tHkXqrqupI4qZNw01gjUKg8DORy2LlpHToX/8MpGOYULbp3cJH4frD4Add9gE3IYMYjC orMw== 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=caZuJWpCNG0U9XcmSwPRND6ZTeyupGPOulARiaYhztQ=; b=la1fSUNCuzxY64/X2H4J9Qd8sgaWPusO3tevDdwjKSrfcbAZxeUqG1hJbHDfXEBQvU iCPabBPlifpA1k+u3FYP1PXJ1Xj0vSyFyDMnEPoFfi/6WfZRJS1fT5UvsefGNTapAt9z ECR2mMuXr70GNvqZddWqy8ew3RxOeUIdCDRamFqHr5HGXzkAEv08rI8E4hcDowQYeBuo Eci4deKt0pGbb5eOuEXGhNj+1KnQKcd5zpPxXpC6umi8kMEwU2k8NijDM12rLsedWVbg BA8dljAyDnxswnbd53iF16Jjbn55qfoEBxUV9eGIbWj3TRafqKkejCGOYjOD0SbRQF0r axkQ== 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 f19si8200571wrh.18.2018.02.21.14.39.37; Wed, 21 Feb 2018 14:39:38 -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 C25C268A494; Thu, 22 Feb 2018 00:39:09 +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 C663A68A47D for ; Thu, 22 Feb 2018 00:39:07 +0200 (EET) Received: from marge.gnuage.org (unknown [IPv6:2a01:e35:2e26:9790::10]) by smtp6-g21.free.fr (Postfix) with ESMTPS id 539E6780336 for ; Wed, 21 Feb 2018 23:39:09 +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 1eod2a-0000LS-I7; Wed, 21 Feb 2018 23:39:08 +0100 Received: from aurel by xps with local (Exim 4.90_1) (envelope-from ) id 1eod2Y-0005SJ-F5; Wed, 21 Feb 2018 23:39:06 +0100 From: Aurelien Jacobs To: FFmpeg development discussions and patches Date: Wed, 21 Feb 2018 23:37:15 +0100 Message-Id: <20180221223718.20789-7-aurel@gnuage.org> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180221223718.20789-1-aurel@gnuage.org> References: <20180221223718.20789-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 6/9] 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 | 1 + libavformat/allformats.c | 1 + libavformat/rawenc.c | 13 +++++++++++++ 4 files changed, 16 insertions(+), 1 deletion(-) diff --git a/doc/general.texi b/doc/general.texi index bf62288f64..118bfd8bd9 100644 --- a/doc/general.texi +++ b/doc/general.texi @@ -479,7 +479,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 1efa3a54f8..8f3272efdf 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -449,6 +449,7 @@ OBJS-$(CONFIG_SAMI_DEMUXER) += samidec.o subtitles.o OBJS-$(CONFIG_SAP_DEMUXER) += sapdec.o OBJS-$(CONFIG_SAP_MUXER) += sapenc.o OBJS-$(CONFIG_SBC_DEMUXER) += sbcdec.o rawdec.o +OBJS-$(CONFIG_SBC_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 04164607ce..05894094a7 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -351,6 +351,7 @@ extern AVInputFormat ff_sami_demuxer; extern AVInputFormat ff_sap_demuxer; extern AVOutputFormat ff_sap_muxer; extern AVInputFormat ff_sbc_demuxer; +extern AVOutputFormat ff_sbc_muxer; extern AVInputFormat ff_sbg_demuxer; extern AVInputFormat ff_scc_demuxer; extern AVOutputFormat ff_scc_muxer; diff --git a/libavformat/rawenc.c b/libavformat/rawenc.c index dcf880d17e..caf4607dde 100644 --- a/libavformat/rawenc.c +++ b/libavformat/rawenc.c @@ -439,6 +439,19 @@ 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,msbc", + .audio_codec = AV_CODEC_ID_SBC, + .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",