From patchwork Thu Sep 30 15:07:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 30792 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp764805iob; Thu, 30 Sep 2021 08:10:38 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxYsxnr0/xdvPD2dmHT8En0E2mCM84591m/JmlkizK/vr/iJcaPUCFpSDmWfWuQFhPWaoUN X-Received: by 2002:a50:e0c9:: with SMTP id j9mr7569832edl.336.1633014637853; Thu, 30 Sep 2021 08:10:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1633014637; cv=none; d=google.com; s=arc-20160816; b=noOYjek+Szu/0uQ0LKZxoytEQ/VkWpgwqq4ceisolTvRy3nOsSFcm1BGLzQNpAZQlT 4kbe/UfvtxyQ/UJzQfsl0ybGCW1Fz1AdoXav2z2n8NG1twk5RtO5OAWuOpmvyw6s4dMd AeGhrzPabEke6UUmvfQ79cZvBRebfFtwhQspGVXR5dAeJETSi9szjMHUL2vpRJe5v9/7 fIqVnIQi0BMGxUt79rD7GiXtWpzt3ydn0M+x8SzEADYYfXnm+fjxNrm+22wySrvIKNCy Skg4fIeOhRu6yQh5yD2bw1ZZIHSQr/WH3Dfn6lKsvjw1CN9LEjvRsJVA61qzwwFhAEAE Cxxw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=1bfKtud6JKe6J5cB6hLWD1VaglVRwAO9COOs7yQQD6M=; b=l643SPwhKcBa2XB5Hxe71QRqOo1eLJ0A5VeAOlDv3UURyvH0IuTAmtW2yQzjfUGdVM da76w74d70/r777UtEEc570geYK7efmDPZpTkAllCruPTfoklVrYMGQttJS8ZuNUeEOK wuelIMKmpsqcmWSW/oNDEFkbe1CPxRxTgdjDp77DSX98/Okt+eKYvzJeQI3I+XIRgI4Y 72bmY9tR+EzmWN/bOGjJuYCL/mGOTJFfgkZTwb/RlKWIhkNdt1G2S6q8SuFqZBNaofpA b+YTFcAGXqfk3MncwalNteiS2XdL+/Ui/R38FPnguuhxTK9c7u3RMUQfI2FWkEvm7dMo lFKA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=lAtEgYCa; 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=QUARANTINE 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 hk12si3687981ejb.174.2021.09.30.08.10.36; Thu, 30 Sep 2021 08:10:37 -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=20210112 header.b=lAtEgYCa; 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=QUARANTINE 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 12AAC68AE5A; Thu, 30 Sep 2021 18:10:33 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f43.google.com (mail-ed1-f43.google.com [209.85.208.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2E27E68ACC3 for ; Thu, 30 Sep 2021 18:10:26 +0300 (EEST) Received: by mail-ed1-f43.google.com with SMTP id v18so22967365edc.11 for ; Thu, 30 Sep 2021 08:10:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=X9afDxt8dM6BEA7j5KRGLZmQuZd1llgPtalFjafohBM=; b=lAtEgYCagGx9rNfQUUPhEHvfSFj4y5EWfptePYL8MbR2W6szhfsKwDo8XnKQVrJ0Vr p5qmOPyziaQpx+EJz6FNjHlW9gw67shzFvkJLpyZgz5D9z5N198KlTsgkzpShMfv4cW/ F2pNM4BTAAnYUAUe6nR3y0L7Z6YWMMP5Wlcpsn7gCIvIkT4C1ifN4N6oaarYy8CLv2CU 4hgGN93F8NHVyew4hrNaqEE+fMHItqaXkvengXy4SO0AwVRZ20RvajPI2Jk0VcyZCrr/ 99nePF871hXwCKt0BJ+qLaYLNfkcU46RGoQ5WKvPtz2affL6S7Nf+T+YcXxJTH08caqA /YCQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=X9afDxt8dM6BEA7j5KRGLZmQuZd1llgPtalFjafohBM=; b=GKmCTD4NmjT4GazSjFGgfUZ6gDdfshL1oiJGPlDN+eYGndh36A1fy77Fa9XYLQRfgb HZqP4JyFLtrQsX/pqlllkbqPBbP3PSFXuqG2M+YFD9+lxUVzbFjjkbxTexNKEwqqCoP/ hrf+rUVli3i1Mo31BuGPciGJG2jNXcyX37GxRiN51sYMoLAYJwSDIsOA4oUN3hLID0PK 6psVpxpn08mISMg77C/X3N/4+5XN5bybx/6L1GQK7XGYKsu2cni5DjabgdnmXsFUNDs8 fOiJEl5TNsIqOi/o+gL2cCxZBpWAyJycDVIyo1Els5TmA9l3l6ik+5+yX97JpRNcZ4Ey o1rQ== X-Gm-Message-State: AOAM532KK4Mauq697CEo8WLoaEeDBrgVtBkvTIhoI0G1bNu1KJvkTxTF JiCS29jPV73wr3XSmcKSzd8GilC0hdo= X-Received: by 2002:a50:e009:: with SMTP id e9mr7575962edl.254.1633014451199; Thu, 30 Sep 2021 08:07:31 -0700 (PDT) Received: from localhost.localdomain ([95.168.120.42]) by smtp.gmail.com with ESMTPSA id f10sm1690918edu.70.2021.09.30.08.07.30 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Sep 2021 08:07:30 -0700 (PDT) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Sep 2021 17:07:18 +0200 Message-Id: <20210930150718.305143-1-onemda@gmail.com> X-Mailer: git-send-email 2.33.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec: add amr parser X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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" X-TUID: E1dICo91Ii3Q Signed-off-by: Paul B Mahol --- libavcodec/Makefile | 1 + libavcodec/amr_parser.c | 103 ++++++++++++++++++++++++++++++++++++++++ libavcodec/parsers.c | 1 + libavformat/amr.c | 63 +++++------------------- 4 files changed, 117 insertions(+), 51 deletions(-) create mode 100644 libavcodec/amr_parser.c diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 829ff88e1d..d3b6db0b49 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -1079,6 +1079,7 @@ OBJS-$(CONFIG_AAC_PARSER) += aac_parser.o aac_ac3_parser.o \ mpeg4audio.o OBJS-$(CONFIG_AC3_PARSER) += ac3tab.o aac_ac3_parser.o OBJS-$(CONFIG_ADX_PARSER) += adx_parser.o adx.o +OBJS-$(CONFIG_AMR_PARSER) += amr_parser.o OBJS-$(CONFIG_AV1_PARSER) += av1_parser.o OBJS-$(CONFIG_AVS2_PARSER) += avs2_parser.o OBJS-$(CONFIG_AVS3_PARSER) += avs3_parser.o diff --git a/libavcodec/amr_parser.c b/libavcodec/amr_parser.c new file mode 100644 index 0000000000..dc622f65f3 --- /dev/null +++ b/libavcodec/amr_parser.c @@ -0,0 +1,103 @@ +/* + * Copyright (c) 2021 Paul B Mahol + * + * 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 + */ + +/** + * @file + * ADX audio parser + * + * Splits packets into individual blocks. + */ + +#include "libavutil/intreadwrite.h" +#include "parser.h" + +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 +}; + +typedef struct AMRParseContext { + ParseContext pc; + uint64_t cumulated_size; + uint64_t block_count; + int remaining; +} AMRParseContext; + +static int amr_parse(AVCodecParserContext *s1, + AVCodecContext *avctx, + const uint8_t **poutbuf, int *poutbuf_size, + const uint8_t *buf, int buf_size) +{ + AMRParseContext *s = s1->priv_data; + ParseContext *pc = &s->pc; + int next = END_NOT_FOUND; + + *poutbuf_size = 0; + *poutbuf = NULL; + + if (s1->flags & PARSER_FLAG_COMPLETE_FRAMES) { + next = buf_size; + } else { + if (s->remaining) { + next = s->remaining; + } else { + int mode = (buf[0] >> 3) & 0x0F; + + if (avctx->codec_id == AV_CODEC_ID_AMR_NB) { + next = amrnb_packed_size[mode]; + } else if (avctx->codec_id == AV_CODEC_ID_AMR_WB) { + next = amrwb_packed_size[mode]; + } + } + + s->remaining = next - FFMIN(buf_size, next); + if (s->remaining) + next = END_NOT_FOUND; + + if (next != END_NOT_FOUND) { + if (s->cumulated_size < UINT64_MAX - next) { + s->cumulated_size += next; + /* Both AMR formats have 50 frames per second */ + avctx->bit_rate = s->cumulated_size / ++s->block_count * 8 * 50; + } + } + + if (ff_combine_frame(pc, next, &buf, &buf_size) < 0) { + *poutbuf = NULL; + *poutbuf_size = 0; + return buf_size; + } + } + + s1->duration = avctx->codec_id == AV_CODEC_ID_AMR_NB ? 160 : 320; + + *poutbuf = buf; + *poutbuf_size = buf_size; + return next; +} + +const AVCodecParser ff_amr_parser = { + .codec_ids = { AV_CODEC_ID_AMR_NB, AV_CODEC_ID_AMR_WB }, + .priv_data_size = sizeof(AMRParseContext), + .parser_parse = amr_parse, + .parser_close = ff_parse_close, +}; diff --git a/libavcodec/parsers.c b/libavcodec/parsers.c index 5ab1a226d9..6b40c18d80 100644 --- a/libavcodec/parsers.c +++ b/libavcodec/parsers.c @@ -24,6 +24,7 @@ extern const AVCodecParser ff_aac_parser; extern const AVCodecParser ff_aac_latm_parser; extern const AVCodecParser ff_ac3_parser; extern const AVCodecParser ff_adx_parser; +extern const AVCodecParser ff_amr_parser; extern const AVCodecParser ff_av1_parser; extern const AVCodecParser ff_avs2_parser; extern const AVCodecParser ff_avs3_parser; diff --git a/libavformat/amr.c b/libavformat/amr.c index 836b276fd5..8e79caee18 100644 --- a/libavformat/amr.c +++ b/libavformat/amr.c @@ -29,11 +29,11 @@ Only mono files are supported. #include "libavutil/channel_layout.h" #include "avformat.h" #include "internal.h" +#include "rawdec.h" #include "rawenc.h" -typedef struct { - uint64_t cumulated_size; - uint64_t block_count; +typedef struct AMRContext { + FFRawDemuxerContext rawctx; } AMRContext; static const char AMR_header[] = "#!AMR\n"; @@ -108,56 +108,12 @@ static int amr_read_header(AVFormatContext *s) st->codecpar->channels = 1; st->codecpar->channel_layout = AV_CH_LAYOUT_MONO; st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; + ffstream(st)->need_parsing = AVSTREAM_PARSE_FULL_RAW; avpriv_set_pts_info(st, 64, 1, st->codecpar->sample_rate); return 0; } -static int amr_read_packet(AVFormatContext *s, AVPacket *pkt) -{ - AVCodecParameters *par = s->streams[0]->codecpar; - int read, size = 0, toc, mode; - int64_t pos = avio_tell(s->pb); - AMRContext *amr = s->priv_data; - - if (avio_feof(s->pb)) { - return AVERROR_EOF; - } - - // FIXME this is wrong, this should rather be in an AVParser - toc = avio_r8(s->pb); - mode = (toc >> 3) & 0x0F; - - if (par->codec_id == AV_CODEC_ID_AMR_NB) { - size = amrnb_packed_size[mode]; - } else if (par->codec_id == AV_CODEC_ID_AMR_WB) { - size = amrwb_packed_size[mode]; - } - - if (!size || av_new_packet(pkt, size)) - return AVERROR(EIO); - - if (amr->cumulated_size < UINT64_MAX - size) { - amr->cumulated_size += size; - /* Both AMR formats have 50 frames per second */ - s->streams[0]->codecpar->bit_rate = amr->cumulated_size / ++amr->block_count * 8 * 50; - } - - pkt->stream_index = 0; - pkt->pos = pos; - pkt->data[0] = toc; - pkt->duration = par->codec_id == AV_CODEC_ID_AMR_NB ? 160 : 320; - read = avio_read(s->pb, pkt->data + 1, size - 1); - - if (read != size - 1) { - if (read < 0) - return read; - return AVERROR(EIO); - } - - return 0; -} - #if CONFIG_AMR_DEMUXER const AVInputFormat ff_amr_demuxer = { .name = "amr", @@ -165,8 +121,9 @@ const AVInputFormat ff_amr_demuxer = { .priv_data_size = sizeof(AMRContext), .read_probe = amr_probe, .read_header = amr_read_header, - .read_packet = amr_read_packet, + .read_packet = ff_raw_read_partial_packet, .flags = AVFMT_GENERIC_INDEX, + .priv_class = &ff_raw_demuxer_class, }; #endif @@ -210,6 +167,7 @@ static int amrnb_read_header(AVFormatContext *s) st->codecpar->channels = 1; st->codecpar->channel_layout = AV_CH_LAYOUT_MONO; st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; + ffstream(st)->need_parsing = AVSTREAM_PARSE_FULL_RAW; avpriv_set_pts_info(st, 64, 1, 8000); return 0; @@ -221,8 +179,9 @@ const AVInputFormat ff_amrnb_demuxer = { .priv_data_size = sizeof(AMRContext), .read_probe = amrnb_probe, .read_header = amrnb_read_header, - .read_packet = amr_read_packet, + .read_packet = ff_raw_read_partial_packet, .flags = AVFMT_GENERIC_INDEX, + .priv_class = &ff_raw_demuxer_class, }; #endif @@ -266,6 +225,7 @@ static int amrwb_read_header(AVFormatContext *s) st->codecpar->channels = 1; st->codecpar->channel_layout = AV_CH_LAYOUT_MONO; st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; + ffstream(st)->need_parsing = AVSTREAM_PARSE_FULL_RAW; avpriv_set_pts_info(st, 64, 1, 16000); return 0; @@ -277,8 +237,9 @@ const AVInputFormat ff_amrwb_demuxer = { .priv_data_size = sizeof(AMRContext), .read_probe = amrwb_probe, .read_header = amrwb_read_header, - .read_packet = amr_read_packet, + .read_packet = ff_raw_read_partial_packet, .flags = AVFMT_GENERIC_INDEX, + .priv_class = &ff_raw_demuxer_class, }; #endif