From patchwork Mon Aug 21 15:24:10 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carl Eugen Hoyos X-Patchwork-Id: 4785 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.37.132 with SMTP id g126csp2959085jag; Mon, 21 Aug 2017 08:24:41 -0700 (PDT) X-Received: by 10.223.196.69 with SMTP id a5mr2903408wrg.68.1503329081060; Mon, 21 Aug 2017 08:24:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1503329081; cv=none; d=google.com; s=arc-20160816; b=itbJnqMkTWqlDsujiUwY+Ep4pnZsajP7QYawdZhSi4za1Cq8lC9XhhLDIKJkcjQjbR 5ig69Pn1XJMKMcs4v2ZyYAQaGT3H6PPb3VA7tlUZactNBOSlzOJZTMi0BWI6s8DZc194 ow+xucucjtxrJUrPuHc3tjk372gvimd14lhFpDG9D6Z1Gx5Mr/4OqgT9dzy92e18165e OxXGNBvskWzRsO6lH3pDdex6yGTr1I6aLJNZkryglHA3l7GVobyeQ2g+YouBFm/Ll+sZ 7/CRiRwJRI3qWZfDbkQUsRSOWNhlCye9iMqRWqfl3Q2N8HSnkBOOTaTYa138rfxNV+aq RJkA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject:to :message-id:date:from:references:in-reply-to:mime-version :dkim-signature:delivered-to:arc-authentication-results; bh=f/QsWe+WWZivXmgfO1d7StT/wERn7M3NAb71xGWrpVk=; b=zCOf4CbWr5bW7ocgH3o6myrVbJ9o4NP/BQWlV73NXEa00lD9iRptLIw2GQP2YYRsOr cZQNhNYhQ+jjAwcOVlsvFMgo4Kd7VaXRBljI2R8dCWb+Bm+wqqupFgmanvPnieEaR7wc mlg0ez/+iAgZjfr692wJl7GsMlA7e6t0l1dI6GO1VXr238/3yYJ82vURyZSos1tYP1Qd sPZPx7q6KLdQoY6Kp11+LMLRgx0ECOMvCqiG8kPDt14i54/2zUsT1PJfKjdxdlepQDJM /7BJ0O4PsLcUKRpqMzbX+Y1i1cKwF0cpmxrbyAANgmvpQ3mrzuj5p2qncc9bUednEnHr B3Vg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=TMTP5Y+n; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 35si334478wri.469.2017.08.21.08.24.40; Mon, 21 Aug 2017 08:24:41 -0700 (PDT) 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; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=TMTP5Y+n; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6D434689AE3; Mon, 21 Aug 2017 18:24:31 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi0-f48.google.com (mail-oi0-f48.google.com [209.85.218.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E06086898EF for ; Mon, 21 Aug 2017 18:24:24 +0300 (EEST) Received: by mail-oi0-f48.google.com with SMTP id r200so22429153oie.2 for ; Mon, 21 Aug 2017 08:24:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:in-reply-to:references:from:date:message-id:subject:to; bh=G2uSkhNbTtJS64dZ+xsDbG0TgiibSXKKCHerxMzqo2o=; b=TMTP5Y+nAphxAJ8cdFIj+9/Gd1iMtfHSKOXWOkKi9LsGsT3YQyFczeM+Jz3s0uP+Kr v/TSAd453cUyCE0r2964wdxUxInuYQRgwPe6kQmijh91iTL8NNuPkLliU4x7p6h4l/GV FGG3YT+Rr5oPtQCvsDJvRaqrbttnRLAC+jpYor21bIIbfm11mYP/sNtuhgSmPDfzY5E9 GhZtgvVpkqw6WwtLr9W3BW1KRZ6Z2rovts+HZaYc/pJu+ochd2vMGKyUCbsP87abGR/J XH1b0WYxT9qnVOEOL9uSQZNQvAeeBZ+OKEGH9jTkf5E4UzbFvipHXwYyo1fyuVoG1HnW B2Zg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to; bh=G2uSkhNbTtJS64dZ+xsDbG0TgiibSXKKCHerxMzqo2o=; b=jCkg6t938v+8NGPlZNWsFg6MzW6LaG1tNYK6o803bc/v48g+AP4Mwb50Ia0AZVe4jd gX1dE6UudapihGaCQLVrXBdijioXFIeIDNU2ytAYzipBifyD1aWG/fP4u9K3mb+U/Fbj hdd85RlrR6RaYY5fQGId0eNscbA+/mPAB4m3lzgfZgdHFEW49fIblsUCZEWwK5BrYMC6 bLD0rPPZxRCfyfq7omSokgIlEqHQ5ijxpe28vJnxr/m3UjeP3BnDOI/8Io8yjcSLr/j4 V64nQxLb14WYo8F5QpUj5H1inVI9y6phdXLQGlwiZlptWeXncE4QEwIsu+0DyZaKVtao ZD0g== X-Gm-Message-State: AHYfb5jXQ+XLa/awp0yT57KuLWkpZywX86WXcvN3UUlO2aVjGfyQAGe5 hqFjJOzRQC+bRHzTsL3enrKR+2kf+tWx X-Received: by 10.202.237.65 with SMTP id l62mr22270439oih.167.1503329070614; Mon, 21 Aug 2017 08:24:30 -0700 (PDT) MIME-Version: 1.0 Received: by 10.157.4.101 with HTTP; Mon, 21 Aug 2017 08:24:10 -0700 (PDT) In-Reply-To: References: From: Carl Eugen Hoyos Date: Mon, 21 Aug 2017 17:24:10 +0200 Message-ID: To: FFmpeg development discussions and patches Subject: Re: [FFmpeg-devel] [PATCH]lavf/g726: Add a raw little-endian G.726 demuxer 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" 2017-08-18 19:25 GMT+02:00 Carl Eugen Hoyos : > Hi! > > Attached patch allows to read files produced by the "ITU compatible > binary G726 encoder" attached to ticket #6596. New patch attached that also allows reading an old sample found on ubuntuusers.de containing big-endian G.726 from "SEG Mp3-Player". Searching the FFmpeg user mailing list shows several requests for this demuxer(s) over the last decade. Please comment, Carl Eugen From ac3a91bb750ab719286fd2d3cf3607558d034310 Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Mon, 21 Aug 2017 16:17:17 +0200 Subject: [PATCH] lavf/g726: Demuxer for raw G.726 streams, both left- and right-justified. Compatible with the binary encoder attached to ticket #6596 (right-aligned) and a sample from a SEG Mp3-Player (left-aligned). --- Changelog | 1 + doc/general.texi | 1 + libavformat/Makefile | 2 + libavformat/allformats.c | 2 + libavformat/g726.c | 105 ++++++++++++++++++++++++++++++++++++++++++++++ libavformat/version.h | 2 +- 6 files changed, 112 insertions(+), 1 deletion(-) create mode 100644 libavformat/g726.c diff --git a/Changelog b/Changelog index 7a6987a..f5dc1da 100644 --- a/Changelog +++ b/Changelog @@ -33,6 +33,7 @@ version : - tlut2 video filter - floodfill video filter - pseudocolor video filter +- raw G.726 demuxer, left- and right-justified version 3.3: - CrystalHD decoder moved to new decode API diff --git a/doc/general.texi b/doc/general.texi index 036c8c2..49eb969 100644 --- a/doc/general.texi +++ b/doc/general.texi @@ -341,6 +341,7 @@ library: @item FunCom ISS @tab @tab X @tab Audio format used in various games from FunCom like The Longest Journey. @item G.723.1 @tab X @tab X +@item G.726 @tab @tab X @item G.729 BIT @tab X @tab X @item G.729 raw @tab @tab X @item GENH @tab @tab X diff --git a/libavformat/Makefile b/libavformat/Makefile index b0ef82c..8e2afb7 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -188,6 +188,8 @@ OBJS-$(CONFIG_GSM_MUXER) += rawenc.o OBJS-$(CONFIG_GXF_DEMUXER) += gxf.o OBJS-$(CONFIG_GXF_MUXER) += gxfenc.o audiointerleave.o OBJS-$(CONFIG_G722_DEMUXER) += g722.o rawdec.o +OBJS-$(CONFIG_G726_DEMUXER) += g726.o +OBJS-$(CONFIG_G726LE_DEMUXER) += g726.o OBJS-$(CONFIG_G722_MUXER) += rawenc.o OBJS-$(CONFIG_G723_1_DEMUXER) += g723_1.o OBJS-$(CONFIG_G723_1_MUXER) += rawenc.o diff --git a/libavformat/allformats.c b/libavformat/allformats.c index 1ebc142..78ff2eb 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -132,6 +132,8 @@ static void register_all(void) REGISTER_DEMUXER (FRM, frm); REGISTER_DEMUXER (FSB, fsb); REGISTER_MUXDEMUX(G722, g722); + REGISTER_DEMUXER (G726, g726); + REGISTER_DEMUXER (G726LE, g726le); REGISTER_MUXDEMUX(G723_1, g723_1); REGISTER_DEMUXER (G729, g729); REGISTER_DEMUXER (GDV, gdv); diff --git a/libavformat/g726.c b/libavformat/g726.c new file mode 100644 index 0000000..eca9404 --- /dev/null +++ b/libavformat/g726.c @@ -0,0 +1,105 @@ +/* + * G.726 raw demuxer + * Copyright 2017 Carl Eugen Hoyos + * + * 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 "internal.h" +#include "libavutil/opt.h" + +typedef struct G726Context { + AVClass *class; + int code_size; + int sample_rate; +} G726Context; + +static int g726_read_header(AVFormatContext *s) +{ + G726Context *c = s->priv_data; + AVStream *st = avformat_new_stream(s, NULL); + if (!st) + return AVERROR(ENOMEM); + + st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; + st->codecpar->codec_id = s->iformat->raw_codec_id; + + st->codecpar->sample_rate = c->sample_rate; + st->codecpar->bits_per_coded_sample = c->code_size; + st->codecpar->bit_rate = ((int[]){ 16000, 24000, 32000, 40000 })[c->code_size - 2]; + st->codecpar->channels = 1; + + return 0; +} + +static int g726_read_packet(AVFormatContext *s, AVPacket *pkt) +{ + int res; + res = av_get_packet(s->pb, pkt, 1020); // a size similar to RAW_PACKET_SIZE divisible by all code_size values + if (res < 0) + return res; + return 0; +} + +#define OFFSET(x) offsetof(G726Context, x) +static const AVOption options[] = { + { "code_size", "Bits per G.726 code", + OFFSET(code_size), AV_OPT_TYPE_INT, {.i64 = 4}, 2, 5, AV_OPT_FLAG_DECODING_PARAM }, + { "sample_rate", "", + OFFSET(sample_rate), AV_OPT_TYPE_INT, {.i64 = 8000}, 0, INT_MAX, AV_OPT_FLAG_DECODING_PARAM }, + { NULL }, +}; + +#if CONFIG_G726_DEMUXER +static const AVClass g726le_demuxer_class = { + .class_name = "G.726 big-endian demuxer", + .item_name = av_default_item_name, + .option = options, + .version = LIBAVUTIL_VERSION_INT, +}; + +AVInputFormat ff_g726_demuxer = { + .name = "g726", + .long_name = NULL_IF_CONFIG_SMALL("raw big-endian G.726 (\"left aligned\")"), + .read_header = g726_read_header, + .read_packet = g726_read_packet, + .priv_data_size = sizeof(G726Context), + .priv_class = &g726le_demuxer_class, + .raw_codec_id = AV_CODEC_ID_ADPCM_G726, +}; +#endif + +#if CONFIG_G726LE_DEMUXER +static const AVClass g726_demuxer_class = { + .class_name = "G.726 little-endian demuxer", + .item_name = av_default_item_name, + .option = options, + .version = LIBAVUTIL_VERSION_INT, +}; + +AVInputFormat ff_g726le_demuxer = { + .name = "g726le", + .long_name = NULL_IF_CONFIG_SMALL("raw little-endian G.726 (\"right aligned\")"), + .read_header = g726_read_header, + .read_packet = g726_read_packet, + .priv_data_size = sizeof(G726Context), + .priv_class = &g726_demuxer_class, + .raw_codec_id = AV_CODEC_ID_ADPCM_G726LE, +}; +#endif + diff --git a/libavformat/version.h b/libavformat/version.h index 48b81f2..a8cf4c1 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -32,7 +32,7 @@ // Major bumping may affect Ticket5467, 5421, 5451(compatibility with Chromium) // Also please add any ticket numbers that you believe might be affected here #define LIBAVFORMAT_VERSION_MAJOR 57 -#define LIBAVFORMAT_VERSION_MINOR 76 +#define LIBAVFORMAT_VERSION_MINOR 77 #define LIBAVFORMAT_VERSION_MICRO 100 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ -- 1.7.10.4