From patchwork Sun Nov 5 23:35:20 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aurelien Jacobs X-Patchwork-Id: 5875 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.90 with SMTP id m26csp2310364jah; Sun, 5 Nov 2017 15:36:05 -0800 (PST) X-Google-Smtp-Source: ABhQp+SlIag45lmkS4JyvtgjT3NtG4RMEev4KvRwbrzMn78SZ3lwBiymhdl1e3YE9Igh3zjwasOu X-Received: by 10.223.135.3 with SMTP id a3mr10649344wra.109.1509924965861; Sun, 05 Nov 2017 15:36:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1509924965; cv=none; d=google.com; s=arc-20160816; b=oQLfkqD0dqKItOucoEwqqLib3C2QK3KmKHIOPpi+OBG2uNaZ5N1sb6NtAX4Q8yulLN /R9bSdNY0t6hZeGDwfFqy4vsiDg/yxBJ5fJ1gFFQI49ryk3X0ZvjaOxaCSEdQo9IYiTi rI1yO9KgQ91GTllcHMrdFjzlG6JtEvU/k1g1C8KeskOn3Fv/yB1Wyv9fFEk/IFArAK3q ioItA8DV4GhCP06ucKQzzghH71bI7EO45RZrNYX1YXBpwdT9Qo/pLrxqnUjkuZNBkRYx 97a2lDZIYfdkafs6BVAzVWW4354Qn70Jkg/vfIY9r9apiC5V/Nre919OYlezeYSdi3zf mmXg== 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=rGfKizuWP9C3srG5RlBGlQH9ov/rrrGnGHm/SIU2Nr0=; b=Q/sJb/bRTgyz0Zy36Gz3ZHDjW9EGMXeXfb+FrJak3scTp8jA7wd/9Z6aVL3gsEoGYD p1NHencWAp8se2Di/5QeK1TibmsoAfCa3nJEbbvi0W4xXIBX1fEGqfbJHT/QPCR+ddA9 nQYqrHUI0HDy1shhjjYQrpyN9s3awFBkzseTfBpYumgd3tpWEiQg+L90ksvWsQZEaE7p 0IFjXuERgkucC8RbbHXMgALGdlRYbBXbpxrgl/9PIweKqBvSeukhM6UONC368f2xDcl/ 8/I1erKeYTFlDB1irvMmACMm8PmhkxV4rS6RoUkhWE+DhJbE9toauX0ojC4A+WFdB1p7 /wFQ== 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 j127si5620021wma.179.2017.11.05.15.36.05; Sun, 05 Nov 2017 15:36:05 -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 0EC0F689DF0; Mon, 6 Nov 2017 01:35: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 33869680B89 for ; Mon, 6 Nov 2017 01:35:38 +0200 (EET) Received: from marge.gnuage.org (unknown [IPv6:2a01:e35:2e26:9790::10]) by smtp6-g21.free.fr (Postfix) with ESMTPS id D94BF780306 for ; Mon, 6 Nov 2017 00:35:49 +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 1eBUSB-0002G4-Hy; Mon, 06 Nov 2017 00:35:49 +0100 Received: from aurel by xps with local (Exim 4.89) (envelope-from ) id 1eBUSB-00049u-DW; Mon, 06 Nov 2017 00:35:47 +0100 From: Aurelien Jacobs To: FFmpeg development discussions and patches Date: Mon, 6 Nov 2017 00:35:20 +0100 Message-Id: <20171105233520.15856-4-aurel@gnuage.org> X-Mailer: git-send-email 2.15.0 In-Reply-To: <20171105233520.15856-1-aurel@gnuage.org> References: <20171105233520.15856-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-SA-Exim-Version: 4.2.1 (built Tue, 02 Aug 2016 21:08:31 +0000) X-SA-Exim-Scanned: No (on marge.gnuage.org); Unknown failure Subject: [FFmpeg-devel] [PATCH 3/3] sbc: add raw muxer and 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 | 4 +++ libavformat/allformats.c | 2 ++ libavformat/rawenc.c | 28 ++++++++++++++++++ libavformat/sbcdec.c | 76 ++++++++++++++++++++++++++++++++++++++++++++++++ libavformat/utils.c | 1 + 6 files changed, 112 insertions(+) create mode 100644 libavformat/sbcdec.c diff --git a/doc/general.texi b/doc/general.texi index baaa308dcf..74f72be69a 100644 --- a/doc/general.texi +++ b/doc/general.texi @@ -462,6 +462,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 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 caebe5b146..0dff981c01 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -442,6 +442,10 @@ 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_SBC_MUXER) += rawenc.o +OBJS-$(CONFIG_MSBC_DEMUXER) += sbcdec.o 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 405ddb5ad9..a7109d5abb 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -208,6 +208,7 @@ static void register_all(void) REGISTER_MUXDEMUX(MPJPEG, mpjpeg); REGISTER_DEMUXER (MPL2, mpl2); REGISTER_DEMUXER (MPSUB, mpsub); + REGISTER_MUXDEMUX(MSBC, msbc); REGISTER_DEMUXER (MSF, msf); REGISTER_DEMUXER (MSNWC_TCP, msnwc_tcp); REGISTER_DEMUXER (MTAF, mtaf); @@ -273,6 +274,7 @@ static void register_all(void) REGISTER_DEMUXER (S337M, s337m); REGISTER_DEMUXER (SAMI, sami); REGISTER_MUXDEMUX(SAP, sap); + 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 f640121cb4..ac0119489c 100644 --- a/libavformat/rawenc.c +++ b/libavformat/rawenc.c @@ -413,6 +413,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", diff --git a/libavformat/sbcdec.c b/libavformat/sbcdec.c new file mode 100644 index 0000000000..1eb99bae03 --- /dev/null +++ b/libavformat/sbcdec.c @@ -0,0 +1,76 @@ +/* + * 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" + +#define SBC_SYNCWORD 0x9C +#define MSBC_SYNCWORD 0xAD + +#if CONFIG_SBC_DEMUXER +static int sbc_probe(AVProbeData *p) +{ + int score = 0; + int l = strlen(p->filename); + if (l > 4 && !strcmp(&p->filename[l-4], ".sbc")) + score = AVPROBE_SCORE_EXTENSION; + if (p->buf[0] == SBC_SYNCWORD) + score++; + return score; +} + +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_probe = sbc_probe, + .read_header = ff_raw_audio_read_header, + .read_packet = ff_raw_read_partial_packet, + .flags = AVFMT_GENERIC_INDEX, +}; +#endif + +#if CONFIG_MSBC_DEMUXER +static int msbc_probe(AVProbeData *p) +{ + int score = 0; + int l = strlen(p->filename); + if (l > 5 && !strcmp(&p->filename[l-5], ".msbc")) + score = AVPROBE_SCORE_EXTENSION; + else if (l > 4 && !strcmp(&p->filename[l-4], ".sbc")) + score = AVPROBE_SCORE_EXTENSION; + if (p->buf[0] == MSBC_SYNCWORD) + score++; + return score; +} + +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_probe = msbc_probe, + .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 cbfb78bf4d..dedabee642 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -335,6 +335,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 } };