From patchwork Sat Mar 14 11:56:00 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 18188 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 05F654496D1 for ; Sat, 14 Mar 2020 13:56:18 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CE08068B2FB; Sat, 14 Mar 2020 13:56:17 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f42.google.com (mail-wr1-f42.google.com [209.85.221.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 729D368B472 for ; Sat, 14 Mar 2020 13:56:11 +0200 (EET) Received: by mail-wr1-f42.google.com with SMTP id f3so8405976wrw.7 for ; Sat, 14 Mar 2020 04:56:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=psY0TzfmpHl6xm2gXM+tKugjqosr4Spn/4OpOREtuYk=; b=UUSaDYszqVTsl8qILADwiTjvl3AgRj4/MJacmbGPcFGjn9/Xmjisbs9XboKDgDDXtR hUnAvX1bqAztIOZB+AWqgOe9vPFA8AVaSjHuoz915eow9DfAqxnp3YZEh8gdnW22Sacb MeupwXw84zCAy2XkZdzO8lHlg4VGpsasgGtegFXVnUlecxKOAeOFq/cJunEgPAV8r2A3 cc5FhResF36FvFy/Hwk5beHbSrAqmh7te6KDUXEIJsBa5cw8v6vqOs93vTLDXLs67Xh7 WaZmzH3YVys2v3JcN0lc/g6c3Q7u05V/lIOhPDUPQtdPLOGvY9ZWEHCZG+ysycLqF2Sx de7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=psY0TzfmpHl6xm2gXM+tKugjqosr4Spn/4OpOREtuYk=; b=gWpDWQFlb1nvpgMjnwaYHjrgRUx/dffu6Zky8urrGxGo/H8wQiT+ta8PptxwUp4HM4 qUkWRTlV2oAYpQzEo46U+hQmp03/PgCMWitktpWFF2GL0TakEt9oN/9XHQC/PxC124GQ K1UbavdAzZ2eApqadXpTQTXmmSH8Aleq6g3OsDyAyRn6B7cpFmrRgqhUz8TRClDYzKRg kH/+9GTGqDu+Mk60/thhnEH7NCmL+0VJDv5LhET2WDQL8bJdyZtThtG5XNmM6F/g5wV3 rmTsMj6MAZ1vcCrQ4VjJ67vcwSvriJqgpGI84EQNf3dc65PtYMY87AzsL+4yb2ggt4Dt 6viQ== X-Gm-Message-State: ANhLgQ3xrj7sMGusMiNRIcfqaY0zpA/9gKSw91/zziUxpLa52tKcQdXW nxhG9NJIMu9dOZtlBCz61UqW2+Ku X-Google-Smtp-Source: ADFU+vu2xYpCD3l/dn5XsUDA71ppyEf88cPN4QfuSHGX6xlWWU8PQoEptp9bR35/VK/5rD6Jmv7upQ== X-Received: by 2002:adf:e506:: with SMTP id j6mr23345513wrm.309.1584186970383; Sat, 14 Mar 2020 04:56:10 -0700 (PDT) Received: from localhost.localdomain ([37.244.240.19]) by smtp.gmail.com with ESMTPSA id h13sm26842089wrv.39.2020.03.14.04.56.08 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 14 Mar 2020 04:56:09 -0700 (PDT) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Sat, 14 Mar 2020 12:56:00 +0100 Message-Id: <20200314115601.24345-1-onemda@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH 1/2] avcodec: add ADPCM IMA MTF decoder 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Paul B Mahol --- libavcodec/Makefile | 1 + libavcodec/adpcm.c | 33 +++++++++++++++++++++++++++++++++ libavcodec/allcodecs.c | 1 + libavcodec/avcodec.h | 1 + libavcodec/codec_desc.c | 7 +++++++ 5 files changed, 43 insertions(+) diff --git a/libavcodec/Makefile b/libavcodec/Makefile index a3326a45e7..b50a26907f 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -843,6 +843,7 @@ OBJS-$(CONFIG_ADPCM_IMA_DK4_DECODER) += adpcm.o adpcm_data.o OBJS-$(CONFIG_ADPCM_IMA_EA_EACS_DECODER) += adpcm.o adpcm_data.o OBJS-$(CONFIG_ADPCM_IMA_EA_SEAD_DECODER) += adpcm.o adpcm_data.o OBJS-$(CONFIG_ADPCM_IMA_ISS_DECODER) += adpcm.o adpcm_data.o +OBJS-$(CONFIG_ADPCM_IMA_MTF_DECODER) += adpcm.o adpcm_data.o OBJS-$(CONFIG_ADPCM_IMA_OKI_DECODER) += adpcm.o adpcm_data.o OBJS-$(CONFIG_ADPCM_IMA_QT_DECODER) += adpcm.o adpcm_data.o OBJS-$(CONFIG_ADPCM_IMA_QT_ENCODER) += adpcmenc.o adpcm_data.o diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c index 4f5980f7d5..e9abddc43c 100644 --- a/libavcodec/adpcm.c +++ b/libavcodec/adpcm.c @@ -89,6 +89,11 @@ static const int8_t zork_index_table[8] = { -1, -1, -1, 1, 4, 7, 10, 12, }; +static const int8_t mtf_index_table[16] = { + 8, 6, 4, 2, -1, -1, -1, -1, + -1, -1, -1, -1, 2, 4, 6, 8, +}; + /* end of tables */ typedef struct ADPCMDecodeContext { @@ -304,6 +309,22 @@ static inline int16_t adpcm_ima_alp_expand_nibble(ADPCMChannelStatus *c, int8_t return (int16_t)c->predictor; } +static inline int16_t adpcm_ima_mtf_expand_nibble(ADPCMChannelStatus *c, int nibble) +{ + int step_index, step, delta, predictor; + + step = ff_adpcm_step_table[c->step_index]; + + delta = step * (2 * nibble - 15); + predictor = c->predictor + delta; + + step_index = c->step_index + mtf_index_table[(unsigned)nibble]; + c->predictor = av_clip_int16(predictor >> 4); + c->step_index = av_clip(step_index, 0, 88); + + return (int16_t)c->predictor; +} + static inline int16_t adpcm_ima_wav_expand_nibble(ADPCMChannelStatus *c, GetBitContext *gb, int bps) { int nibble, step_index, predictor, sign, delta, diff, step, shift; @@ -700,6 +721,7 @@ static int get_nb_samples(AVCodecContext *avctx, GetByteContext *gb, case AV_CODEC_ID_ADPCM_IMA_SSI: case AV_CODEC_ID_ADPCM_IMA_APM: case AV_CODEC_ID_ADPCM_IMA_ALP: + case AV_CODEC_ID_ADPCM_IMA_MTF: nb_samples = buf_size * 2 / ch; break; } @@ -1956,6 +1978,16 @@ static int adpcm_decode_frame(AVCodecContext *avctx, void *data, *samples++ = adpcm_zork_expand_nibble(&c->status[n % avctx->channels], v); } break; + case AV_CODEC_ID_ADPCM_IMA_MTF: + for (n = nb_samples / 2; n > 0; n--) { + for (channel = 0; channel < avctx->channels; channel++) { + int v = bytestream2_get_byteu(&gb); + *samples++ = adpcm_ima_mtf_expand_nibble(&c->status[channel], v >> 4); + samples[st] = adpcm_ima_mtf_expand_nibble(&c->status[channel], v & 0x0F); + } + samples += avctx->channels; + } + break; default: av_assert0(0); // unsupported codec_id should not happen } @@ -2027,6 +2059,7 @@ ADPCM_DECODER(AV_CODEC_ID_ADPCM_IMA_DK4, sample_fmts_s16, adpcm_ima_dk4, ADPCM_DECODER(AV_CODEC_ID_ADPCM_IMA_EA_EACS, sample_fmts_s16, adpcm_ima_ea_eacs, "ADPCM IMA Electronic Arts EACS"); ADPCM_DECODER(AV_CODEC_ID_ADPCM_IMA_EA_SEAD, sample_fmts_s16, adpcm_ima_ea_sead, "ADPCM IMA Electronic Arts SEAD"); ADPCM_DECODER(AV_CODEC_ID_ADPCM_IMA_ISS, sample_fmts_s16, adpcm_ima_iss, "ADPCM IMA Funcom ISS"); +ADPCM_DECODER(AV_CODEC_ID_ADPCM_IMA_MTF, sample_fmts_s16, adpcm_ima_mtf, "ADPCM IMA Capcom's MT Framework"); ADPCM_DECODER(AV_CODEC_ID_ADPCM_IMA_OKI, sample_fmts_s16, adpcm_ima_oki, "ADPCM IMA Dialogic OKI"); ADPCM_DECODER(AV_CODEC_ID_ADPCM_IMA_QT, sample_fmts_s16p, adpcm_ima_qt, "ADPCM IMA QuickTime"); ADPCM_DECODER(AV_CODEC_ID_ADPCM_IMA_RAD, sample_fmts_s16, adpcm_ima_rad, "ADPCM IMA Radical"); diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index f4cf180716..379c5f7b81 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -608,6 +608,7 @@ extern AVCodec ff_adpcm_ima_dk4_decoder; extern AVCodec ff_adpcm_ima_ea_eacs_decoder; extern AVCodec ff_adpcm_ima_ea_sead_decoder; extern AVCodec ff_adpcm_ima_iss_decoder; +extern AVCodec ff_adpcm_ima_mtf_decoder; extern AVCodec ff_adpcm_ima_oki_decoder; extern AVCodec ff_adpcm_ima_qt_encoder; extern AVCodec ff_adpcm_ima_qt_decoder; diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index aca3825fd3..9ac97a122b 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -553,6 +553,7 @@ enum AVCodecID { AV_CODEC_ID_ADPCM_ZORK, AV_CODEC_ID_ADPCM_IMA_APM, AV_CODEC_ID_ADPCM_IMA_ALP, + AV_CODEC_ID_ADPCM_IMA_MTF, /* AMR */ AV_CODEC_ID_AMR_NB = 0x12000, diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c index 0f5ddd9a9f..df3671765a 100644 --- a/libavcodec/codec_desc.c +++ b/libavcodec/codec_desc.c @@ -2332,6 +2332,13 @@ static const AVCodecDescriptor codec_descriptors[] = { .long_name = NULL_IF_CONFIG_SMALL("ADPCM IMA High Voltage Software ALP"), .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY, }, + { + .id = AV_CODEC_ID_ADPCM_IMA_MTF, + .type = AVMEDIA_TYPE_AUDIO, + .name = "adpcm_ima_mtf", + .long_name = NULL_IF_CONFIG_SMALL("ADPCM IMA Capcom's MT Framework"), + .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY, + }, /* AMR */ { From patchwork Sat Mar 14 11:56:01 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 18189 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 10B174496D1 for ; Sat, 14 Mar 2020 13:56:19 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id EF50F68B489; Sat, 14 Mar 2020 13:56:18 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9C7FA68B2FB for ; Sat, 14 Mar 2020 13:56:12 +0200 (EET) Received: by mail-wr1-f65.google.com with SMTP id s14so15405888wrt.8 for ; Sat, 14 Mar 2020 04:56:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=P3FjWrmy5pOqrfNI1KdR6xSNNVY9t4/rc4g5YGeHYHI=; b=GgsbPJSuTQUQsJ27VO+V7SE3Kr8en+qqbE5jVLv1cMs706ulf4KcQfyQtfSQwkzcYs XSOSRdU5VPKhnZNxMsXF8y+Qj+4G1lF9JmHpfMig3oZ1joPDzMNo/oeCUzWu+tqjZNkH SoLhddSelr/9yv2MeJQij3kuMTFZU1TVUBWtSZThGLhABkTHZVZCtMo20/9VK7YHz2zH IttQ7e1eTjaQpTUyelZXXuVKBuyw90OTaExSdI0ge8rBCsFedaZ/NM7Qy0qiQxS5IGQc SGa7VLtyghn3X5Dikj4J8kxfFUL4Ow/o4nJMULNxhASzjEsd38UT795IMFZL/b6YfTlU lMbQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=P3FjWrmy5pOqrfNI1KdR6xSNNVY9t4/rc4g5YGeHYHI=; b=nWP7cDZe1WLuNM/ksIUVbuPR6MpNwCxf1+QsJMOkK0XgiMO2cs6a/klSxbw8qyimKF y4/s+lcW+dfLHsn2qHoQWgLuiiYmEPCo7DcpF9o56bDSaB+/TCV2eCTkjJqUHTq/U3OU aswc4UkciWJjh8sgFNPtPemZntAw6GYSiezUc+hBVK/gF4tJCxTCSPD6LbxybgElh1Aa i9yWTD8+9JECVF6E8Fm4lZyAiwoa5IGC/pZ97GTgi0ErK+IarTvHND/nTbl3xSStVobU xhC9xI0ikaCNEeI8otSUgfPObfHu7y/YCacZBkfoAeuFAc2FaQGAc3F03htWmQAWVKbz JkXQ== X-Gm-Message-State: ANhLgQ2Dv5LYZH0YDSIIexFyNPcYOicJphrrdRZZ3Jq1XSsj/K76MXSj X3+duTCSfVAvk8AY9SFBIsgjxNIT X-Google-Smtp-Source: ADFU+vs/FlWaRNUSvOunKJcCSFUJ2wTdlzVfqEBJrlmXWR4cCukBd5SBCA7Mh6xxJA/+8HRNdkV8eA== X-Received: by 2002:a5d:6344:: with SMTP id b4mr23494405wrw.354.1584186971716; Sat, 14 Mar 2020 04:56:11 -0700 (PDT) Received: from localhost.localdomain ([37.244.240.19]) by smtp.gmail.com with ESMTPSA id h13sm26842089wrv.39.2020.03.14.04.56.10 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 14 Mar 2020 04:56:11 -0700 (PDT) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Sat, 14 Mar 2020 12:56:01 +0100 Message-Id: <20200314115601.24345-2-onemda@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200314115601.24345-1-onemda@gmail.com> References: <20200314115601.24345-1-onemda@gmail.com> Subject: [FFmpeg-devel] [PATCH 2/2] avformat: add fwse 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Paul B Mahol --- libavformat/Makefile | 1 + libavformat/allformats.c | 1 + libavformat/fwse.c | 88 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 90 insertions(+) create mode 100644 libavformat/fwse.c diff --git a/libavformat/Makefile b/libavformat/Makefile index f84becd30a..cd3e9163f5 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -198,6 +198,7 @@ OBJS-$(CONFIG_FRAMEHASH_MUXER) += hashenc.o framehash.o OBJS-$(CONFIG_FRAMEMD5_MUXER) += hashenc.o framehash.o OBJS-$(CONFIG_FRM_DEMUXER) += frmdec.o OBJS-$(CONFIG_FSB_DEMUXER) += fsb.o +OBJS-$(CONFIG_FWSE_DEMUXER) += fwse.o OBJS-$(CONFIG_GIF_MUXER) += gif.o OBJS-$(CONFIG_GIF_DEMUXER) += gifdec.o OBJS-$(CONFIG_GSM_DEMUXER) += gsmdec.o diff --git a/libavformat/allformats.c b/libavformat/allformats.c index 08012ea208..d275c1017b 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -156,6 +156,7 @@ extern AVOutputFormat ff_framehash_muxer; extern AVOutputFormat ff_framemd5_muxer; extern AVInputFormat ff_frm_demuxer; extern AVInputFormat ff_fsb_demuxer; +extern AVInputFormat ff_fwse_demuxer; extern AVInputFormat ff_g722_demuxer; extern AVOutputFormat ff_g722_muxer; extern AVInputFormat ff_g723_1_demuxer; diff --git a/libavformat/fwse.c b/libavformat/fwse.c new file mode 100644 index 0000000000..76ed6b0c23 --- /dev/null +++ b/libavformat/fwse.c @@ -0,0 +1,88 @@ +/* + * FWSE demuxer + * Copyright (c) 2020 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 + */ + +#include "libavutil/intreadwrite.h" +#include "libavcodec/internal.h" +#include "avformat.h" +#include "internal.h" +#include "pcm.h" + +typedef struct FWSEDemuxContext { + unsigned dsp_int_type; + unsigned interleave_size; +} FWSEDemuxContext; + +static int fwse_probe(const AVProbeData *p) +{ + if (AV_RL32(p->buf) != MKTAG('F','W','S','E')) + return 0; + if (AV_RL32(p->buf+4) != 2 && AV_RL32(p->buf+4) != 3) + return 0; + + return AVPROBE_SCORE_MAX / 3 * 2; +} + +static int fwse_read_header(AVFormatContext *s) +{ + FWSEDemuxContext *c = s->priv_data; + unsigned start_offset, version; + AVStream *st; + + avio_skip(s->pb, 4); + version = avio_rl32(s->pb); + if (version != 1 && version != 2) + return AVERROR_INVALIDDATA; + avio_skip(s->pb, 4); + start_offset = avio_rl32(s->pb); + + st = avformat_new_stream(s, NULL); + if (!st) + return AVERROR(ENOMEM); + + st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; + st->codecpar->codec_id = AV_CODEC_ID_ADPCM_IMA_MTF; + st->codecpar->format = AV_SAMPLE_FMT_S16; + st->codecpar->channels = avio_rl32(s->pb); + if (st->codecpar->channels != 1 && st->codecpar->channels != 2) + return AVERROR_INVALIDDATA; + if (st->codecpar->channels == 1) + st->codecpar->channel_layout = AV_CH_LAYOUT_MONO; + else if (st->codecpar->channels == 2) + st->codecpar->channel_layout = AV_CH_LAYOUT_STEREO; + st->duration = avio_rl32(s->pb); + st->codecpar->sample_rate = avio_rl32(s->pb); + st->codecpar->block_align = 1; + avio_skip(s->pb, start_offset - avio_tell(s->pb)); + + avpriv_set_pts_info(st, 64, 1, st->codecpar->sample_rate); + + return 0; +} + +AVInputFormat ff_fwse_demuxer = { + .name = "fwse", + .long_name = NULL_IF_CONFIG_SMALL("Capcom's MT Framework sound"), + .priv_data_size = sizeof(FWSEDemuxContext), + .read_probe = fwse_probe, + .read_header = fwse_read_header, + .read_packet = ff_pcm_read_packet, + .extensions = "fwse", +};