From patchwork Sun Dec 17 21:47:14 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aurelien Jacobs X-Patchwork-Id: 6834 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp1993257jah; Sun, 17 Dec 2017 13:48:33 -0800 (PST) X-Google-Smtp-Source: ACJfBovwa3jHMAd8M2lrJCDtm8HFf3b7XFjZzTsIdjUdeQBpFBvGcNM2DH+B4yEfUoEp2csXb9Ha X-Received: by 10.28.40.212 with SMTP id o203mr10118563wmo.1.1513547313025; Sun, 17 Dec 2017 13:48:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1513547312; cv=none; d=google.com; s=arc-20160816; b=oValiT83m+yz3YShiszwVhcOgZsQPtiYbAMhBv8kXQPrhj26Pn+bfwsrkzAPir1vV/ LEcEu1DwA6AFNjLsRbm21K5Dj8LzF7peHI193ZrhTbPRjwEFe2VaFxblvnzdqGKTNjpF ai+2lmzElcR9towKaIjb9zoLKvlWTLd3u32uYz5L+QDxObj3cY2DilpoG6EPE4qoY7Wl fPuliIUBwDfeZ+Wb2fLaGFdK9mUJsVXoTlZ/dYSHYTTQtIbXcWs/8Hql3XdMGijB4iy2 kHBR0vnxGPyrwXsGREUcoM6UtXunxPUR1qq2nsofYSYH/WJpeRdDjVU06UN+ZzPNtPKK 1C4w== 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=xuK76VH1q/UNXTn1PS4nv+C7h113LH1zrX8T5+gIgHI=; b=uKYwBysa6wgRlZoz1YKh4P493PY0C2v4IW7HNfBZSDEh/9TRUTdqA/kGeHg82IrLac /Kz4c7rZLUMyHXK5DPrX45ome0vH8+dIJBrHdS0KSBvJFePVNfb75EhE+Bic1uXjSNlc xTRGSITkrYo+iEs9s8kADvabSgChhcJAjdDGohEoQqWSJM92bzx2ROC5DzJbtQHMOTB5 9o323mGj1oe+Yb+w3APZptiHgZ0MAneuRTWz9Eik2PYewOGawvZ/8dt/jfCJIWqyuO1l zWTzu4QDxq5hVm1m2pMXvBb5STkpIqapcIcO7lRFa9s8EnCpNEw//kNEU4b4gpKFHcXP N3JQ== 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 g1si8471835wrc.509.2017.12.17.13.48.32; Sun, 17 Dec 2017 13:48:32 -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 2DC8A689BC6; 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 9B310680283 for ; Sun, 17 Dec 2017 23:47:36 +0200 (EET) Received: from marge.gnuage.org (unknown [IPv6:2a01:e35:2e26:9790::10]) by smtp6-g21.free.fr (Postfix) with ESMTPS id 70B1678032A for ; Sun, 17 Dec 2017 22:47:46 +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 1eQgmf-0004NI-Ey; Sun, 17 Dec 2017 22:47:46 +0100 Received: from aurel by xps with local (Exim 4.90_RC4) (envelope-from ) id 1eQgmf-0000zT-BO; Sun, 17 Dec 2017 22:47:45 +0100 From: Aurelien Jacobs To: FFmpeg development discussions and patches Date: Sun, 17 Dec 2017 22:47:14 +0100 Message-Id: <20171217214720.3753-2-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 2/8] sbc: add parser 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" --- libavcodec/Makefile | 1 + libavcodec/allcodecs.c | 1 + libavcodec/sbc_parser.c | 124 ++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 126 insertions(+) create mode 100644 libavcodec/sbc_parser.c diff --git a/libavcodec/Makefile b/libavcodec/Makefile index c46d102227..58c8c6e499 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -1012,6 +1012,7 @@ OBJS-$(CONFIG_PNG_PARSER) += png_parser.o OBJS-$(CONFIG_PNM_PARSER) += pnm_parser.o pnm.o OBJS-$(CONFIG_RV30_PARSER) += rv34_parser.o OBJS-$(CONFIG_RV40_PARSER) += rv34_parser.o +OBJS-$(CONFIG_SBC_PARSER) += sbc_parser.o OBJS-$(CONFIG_SIPR_PARSER) += sipr_parser.o OBJS-$(CONFIG_TAK_PARSER) += tak_parser.o tak.o OBJS-$(CONFIG_VC1_PARSER) += vc1_parser.o vc1.o vc1data.o \ diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index 9e2480d2d4..3e3b37f638 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -653,6 +653,7 @@ static void register_all(void) REGISTER_PARSER(PNM, pnm); REGISTER_PARSER(RV30, rv30); REGISTER_PARSER(RV40, rv40); + REGISTER_PARSER(SBC, sbc); REGISTER_PARSER(SIPR, sipr); REGISTER_PARSER(TAK, tak); REGISTER_PARSER(VC1, vc1); diff --git a/libavcodec/sbc_parser.c b/libavcodec/sbc_parser.c new file mode 100644 index 0000000000..032f72cf2b --- /dev/null +++ b/libavcodec/sbc_parser.c @@ -0,0 +1,124 @@ +/* + * SBC parser + * + * 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 "sbc.h" +#include "parser.h" + +typedef struct SBCParseContext { + ParseContext pc; + uint8_t header[3]; + int header_size; + int buffered_size; +} SBCParseContext; + +static int sbc_parse_header(AVCodecParserContext *s, AVCodecContext *avctx, + const uint8_t *data, size_t len) +{ + static const int sample_rates[4] = { 16000, 32000, 44100, 48000 }; + int sr, blocks, mode, subbands, bitpool, channels, joint; + int length; + + if (len < 3) + return -1; + + if (data[0] == MSBC_SYNCWORD && data[1] == 0 && data[2] == 0) { + avctx->channels = 1; + avctx->sample_fmt = AV_SAMPLE_FMT_S16; + avctx->sample_rate = 16000; + avctx->frame_size = 120; + s->duration = avctx->frame_size; + return 57; + } + + if (data[0] != SBC_SYNCWORD) + return -2; + + sr = (data[1] >> 6) & 0x03; + blocks = (((data[1] >> 4) & 0x03) + 1) << 2; + mode = (data[1] >> 2) & 0x03; + subbands = (((data[1] >> 0) & 0x01) + 1) << 2; + bitpool = data[2]; + + channels = mode == SBC_MODE_MONO ? 1 : 2; + joint = mode == SBC_MODE_JOINT_STEREO; + + length = 4 + (subbands * channels) / 2; + if (channels == 1 || mode == SBC_MODE_DUAL_CHANNEL) + length += ((channels * blocks * bitpool) + 7) / 8; + else + length += (((joint ? subbands : 0) + blocks * bitpool) + 7) / 8; + + avctx->channels = channels; + avctx->sample_fmt = AV_SAMPLE_FMT_S16; + avctx->sample_rate = sample_rates[sr]; + avctx->frame_size = subbands * blocks; + s->duration = avctx->frame_size; + return length; +} + +static int sbc_parse(AVCodecParserContext *s, AVCodecContext *avctx, + const uint8_t **poutbuf, int *poutbuf_size, + const uint8_t *buf, int buf_size) +{ + SBCParseContext *pc = s->priv_data; + int next; + + if (s->flags & PARSER_FLAG_COMPLETE_FRAMES) { + next = buf_size; + } else { + if (pc->header_size) { + memcpy(pc->header + pc->header_size, buf, + sizeof(pc->header) - pc->header_size); + next = sbc_parse_header(s, avctx, pc->header, sizeof(pc->header)) + - pc->buffered_size; + pc->header_size = 0; + } else { + next = sbc_parse_header(s, avctx, buf, buf_size); + if (next >= buf_size) + next = -1; + } + + if (next < 0) { + pc->header_size = FFMIN(sizeof(pc->header), buf_size); + memcpy(pc->header, buf, pc->header_size); + pc->buffered_size = buf_size; + next = END_NOT_FOUND; + } + + if (ff_combine_frame(&pc->pc, next, &buf, &buf_size) < 0) { + *poutbuf = NULL; + *poutbuf_size = 0; + return buf_size; + } + } + + *poutbuf = buf; + *poutbuf_size = buf_size; + return next; +} + +AVCodecParser ff_sbc_parser = { + .codec_ids = { AV_CODEC_ID_SBC, AV_CODEC_ID_MSBC }, + .priv_data_size = sizeof(SBCParseContext), + .parser_parse = sbc_parse, + .parser_close = ff_parse_close, +};