From patchwork Sun Oct 8 22:24:33 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: 5485 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.90 with SMTP id m26csp2003448jah; Sun, 8 Oct 2017 15:25:06 -0700 (PDT) X-Received: by 10.223.132.6 with SMTP id 6mr7340233wrf.93.1507501506827; Sun, 08 Oct 2017 15:25:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507501506; cv=none; d=google.com; s=arc-20160816; b=BWNDf1fOtkWAQtvSTCrra+j72kpxAsaa4zuZR+tICeqvjI3E/IROzit8nbLAF3MG+C HQwk33pL4tRpeJp/OGWxEl5u7+6i2jFuI3O+v/cx5+2ytUa7ORFQx/VJjp6F3TbJJQrt +CCcpFXQBrczq9PsKEoYSXy2TtIJlp1O0Enqk5AKByj7LVneV7xC5hBa3gDeotY+c6e5 JxhFACvm8NKjirCY2fjqMIGYMZ8qfjKoF+L8KkZxjRTTicdmt2Hs7bw1vPH1qR75I0gp gvR/kFZTZnV6fqcHlZjd4Hh65ZDfkDRFLK66+8g+jJNEzpzCiuGEuirEcveqeCwIu289 LhSQ== 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=rM0kajvFtIlWTA58XteVRkTAgN0lpHcyZKa/OE4Ta+8=; b=g6YTi2XhqZkwF8qyxSDFkObOwRxKpFdqYiMnGezDDeLcTovfMneqEoaLQe99G4ShbG cntv308K+X+x/TMnn3juOVoq1XDm7/nf4Ibuilvx/BcFTikO7FNjHPqI+fxg2Trpawwp 4yFZryC/7uhjkR8dE2OgoABsuxPLaLZNZ0jDeN1jE/waWWYO9lfFAa6DEbT3tsxsn08S 4xhKpeUuFvzg9menO+MRD9Cc8Wk8ZibeUfM0cuwlxAcUB5gvbDgnwI97HdlUA/wvkMk0 UVSRSFhMevCijfHD1Nj9dWZU8QlpNz03EGRNsIP/Wta+muDBqpO2A/RCMvDrruK3+lV/ WFuw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=QvX67w7k; 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 e9si5649274wmd.35.2017.10.08.15.25.05; Sun, 08 Oct 2017 15:25:06 -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=QvX67w7k; 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 3EDD068066B; Mon, 9 Oct 2017 01:25:01 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-it0-f49.google.com (mail-it0-f49.google.com [209.85.214.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 814A26805E8 for ; Mon, 9 Oct 2017 01:24:53 +0300 (EEST) Received: by mail-it0-f49.google.com with SMTP id 72so10455229itk.3 for ; Sun, 08 Oct 2017 15:24:55 -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=eyMjPXzH8bb/n0Ta5R2itmqABXJieQSPrxsD56NUUeM=; b=QvX67w7k+a8ENtCcXwSG3YXxiVqAOcVwTOpUy2X+jW+x6nBsu8o+kT6IYnMaPI5Qxd p5vHK9vE+7mBcpfIC4hdWd3p8uj+2TgNi5yX7OQNuUq9ANBNQOfTuOVodI0xplO7iIg3 PKROL8SoCCWLu+IFqg2InUo1miRTMRlXX9XyaQhU2p10bfjJkeRgz09hbWbw/0C3p90U d46P4QgyV7YqOxyjKEJxzKPm2NqyOrHZ5kE1UOYyATwGEw3TVXEYMH1xyItn0s54By2M G5aAMQG8276EzTY7UGdXUtXYl0fmX8FGWjrXl08BHEt/EFnh6CcdkarjxghndNwkWwa3 gHTA== 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=eyMjPXzH8bb/n0Ta5R2itmqABXJieQSPrxsD56NUUeM=; b=HP/OGXjpzS0HayaWvDodjhFnIEZ2cGwUYksYxETow1UxzOjfEYW0DFGgHNAXVsKVcD b0aVyXvTTGMSR42dRX5/+twLERdo/vJhus+FMg3/5dICUKplmtINorNE2TaNaN+PHisq KLeEG3TVBwTtCe9o39IyQXfVmK+gPxw9+24i4z2B10jmfLfh614rMbz1pIR5LbF2vVCK Yk+0fQbo08TYnA6LSiCGx07Y8PWVv1sB8vml3h6cfXAhHrwvOCSjE0a8ttMzxFJGhpue 4Ih9zb3BsqxV7mVvRbMburyjmW9ZHmdRAxtozlAybBufZqX49gXxCxGhQf9O21HpTym6 ZC0A== X-Gm-Message-State: AMCzsaVQR6nQfbk7QAEmoGtprrga+YbYZkUMKXQ/Lqt5PcPxNyNOMWvs t69vjEojOS9ji+wq0zGVTQfAG1bcpxTX8k7EXBU= X-Google-Smtp-Source: AOwi7QBvRUC5kOw5jzlZnxa43XDumP3exzS7JVUScjQ4kFNPsllpm3gTs5MiHqMUVK7JVFtdAgR2QegeLqHnIgMxi1M= X-Received: by 10.36.3.202 with SMTP id e193mr11363203ite.108.1507501493611; Sun, 08 Oct 2017 15:24:53 -0700 (PDT) MIME-Version: 1.0 Received: by 10.2.134.74 with HTTP; Sun, 8 Oct 2017 15:24:33 -0700 (PDT) In-Reply-To: References: From: Carl Eugen Hoyos Date: Mon, 9 Oct 2017 00:24:33 +0200 Message-ID: To: FFmpeg development discussions and patches Subject: Re: [FFmpeg-devel] [PATCH]lavf/amr: Add amrnb and amrwb demuxers 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-10-07 16:51 GMT+02:00 Carl Eugen Hoyos : > 2017-10-01 18:23 GMT+02:00 Carl Eugen Hoyos : >> 2017-09-27 18:08 GMT+02:00 Carl Eugen Hoyos : >> >>> The existing amr demuxer does not allow reading streams, >>> it requires the 3GPP-conforming file header. >>> Attached patch allows reading amrnb and amrwb from (live) >>> streams, fixes ticket #6678. >> >> New patch with auto-detection attached, passes probecheck. > > Simplified patch attached that does not duplicate two small arrays > in the object file that are already duplicated in the source code. > The uninitialized variable is also fixed. The last version triggered for repeated bytes (like adp), new version attached. Please comment, Carl Eugen From f3697957b54bef4a7718144df07877394bd5d941 Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Mon, 9 Oct 2017 00:21:23 +0200 Subject: [PATCH] lavf/amr: Add amrnb and amrwb demuxers. Fixes ticket #6678. --- Changelog | 1 + libavformat/Makefile | 2 + libavformat/allformats.c | 2 + libavformat/amr.c | 134 ++++++++++++++++++++++++++++++++++++++++++---- libavformat/version.h | 4 +- 5 files changed, 131 insertions(+), 12 deletions(-) diff --git a/Changelog b/Changelog index d6ec4ad..94e33a2 100644 --- a/Changelog +++ b/Changelog @@ -53,6 +53,7 @@ version : - Rockchip MPP hardware decoding - vmafmotion video filter - use MIME type "G726" for little-endian G.726, "AAL2-G726" for big-endian G.726 +- auto-detect amr-nb and amr-wb streams version 3.3: diff --git a/libavformat/Makefile b/libavformat/Makefile index df709c29..c4c8713 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -87,6 +87,8 @@ OBJS-$(CONFIG_AIFF_MUXER) += aiffenc.o id3v2enc.o OBJS-$(CONFIG_AIX_DEMUXER) += aixdec.o OBJS-$(CONFIG_AMR_DEMUXER) += amr.o OBJS-$(CONFIG_AMR_MUXER) += amr.o +OBJS-$(CONFIG_AMRNB_DEMUXER) += amr.o +OBJS-$(CONFIG_AMRWB_DEMUXER) += amr.o OBJS-$(CONFIG_ANM_DEMUXER) += anm.o OBJS-$(CONFIG_APC_DEMUXER) += apc.o OBJS-$(CONFIG_APE_DEMUXER) += ape.o apetag.o img2.o diff --git a/libavformat/allformats.c b/libavformat/allformats.c index 405ddb5..dc8984e 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -63,6 +63,8 @@ static void register_all(void) REGISTER_MUXDEMUX(AIFF, aiff); REGISTER_DEMUXER (AIX, aix); REGISTER_MUXDEMUX(AMR, amr); + REGISTER_DEMUXER (AMRNB, amrnb); + REGISTER_DEMUXER (AMRWB, amrwb); REGISTER_DEMUXER (ANM, anm); REGISTER_DEMUXER (APC, apc); REGISTER_DEMUXER (APE, ape); diff --git a/libavformat/amr.c b/libavformat/amr.c index b5194a2..0043faf 100644 --- a/libavformat/amr.c +++ b/libavformat/amr.c @@ -38,6 +38,14 @@ typedef struct { static const char AMR_header[] = "#!AMR\n"; static const char AMRWB_header[] = "#!AMR-WB\n"; +static const uint8_t amrnb_packed_size[16] = { + 13, 14, 16, 18, 20, 21, 27, 32, 6, 1, 1, 1, 1, 1, 1, 1 +}; +static const uint8_t amrwb_packed_size[16] = { + 18, 24, 33, 37, 41, 47, 51, 59, 61, 6, 1, 1, 1, 1, 1, 1 +}; + + #if CONFIG_AMR_MUXER static int amr_write_header(AVFormatContext *s) { @@ -126,17 +134,9 @@ static int amr_read_packet(AVFormatContext *s, AVPacket *pkt) mode = (toc >> 3) & 0x0F; if (par->codec_id == AV_CODEC_ID_AMR_NB) { - static const uint8_t packed_size[16] = { - 12, 13, 15, 17, 19, 20, 26, 31, 5, 0, 0, 0, 0, 0, 0, 0 - }; - - size = packed_size[mode] + 1; + size = amrnb_packed_size[mode]; } else if (par->codec_id == AV_CODEC_ID_AMR_WB) { - static const uint8_t packed_size[16] = { - 18, 24, 33, 37, 41, 47, 51, 59, 61, 6, 6, 0, 0, 0, 1, 1 - }; - - size = packed_size[mode]; + size = amrwb_packed_size[mode]; } if (!size || av_new_packet(pkt, size)) @@ -176,6 +176,120 @@ AVInputFormat ff_amr_demuxer = { }; #endif +#if CONFIG_AMRNB_DEMUXER +static int amrnb_probe(AVProbeData *p) +{ + int mode, i = 0, valid = 0; + const uint8_t *b = p->buf; + + while (i < p->buf_size) { + mode = b[i] >> 3 & 0x0F; + if (mode < 9 && (b[i] & 0x4) == 0x4) { + uint8_t last = mode; + int size = amrnb_packed_size[mode]; + while (size--) { + if (b[++i] != last) + break; + last = b[i]; + } + if (size > 0) { + valid++; + i += size; + } + } else { + valid = 0; + i++; + } + } + if (valid > 100) + return AVPROBE_SCORE_EXTENSION / 2 + 1; + return 0; +} + +static int amrnb_read_header(AVFormatContext *s) +{ + AVStream *st = avformat_new_stream(s, NULL); + if (!st) + return AVERROR(ENOMEM); + st->codecpar->codec_tag = MKTAG('s', 'a', 'm', 'r'); + st->codecpar->codec_id = AV_CODEC_ID_AMR_NB; + st->codecpar->sample_rate = 8000; + st->codecpar->channels = 1; + st->codecpar->channel_layout = AV_CH_LAYOUT_MONO; + st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; + avpriv_set_pts_info(st, 64, 1, 8000); + + return 0; +} + +AVInputFormat ff_amrnb_demuxer = { + .name = "amrnb", + .long_name = NULL_IF_CONFIG_SMALL("raw AMR-NB"), + .priv_data_size = sizeof(AMRContext), + .read_probe = amrnb_probe, + .read_header = amrnb_read_header, + .read_packet = amr_read_packet, + .flags = AVFMT_GENERIC_INDEX, +}; +#endif + +#if CONFIG_AMRWB_DEMUXER +static int amrwb_probe(AVProbeData *p) +{ + int mode, i = 0, valid = 0; + const uint8_t *b = p->buf; + + while (i < p->buf_size) { + mode = b[i] >> 3 & 0x0F; + if (mode < 10 && (b[i] & 0x4) == 0x4) { + uint8_t last = mode; + int size = amrwb_packed_size[mode]; + while (size--) { + if (b[++i] != last) + break; + last = b[i]; + } + if (size > 0) { + valid++; + i += size; + } + } else { + valid = 0; + i++; + } + } + if (valid > 100) + return AVPROBE_SCORE_EXTENSION / 2 - 1; + return 0; +} + +static int amrwb_read_header(AVFormatContext *s) +{ + AVStream *st = avformat_new_stream(s, NULL); + if (!st) + return AVERROR(ENOMEM); + st->codecpar->codec_tag = MKTAG('s', 'a', 'w', 'b'); + st->codecpar->codec_id = AV_CODEC_ID_AMR_WB; + st->codecpar->sample_rate = 16000; + st->codecpar->channels = 1; + st->codecpar->channel_layout = AV_CH_LAYOUT_MONO; + st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; + avpriv_set_pts_info(st, 64, 1, 16000); + + return 0; +} + +AVInputFormat ff_amrwb_demuxer = { + .name = "amrwb", + .long_name = NULL_IF_CONFIG_SMALL("raw AMR-WB"), + .priv_data_size = sizeof(AMRContext), + .read_probe = amrwb_probe, + .read_header = amrwb_read_header, + .read_packet = amr_read_packet, + .flags = AVFMT_GENERIC_INDEX, +}; +#endif + #if CONFIG_AMR_MUXER AVOutputFormat ff_amr_muxer = { .name = "amr", diff --git a/libavformat/version.h b/libavformat/version.h index caf85e8..878917d 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -32,8 +32,8 @@ // 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 82 -#define LIBAVFORMAT_VERSION_MICRO 104 +#define LIBAVFORMAT_VERSION_MINOR 83 +#define LIBAVFORMAT_VERSION_MICRO 100 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ LIBAVFORMAT_VERSION_MINOR, \ -- 1.7.10.4