From patchwork Sun Dec 17 21:47:15 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aurelien Jacobs X-Patchwork-Id: 6832 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp1993326jah; Sun, 17 Dec 2017 13:48:41 -0800 (PST) X-Google-Smtp-Source: ACJfBotbheNREnxPFzt5BKU0/GPdZiQUFAnMvVF0r0qoS7FhF7mLtkfdQfeK/D/sSzb1OP3RD/A3 X-Received: by 10.28.202.26 with SMTP id a26mr10215978wmg.130.1513547321705; Sun, 17 Dec 2017 13:48:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1513547321; cv=none; d=google.com; s=arc-20160816; b=1HRsjrLh2x7M5ri5y/cMxQww9hQs6OdHTBVoLlj4U1jhj3s7NYVZohHoVyIsE3HeE8 Kw6985xdbU8g5iLwocNH/vI0cZiHZ6T5iip5aHfDzX+ovYZ6UfN/QFffGQ1IO6c2/Fc0 Th/iqzyJlnIyiDvsVsSheBoAa+4mDPW6vv11L57L/Ixl/0gdTo5x0lgFQJJs12AhOUld 7fTczhYhOvtPMXhqU3SbwLg3htZn8YzJu2/gsvjBhY3jmhbIo0jBv/iVn2bjaNGCMRYb nWneJoFUMgdfJPfkUbSLWvB7EPPpXfxs1Yyk3xPTNAGjiU0Ee2suFYSkrW545VAKZrGR nHpA== 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=agsECs8B3pp2ioJ0wbSoXBZ4h4eKyLdz/Mvl9aivz4k=; b=MCL01LjhM9tHvsJRlg0vexaoITMq1hVCYr862xtC2a9mI1xfx/aeO5Emb6brImG7Og rcoRzv6MOv+mkWDVHBnmGVaudE16CnnSB52I/J2WMLVuI968+sntoVzXEIBlv67aGxSU FLn+SqN+NJ+0iJeSz41mBi88KXkuaUAXQpzG7WEBRq3cAXqyYTWMZVXi//OLyWeIVz6h 8re6HFwH/5O9s8CI5jOskY23/pATrwW/ho/p56Y8nS1k0QfE+VzfOpjUMU1am2bkNxxL Rw7Ag7KVCEAT3x9T7GntQBpQIYBzpcHIOkMc+54pCXmkpM5bCelvclKYKCp3UckG0Plc TeYg== 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 1si8850611wrt.467.2017.12.17.13.48.41; Sun, 17 Dec 2017 13:48:41 -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 92E92689BE5; Sun, 17 Dec 2017 23:48:14 +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 8E291680A24 for ; Sun, 17 Dec 2017 23:47:44 +0200 (EET) Received: from marge.gnuage.org (unknown [IPv6:2a01:e35:2e26:9790::10]) by smtp6-g21.free.fr (Postfix) with ESMTPS id 6416B7802E5 for ; Sun, 17 Dec 2017 22:47: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 1eQgmn-0004NQ-El; Sun, 17 Dec 2017 22:47:53 +0100 Received: from aurel by xps with local (Exim 4.90_RC4) (envelope-from ) id 1eQgmn-0000zY-As; Sun, 17 Dec 2017 22:47:53 +0100 From: Aurelien Jacobs To: FFmpeg development discussions and patches Date: Sun, 17 Dec 2017 22:47:15 +0100 Message-Id: <20171217214720.3753-3-aurel@gnuage.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20171217214720.3753-1-aurel@gnuage.org> References: <20171217214720.3753-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, URIBL_BLOCKED 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) X-Mailman-Approved-At: Sun, 17 Dec 2017 23:48:12 +0200 Subject: [FFmpeg-devel] [PATCH 3/8] 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/sbcdec.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++ libavformat/utils.c | 1 + 5 files changed, 53 insertions(+) create mode 100644 libavformat/sbcdec.c 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..6270c28a8a 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) += sbcdec.o rawdec.o +OBJS-$(CONFIG_MSBC_DEMUXER) += sbcdec.o 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/sbcdec.c b/libavformat/sbcdec.c new file mode 100644 index 0000000000..a04a7c4328 --- /dev/null +++ b/libavformat/sbcdec.c @@ -0,0 +1,47 @@ +/* + * RAW SBC demuxer + * Copyright (C) 2017 Aurelien Jacobs + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "avformat.h" +#include "rawdec.h" + +#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 diff --git a/libavformat/utils.c b/libavformat/utils.c index 84e49208b8..860fbc30c9 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -336,6 +336,7 @@ static int set_codec_from_probe_data(AVFormatContext *s, AVStream *st, { "mjpeg_2000",AV_CODEC_ID_JPEG2000, AVMEDIA_TYPE_VIDEO }, { "mp3", AV_CODEC_ID_MP3, AVMEDIA_TYPE_AUDIO }, { "mpegvideo", AV_CODEC_ID_MPEG2VIDEO, AVMEDIA_TYPE_VIDEO }, + { "sbc", AV_CODEC_ID_SBC, AVMEDIA_TYPE_AUDIO }, { "truehd", AV_CODEC_ID_TRUEHD, AVMEDIA_TYPE_AUDIO }, { 0 } };