From patchwork Mon Mar 16 10:30:44 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: 18238 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 5244E44A9BF for ; Mon, 16 Mar 2020 12:31:06 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2E62968B505; Mon, 16 Mar 2020 12:31:06 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f45.google.com (mail-wr1-f45.google.com [209.85.221.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2FF9B68B292 for ; Mon, 16 Mar 2020 12:30:59 +0200 (EET) Received: by mail-wr1-f45.google.com with SMTP id v11so20496763wrm.9 for ; Mon, 16 Mar 2020 03:30:59 -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=RrjAH5I5ZZsHp0NPkVHB1jPpSSbvC0V8EnWVaUnoYIzdK9K1I0BD7fAwev8m0mYiGO IBlbtrv62+iSBINv7pZtPmnd3VPTMEnrMMqRUXcaxhMHjoYa/catoNFqnjn52hkJnYxt Myg9ZuVeNcMukeB2ifXQL6YY8YyGz9n2z3VMAPVAKCAaOqEcpmZueAUxhkgFFcj4oY74 pX+Clvog3aaI3Kk6YVFT2VMdVcywUtEuhrU6wO66RJXUwEShuGML+cRx61pOfO5CReAQ c6kTTYl6f/ovFOjFHu+ZM/SIJ5pylsW73U3wZ5NEG3DggzdTndbx2kY2pCDVq8Kui0MN 6a4Q== 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=guwLvkjT8IIOQVZqemRa1itIoRtJNVJwuh9cDi8iU2E1hXQUfDetfCEckkci+Jzv9a ByXHSuWCMrhgCTt7jjdnIyi4sJDbz33f7jxuWa3t2HfkjEIhoJygpGggYpwSVFrs3AMI 7Ap6hXO2qAjbGdA7Rh8Bnbqzw3acoff0Zj81Y9NqQtbV2IWN59wqUJctWVSoRSr1waC+ Mg+7dN1pmwkj4CS6//2xPUF/HaCkn0Wq8UlKMTg+UNvRXVNADUJRkuksovufdBLBSY0h sVoGdp1blzpCBqyV8cpy3r6LlfZaJ4JA0b+x6JSdhTZ4lEGdfOxWteYrPsIMkuFy7hVm ZO9w== X-Gm-Message-State: ANhLgQ0Cm3SRXPDoOhllpn26PbwmobRuwU8F67EUdKjXqjLZ890IoAqR 8Hl86qzQnyRM8uYc5lEQyhOrOi/p X-Google-Smtp-Source: ADFU+vsUrAmMXquDw46qjLuJRg5YOeKczycNiXLMEZXTHUylTmitCboCNqP4mh5PxDIzIdF9zq/GgQ== X-Received: by 2002:a05:6000:10c6:: with SMTP id b6mr11696674wrx.130.1584354658293; Mon, 16 Mar 2020 03:30:58 -0700 (PDT) Received: from localhost.localdomain ([37.244.255.176]) by smtp.gmail.com with ESMTPSA id o4sm1504431wrp.84.2020.03.16.03.30.57 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Mar 2020 03:30:57 -0700 (PDT) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Mon, 16 Mar 2020 11:30:44 +0100 Message-Id: <20200316103050.22529-1-onemda@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH 1/7] 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 Mon Mar 16 10:30:45 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: 18239 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 54B0844A9BF for ; Mon, 16 Mar 2020 12:31:08 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3A0BF68B518; Mon, 16 Mar 2020 12:31:08 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3852968B292 for ; Mon, 16 Mar 2020 12:31:00 +0200 (EET) Received: by mail-wr1-f67.google.com with SMTP id z15so20452252wrl.1 for ; Mon, 16 Mar 2020 03:31:00 -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=zf0SOEFT08l2beb8euvRRe85nee9eR0TSQ+Wx4EqHBQ=; b=jIx2gKEDuCVJdYU0E6vK/HanU75i6Poxmi9tGZh859If8JGCVzAKV2FPj8X/Ie8s71 WXKlotZD10XM8xZqBlpGWdWYIyiu7fK2ZeX1jlf287wi/5Sjug0vxlDpPjMZlFAxCoN6 DGpV1HNEXPYu+UNb0eW8OV0bSAwXo55oL0pzf5caYeXSLOWJ54qvnYzX7GR4j43UEjuV iuMVvwJBpgwX/1mlsxsP4BrbYYof+69W5FTajGMRiaN/pLbux42tvE1UgfeO6pqRdFeD uAd87503lyxLVhuuRLyXnIrr2uwl9DVjd7RrTpXCMUFQ5gJtz1x4MWkN/BZLT9J6gIn5 B3MA== 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=zf0SOEFT08l2beb8euvRRe85nee9eR0TSQ+Wx4EqHBQ=; b=bp5P/nSq3CC3klR94dO3W8/kUXylxj2kSALjy5TxsF1Br45YCfHk7BmK+TxHWCv+xM wS532Q+Vc/+i/4OwGKXFIUcB95nkHpwfDFYofqy7jbQ3V7HIQjWdHPZrrJ3o5vPrIzcg WS2qzkwvEIUqPj3/FeJK7G6yClEqNwJZLmzg6jbn/UnPiEp+vjllfdapJxisKIeYCima bkRooWs9fTjy3VQG8D2fGA2PPpevcQ10VGvflp8CH7y/VfIu3MIWQpUgAbZa1mkMVpim BjbWejaztZWkLGXhmWZdVxGyfJ5yMYO7y7khUF+uGOwivRmOZ36gSwT+bpjnL4jtqvuL IEoQ== X-Gm-Message-State: ANhLgQ2j7jJit6HGfc1JntPnj7GpNRlpBDXvVMloD2WRd3F+1+OLXsjg 6F0LGQ4pqEwHYG7bwcxnFYrfQC2N X-Google-Smtp-Source: ADFU+vvrExLbcsfLRZjmsrdfcDHTrkMdk1wwttCqaiDFQWaeZfMwIKoslcRDIDwGhRYQxjboKM7mhg== X-Received: by 2002:a5d:5545:: with SMTP id g5mr18821952wrw.290.1584354659387; Mon, 16 Mar 2020 03:30:59 -0700 (PDT) Received: from localhost.localdomain ([37.244.255.176]) by smtp.gmail.com with ESMTPSA id o4sm1504431wrp.84.2020.03.16.03.30.58 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Mar 2020 03:30:58 -0700 (PDT) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Mon, 16 Mar 2020 11:30:45 +0100 Message-Id: <20200316103050.22529-2-onemda@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200316103050.22529-1-onemda@gmail.com> References: <20200316103050.22529-1-onemda@gmail.com> Subject: [FFmpeg-devel] [PATCH 2/7] 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..00e2e13b11 --- /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 "avformat.h" +#include "internal.h" +#include "pcm.h" + +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; + if (AV_RL32(p->buf+16) != 1 && AV_RL32(p->buf+16) != 2) + return 0; + + return AVPROBE_SCORE_MAX / 4 * 3; +} + +static int fwse_read_header(AVFormatContext *s) +{ + unsigned start_offset, version; + AVIOContext *pb = s->pb; + AVCodecParameters *par; + AVStream *st; + + avio_skip(pb, 4); + version = avio_rl32(pb); + if (version != 2 && version != 3) + return AVERROR_INVALIDDATA; + avio_skip(pb, 4); + start_offset = avio_rl32(pb); + + st = avformat_new_stream(s, NULL); + if (!st) + return AVERROR(ENOMEM); + + par = st->codecpar; + par->codec_type = AVMEDIA_TYPE_AUDIO; + par->codec_id = AV_CODEC_ID_ADPCM_IMA_MTF; + par->format = AV_SAMPLE_FMT_S16; + par->channels = avio_rl32(pb); + if (par->channels != 1 && par->channels != 2) + return AVERROR_INVALIDDATA; + if (par->channels == 1) + par->channel_layout = AV_CH_LAYOUT_MONO; + else if (par->channels == 2) + par->channel_layout = AV_CH_LAYOUT_STEREO; + st->duration = avio_rl32(pb); + par->sample_rate = avio_rl32(pb); + if (par->sample_rate <= 0 || par->sample_rate > INT_MAX) + return AVERROR_INVALIDDATA; + + par->block_align = 1; + avio_skip(pb, start_offset - avio_tell(pb)); + + avpriv_set_pts_info(st, 64, 1, par->sample_rate); + + return 0; +} + +AVInputFormat ff_fwse_demuxer = { + .name = "fwse", + .long_name = NULL_IF_CONFIG_SMALL("Capcom's MT Framework sound"), + .read_probe = fwse_probe, + .read_header = fwse_read_header, + .read_packet = ff_pcm_read_packet, + .extensions = "fwse", +}; From patchwork Mon Mar 16 10:30:46 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: 18240 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 8314C44A9BF for ; Mon, 16 Mar 2020 12:31:09 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 688E268B512; Mon, 16 Mar 2020 12:31:09 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f50.google.com (mail-wr1-f50.google.com [209.85.221.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7142068B50F for ; Mon, 16 Mar 2020 12:31:01 +0200 (EET) Received: by mail-wr1-f50.google.com with SMTP id f3so13488977wrw.7 for ; Mon, 16 Mar 2020 03:31:01 -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=r/U83AFPxH1brU0Y+iot7lPewroX4bDANvLTOiucj9o=; b=BB1GCiSKvfN1GR0rJuqBZBpk7MsO48Ib3BDvSVVFoWB6PJ5zJISl8mAtsjELKu1mfV jcZVVqEFhQXK6VRXAvFmyq7VmQAbidLMJGRXFbtp96QmeFmsfvPLMVkUTwi1Y5G9JC3O hJRX3kXV2gL//8lZMLL7ZbMU0oAx1VM/dvHZzCI8lSIgurm2TS+dag3Gg23iXzCDIdsP ZAoo56M+hfm0rlqQgYPUhGM4gRwriyNfX5bqgzLAC94PdkLMmRxUHLU6l+0BgPyIkjvd wS50n448Wc1U62dUiMMHfeFMO5W70V8CluFG3igl1lWJ82i9sfMdWGhHZSwII9fCyujg SrYw== 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=r/U83AFPxH1brU0Y+iot7lPewroX4bDANvLTOiucj9o=; b=W22WLeAEi8niwidXEXlIvcEa5SZ1qIuv/0tPcIBIamS/JxRGu/tDh5G4s/bMnBVLpi c4OVjHB8oVCd45ckEHduoJ+NUzyqR75Vt5NWiaCNd3coyyOQNSbim3WYEAxlMmvIwdMB IQ5YNvlzGyaDE3cFv+kZ56iwR1skNoPomnPCkMzuefCcMWyB6AYYOcFcQ3wBb09Y/zYd BjUZ84aWhxQNOhmI5wvLiowNJpUnxXyl//15/aJ5pgov+2FG2SEbhfWhGkouQmG3SE1q 3+s5GC2a/vmWJrhYVrZJLc62mlAT8RyH+JBPOuFM/0sxO/FfFLdVCr0bZ2+uqGRM24rK mzUw== X-Gm-Message-State: ANhLgQ0foVXPRStPaoAzwjGpsn2k1IqMzB0GYU+2g0JWN73cS0kpS5pH weZHJCWYqt3BzRY/JFWacsOksTnk X-Google-Smtp-Source: ADFU+vs0J+h44Npwr2e9qK5ViA+WQA9w6oYmb/JUxQ57ShRzghPzAZCDU6eWfwlv9Vlvtco0qJo9cQ== X-Received: by 2002:adf:9dc3:: with SMTP id q3mr34505385wre.261.1584354660498; Mon, 16 Mar 2020 03:31:00 -0700 (PDT) Received: from localhost.localdomain ([37.244.255.176]) by smtp.gmail.com with ESMTPSA id o4sm1504431wrp.84.2020.03.16.03.30.59 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Mar 2020 03:30:59 -0700 (PDT) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Mon, 16 Mar 2020 11:30:46 +0100 Message-Id: <20200316103050.22529-3-onemda@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200316103050.22529-1-onemda@gmail.com> References: <20200316103050.22529-1-onemda@gmail.com> Subject: [FFmpeg-devel] [PATCH 3/7] avcodec: add derf dpcm 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/allcodecs.c | 1 + libavcodec/avcodec.h | 1 + libavcodec/codec_desc.c | 7 +++++++ libavcodec/dpcm.c | 32 ++++++++++++++++++++++++++++++++ libavcodec/utils.c | 1 + 6 files changed, 43 insertions(+) diff --git a/libavcodec/Makefile b/libavcodec/Makefile index b50a26907f..a88643b7d2 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -265,6 +265,7 @@ OBJS-$(CONFIG_DCA_DECODER) += dcadec.o dca.o dcadata.o dcahuff.o \ OBJS-$(CONFIG_DCA_ENCODER) += dcaenc.o dca.o dcadata.o dcahuff.o \ dcaadpcm.o OBJS-$(CONFIG_DDS_DECODER) += dds.o +OBJS-$(CONFIG_DERF_DPCM_DECODER) += dpcm.o OBJS-$(CONFIG_DIRAC_DECODER) += diracdec.o dirac.o diracdsp.o diractab.o \ dirac_arith.o dirac_dwt.o dirac_vlc.o OBJS-$(CONFIG_DFA_DECODER) += dfa.o diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index 379c5f7b81..6046b15164 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -569,6 +569,7 @@ extern AVCodec ff_pcm_vidc_encoder; extern AVCodec ff_pcm_vidc_decoder; /* DPCM codecs */ +extern AVCodec ff_derf_dpcm_decoder; extern AVCodec ff_gremlin_dpcm_decoder; extern AVCodec ff_interplay_dpcm_decoder; extern AVCodec ff_roq_dpcm_encoder; diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 9ac97a122b..e9c658fddc 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -571,6 +571,7 @@ enum AVCodecID { AV_CODEC_ID_SDX2_DPCM = 0x14800, AV_CODEC_ID_GREMLIN_DPCM, + AV_CODEC_ID_DERF_DPCM, /* audio codecs */ AV_CODEC_ID_MP2 = 0x15000, diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c index df3671765a..130e08c1f2 100644 --- a/libavcodec/codec_desc.c +++ b/libavcodec/codec_desc.c @@ -2415,6 +2415,13 @@ static const AVCodecDescriptor codec_descriptors[] = { .long_name = NULL_IF_CONFIG_SMALL("DPCM Gremlin"), .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY, }, + { + .id = AV_CODEC_ID_DERF_DPCM, + .type = AVMEDIA_TYPE_AUDIO, + .name = "derf_dpcm", + .long_name = NULL_IF_CONFIG_SMALL("DPCM Xilam DERF"), + .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY, + }, /* audio codecs */ { diff --git a/libavcodec/dpcm.c b/libavcodec/dpcm.c index 5958081b66..069bf1dcd8 100644 --- a/libavcodec/dpcm.c +++ b/libavcodec/dpcm.c @@ -49,6 +49,21 @@ typedef struct DPCMContext { const int8_t *sol_table; ///< delta table for SOL_DPCM } DPCMContext; +static const int32_t derf_steps[96] = { + 0, 1, 2, 3, 4, 5, 6, 7, + 8, 9, 10, 11, 12, 13, 14, 16, + 17, 19, 21, 23, 25, 28, 31, 34, + 37, 41, 45, 50, 55, 60, 66, 73, + 80, 88, 97, 107, 118, 130, 143, 157, + 173, 190, 209, 230, 253, 279, 307, 337, + 371, 408, 449, 494, 544, 598, 658, 724, + 796, 876, 963, 1060, 1166, 1282, 1411, 1552, + 1707, 1878, 2066, 2272, 2499, 2749, 3024, 3327, + 3660, 4026, 4428, 4871, 5358, 5894, 6484, 7132, + 7845, 8630, 9493, 10442, 11487, 12635, 13899, 15289, + 16818, 18500, 20350, 22385, 24623, 27086, 29794, 32767, +}; + static const int16_t interplay_delta_table[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, @@ -225,6 +240,7 @@ static int dpcm_decode_frame(AVCodecContext *avctx, void *data, else out = buf_size; break; + case AV_CODEC_ID_DERF_DPCM: case AV_CODEC_ID_GREMLIN_DPCM: case AV_CODEC_ID_SDX2_DPCM: out = buf_size; @@ -372,6 +388,21 @@ static int dpcm_decode_frame(AVCodecContext *avctx, void *data, } } break; + + case AV_CODEC_ID_DERF_DPCM: { + int idx = 0; + + while (output_samples < samples_end) { + uint8_t n = bytestream2_get_byteu(&gb); + int index = FFMIN(n & 0x7f, 95); + + s->sample[idx] += (n & 0x80 ? -1: 1) * derf_steps[index]; + s->sample[idx] = av_clip_int16(s->sample[idx]); + *output_samples++ = s->sample[idx]; + idx ^= stereo; + } + } + break; } *got_frame_ptr = 1; @@ -391,6 +422,7 @@ AVCodec ff_ ## name_ ## _decoder = { \ .capabilities = AV_CODEC_CAP_DR1, \ } +DPCM_DECODER(AV_CODEC_ID_DERF_DPCM, derf_dpcm, "DPCM Xilam DERF"); DPCM_DECODER(AV_CODEC_ID_GREMLIN_DPCM, gremlin_dpcm, "DPCM Gremlin"); DPCM_DECODER(AV_CODEC_ID_INTERPLAY_DPCM, interplay_dpcm, "DPCM Interplay"); DPCM_DECODER(AV_CODEC_ID_ROQ_DPCM, roq_dpcm, "DPCM id RoQ"); diff --git a/libavcodec/utils.c b/libavcodec/utils.c index c4dc136d3c..66bfdaf4f8 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -1478,6 +1478,7 @@ int av_get_exact_bits_per_sample(enum AVCodecID codec_id) case AV_CODEC_ID_PCM_S8_PLANAR: case AV_CODEC_ID_PCM_U8: case AV_CODEC_ID_SDX2_DPCM: + case AV_CODEC_ID_DERF_DPCM: return 8; case AV_CODEC_ID_PCM_S16BE: case AV_CODEC_ID_PCM_S16BE_PLANAR: From patchwork Mon Mar 16 10:30:47 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: 18241 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 467A144A9BF for ; Mon, 16 Mar 2020 12:31:11 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2F6ED68B532; Mon, 16 Mar 2020 12:31:11 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E8AEB68B50F for ; Mon, 16 Mar 2020 12:31:02 +0200 (EET) Received: by mail-wm1-f68.google.com with SMTP id m3so17376521wmi.0 for ; Mon, 16 Mar 2020 03:31:02 -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=cHzYVhSdRTq6LAlaTwonRvIMmt+UVxKfD/USh/QS9W8=; b=nptETseR1wY8zKmdgZsc+O6dl+hm5pb1TQ9YydvCwQezjWB4/s8rLgUVyXB/uE7/N0 os0AW5M8wtJxpkXDWDoLe+U2D/77ClAPK/6q/0m7nOrLnpjv9jiwhnbnSciEFLPXYxtA mf48oFJQVDw2QzGUVOf1qcARvdXp0Gujek/Y3h4t2p4bTHbsgJjU5yrhQ/p1bQJTmlHM Y+xB3PYhPJNivnJ/KnlrUCDTnS0se0RDeIyZ8bPeTTejHyd5SthM0rELfMc585BpYhLl MTvKuIp61NQ6wpGrJiwyaBP5UU24kWZLfjgB9tbzG3Wb4L6mbmOJHMsJT8k7YwSxCwKd h7UA== 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=cHzYVhSdRTq6LAlaTwonRvIMmt+UVxKfD/USh/QS9W8=; b=UlLfYU12yI3zEf0QlkgeJSlKwzbbDITC2AepVIVuKVHB2ugRz7oAiqgTnbRPcm53vi Z0kix9wrJYdxKDJiswibqQN1kkGwXjdAHWGxjZ9x9G5CB7A28ihSbYCGRA1HooUpaDnk RmZquV2z7b71l83GA8UuLRgDMyl4B9/k6d8kVv0Ax8rTyx6WwYT/TPY4P0T935t+bb9A iOXlBFZma2JeNU6Q9hxyRkBE2MMBcssZga03wp5uEWNmOFLGiIwrjUnFoTewoa7K7Xse x+Uxw0KvllcQpqtqd+ZEeGgIc3U3VKF7xSk6813VrmZbdXm/wVy7a8fCWe9OpEnx3Fs/ 7pCA== X-Gm-Message-State: ANhLgQ1/toVhyqrBe1d5rrSJnuAENu4Xbasxk8zqkDPem9iEkEV0zYg8 KGvMuMTI21CvrLDnWWHUNY9vtIZo X-Google-Smtp-Source: ADFU+vuAGjjx4HiBe7O1AooTI4WvVVsMLpwYkVhEsa8Elw9i37m1Mk7Y2aH8qdoWdYNw5VMcJgfGWw== X-Received: by 2002:a1c:b657:: with SMTP id g84mr27301433wmf.107.1584354661568; Mon, 16 Mar 2020 03:31:01 -0700 (PDT) Received: from localhost.localdomain ([37.244.255.176]) by smtp.gmail.com with ESMTPSA id o4sm1504431wrp.84.2020.03.16.03.31.00 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Mar 2020 03:31:01 -0700 (PDT) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Mon, 16 Mar 2020 11:30:47 +0100 Message-Id: <20200316103050.22529-4-onemda@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200316103050.22529-1-onemda@gmail.com> References: <20200316103050.22529-1-onemda@gmail.com> Subject: [FFmpeg-devel] [PATCH 4/7] avformat: add derf 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/derf.c | 79 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 81 insertions(+) create mode 100644 libavformat/derf.c diff --git a/libavformat/Makefile b/libavformat/Makefile index cd3e9163f5..27615cd746 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -151,6 +151,7 @@ OBJS-$(CONFIG_DASH_DEMUXER) += dash.o dashdec.o OBJS-$(CONFIG_DAUD_DEMUXER) += dauddec.o OBJS-$(CONFIG_DAUD_MUXER) += daudenc.o OBJS-$(CONFIG_DCSTR_DEMUXER) += dcstr.o +OBJS-$(CONFIG_DERF_DEMUXER) += derf.o OBJS-$(CONFIG_DFA_DEMUXER) += dfa.o OBJS-$(CONFIG_DHAV_DEMUXER) += dhav.o OBJS-$(CONFIG_DIRAC_DEMUXER) += diracdec.o rawdec.o diff --git a/libavformat/allformats.c b/libavformat/allformats.c index d275c1017b..af10def88b 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -113,6 +113,7 @@ extern AVOutputFormat ff_data_muxer; extern AVInputFormat ff_daud_demuxer; extern AVOutputFormat ff_daud_muxer; extern AVInputFormat ff_dcstr_demuxer; +extern AVInputFormat ff_derf_demuxer; extern AVInputFormat ff_dfa_demuxer; extern AVInputFormat ff_dhav_demuxer; extern AVInputFormat ff_dirac_demuxer; diff --git a/libavformat/derf.c b/libavformat/derf.c new file mode 100644 index 0000000000..58bbf5b791 --- /dev/null +++ b/libavformat/derf.c @@ -0,0 +1,79 @@ +/* + * DERF 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 "avformat.h" +#include "internal.h" +#include "pcm.h" + +static int derf_probe(const AVProbeData *p) +{ + if (AV_RL32(p->buf) != MKTAG('D','E','R','F')) + return 0; + if (AV_RL32(p->buf+4) != 1 && AV_RL32(p->buf+4) != 2) + return 0; + + return AVPROBE_SCORE_MAX / 3 * 2; +} + +static int derf_read_header(AVFormatContext *s) +{ + unsigned data_size; + AVIOContext *pb = s->pb; + AVCodecParameters *par; + AVStream *st; + + avio_skip(pb, 4); + + st = avformat_new_stream(s, NULL); + if (!st) + return AVERROR(ENOMEM); + + par = st->codecpar; + par->codec_type = AVMEDIA_TYPE_AUDIO; + par->codec_id = AV_CODEC_ID_DERF_DPCM; + par->format = AV_SAMPLE_FMT_S16; + par->channels = avio_rl32(pb); + if (par->channels != 1 && par->channels != 2) + return AVERROR_INVALIDDATA; + if (par->channels == 1) + par->channel_layout = AV_CH_LAYOUT_MONO; + else if (par->channels == 2) + par->channel_layout = AV_CH_LAYOUT_STEREO; + data_size = avio_rl32(pb); + st->duration = data_size / par->channels; + par->sample_rate = 22050; + par->block_align = 1; + + avpriv_set_pts_info(st, 64, 1, par->sample_rate); + + return 0; +} + +AVInputFormat ff_derf_demuxer = { + .name = "derf", + .long_name = NULL_IF_CONFIG_SMALL("Xilam DERF"), + .read_probe = derf_probe, + .read_header = derf_read_header, + .read_packet = ff_pcm_read_packet, + .read_seek = ff_pcm_read_seek, + .extensions = "adp", +}; From patchwork Mon Mar 16 10:30:48 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: 18242 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 60C1444A9BF for ; Mon, 16 Mar 2020 12:31:12 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4BEAE68B516; Mon, 16 Mar 2020 12:31:12 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A892168B51F for ; Mon, 16 Mar 2020 12:31:03 +0200 (EET) Received: by mail-wr1-f68.google.com with SMTP id d5so20167559wrc.2 for ; Mon, 16 Mar 2020 03:31:03 -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=mEcknqcLmGFt5RuJwuTHXDBg/6QkzpycFwH26IxS4bA=; b=BNmCzVOBfpHoqqZyLPP/Zhm1sRxUs3JBEdem6CCkDRjZb22sgLfMPJpWO6j6rTnCAK j1YfTbrNJHpX56amFz3CvLRx+aCdepWc+rBgIGwCwxURYKJsIhmHvah99cKDQBMW/t2Q 09HAoS1x59I6zAPQZ+XRzJFlgeQDNSgB/18b+4esSdRtwSsB6HmaEQo3JgL500XF4iQ3 hN2xsM+WHbunPfC2bFquwQQ1tV7v1kDLHT53vIe9ozkIZiwnwxPyRWSvIUz07aLWhN6q 7pqMcMAye0oThYm8ZpGPE0oe5Bz8vHE+vusMNE+IzAq854dONYitf3SxezOlMYt655n6 BY8A== 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=mEcknqcLmGFt5RuJwuTHXDBg/6QkzpycFwH26IxS4bA=; b=RCE9xlmaYW/eycCckIIhNHsgCX2F5/8yTpxXJZ2atEDShqp44g5xFeEI4Q/eIEsVQg cWIhSyD1ACcIKfBqWH9nyqU8kow42CYOQkhwxvtQ4PhEjXL0SNtnZEmNtX2p0Cyy35/v KT/2MuQcQsGH5eAMJs39Y1munLmdl0zGxCWV3Y7fv+Q6Zso9A9cNr7f0L88YOd30Gse5 WEbi17zIpi6tyI6E7Im5z39c5Igj58j6skjdaBpzSd0DWCwrFJSNMpw4JlWFbkF+NMUh V3203YcvKzgEV7Rx1w+2RkSNFY4fWz7C1/hPGOQck1TBXtUQ8FqXbLXqZkcT3zrAqfvZ ZcBA== X-Gm-Message-State: ANhLgQ0wyWboWySoPx1q5opWfWzkharIYHr4DoXKT7KSl3AhPqZslWUG f6hUpPximemgyQpQfuYMKtMxcfng X-Google-Smtp-Source: ADFU+vt5b8TQUR1enbs9jSupzMYOcdMavyq5oGeUwlYhpGf1bQ+XZAVevWXh+O7MHthJndLBGmKH8g== X-Received: by 2002:a5d:6082:: with SMTP id w2mr35394633wrt.300.1584354662890; Mon, 16 Mar 2020 03:31:02 -0700 (PDT) Received: from localhost.localdomain ([37.244.255.176]) by smtp.gmail.com with ESMTPSA id o4sm1504431wrp.84.2020.03.16.03.31.01 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Mar 2020 03:31:02 -0700 (PDT) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Mon, 16 Mar 2020 11:30:48 +0100 Message-Id: <20200316103050.22529-5-onemda@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200316103050.22529-1-onemda@gmail.com> References: <20200316103050.22529-1-onemda@gmail.com> Subject: [FFmpeg-devel] [PATCH 5/7] avcodec/allcodecs: move sdx2 to correct place 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/allcodecs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index 6046b15164..71e14c73e3 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -275,7 +275,6 @@ extern AVCodec ff_s302m_decoder; extern AVCodec ff_sanm_decoder; extern AVCodec ff_scpr_decoder; extern AVCodec ff_screenpresso_decoder; -extern AVCodec ff_sdx2_dpcm_decoder; extern AVCodec ff_sgi_encoder; extern AVCodec ff_sgi_decoder; extern AVCodec ff_sgirle_decoder; @@ -574,6 +573,7 @@ extern AVCodec ff_gremlin_dpcm_decoder; extern AVCodec ff_interplay_dpcm_decoder; extern AVCodec ff_roq_dpcm_encoder; extern AVCodec ff_roq_dpcm_decoder; +extern AVCodec ff_sdx2_dpcm_decoder; extern AVCodec ff_sol_dpcm_decoder; extern AVCodec ff_xan_dpcm_decoder; From patchwork Mon Mar 16 10:30:49 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: 18243 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 038BD44A9BF for ; Mon, 16 Mar 2020 12:31:14 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E096568B54A; Mon, 16 Mar 2020 12:31:13 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f43.google.com (mail-wm1-f43.google.com [209.85.128.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F2B7768B529 for ; Mon, 16 Mar 2020 12:31:05 +0200 (EET) Received: by mail-wm1-f43.google.com with SMTP id t13so11021676wmi.3 for ; Mon, 16 Mar 2020 03:31:05 -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=dplNWwt4RDfGb8yXzhMaNvl3VMxYKgEIMCs2kgDXJhQ=; b=hYwlglhaCIHgm7sBGSY4lEt7EcySFYOOTR/BCphQLpD0ASQMvacPGvHJtQOjn14Tnz W7k9spHa2Ix+IKDIh/w/XFbrgH5QR6K+Q8SENUEGIMxKUcIvJhYsxmdcr4GUYzN+mPJ/ lWTpPJ1SniVg+RVQ2c9bgdqqAFX9eq5jewctGPt9WiHGpHRz4T1I7gw6BFYSO9XM9fMo c8fYscdBF3vFcqGicJZSkYvtAhtH53jdzRWoK3ovfYEtv2EUScysBNH/iqbUEXGOYGu6 z52fvfJS1opcO6D/MF+azWID4+MRH6JUwPWDMLuaU3pqDvnoXzMhnErmWwJUsU1gptXC OuAg== 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=dplNWwt4RDfGb8yXzhMaNvl3VMxYKgEIMCs2kgDXJhQ=; b=Kbzgi/TvkXYQ8WZQMdIKDn8f6/5qkCzekeT+u+qejScpCOvSuPoQnAUU4R0PUhypWC X/uIOeIw5GUltcZ0K5leHdTIjzMbberBuLCnxuDjL6CMG4nRFwAe5oJzrOlvCZYn7ED1 3MyCBjH53p3vSltBpYMLZTYguZe9FYc/dEEltUeX7p/L4BoWsvJEHlPTJRumXUs67Tx6 8rCLuP/Arro5y1+CZJ292mDSoNqPF5vwwxN2cIZsWY96MQu2p3l2DLQWjvVHA2TwNH8D vAaQKVQ73Zs2DQVBIpWaoyxB4yBJ1tVCwsZZzP+mHE6T0SkVIIKZYVBdz7bI9Lj/cQcD jZFw== X-Gm-Message-State: ANhLgQ2xr/ICoPAYwx+kkrTnJm7xqZmhPW/geiahylwqjesiYzwfRe/u Gd492lFcgoTG3eFntcuB/9b70P7f X-Google-Smtp-Source: ADFU+vsQz3ULOiyn8skJ5omd1vvMD9WBGYooW6iK0xpEAFqYXQ+yDdl3jZx9NkHJoFFd2bE0dx9vsw== X-Received: by 2002:a7b:c456:: with SMTP id l22mr22109194wmi.184.1584354664350; Mon, 16 Mar 2020 03:31:04 -0700 (PDT) Received: from localhost.localdomain ([37.244.255.176]) by smtp.gmail.com with ESMTPSA id o4sm1504431wrp.84.2020.03.16.03.31.03 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Mar 2020 03:31:03 -0700 (PDT) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Mon, 16 Mar 2020 11:30:49 +0100 Message-Id: <20200316103050.22529-6-onemda@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200316103050.22529-1-onemda@gmail.com> References: <20200316103050.22529-1-onemda@gmail.com> Subject: [FFmpeg-devel] [PATCH 6/7] avcodec: add CRI HCA 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/allcodecs.c | 1 + libavcodec/avcodec.h | 1 + libavcodec/codec_desc.c | 7 + libavcodec/hca_data.h | 129 +++++++++++++++ libavcodec/hcadec.c | 349 ++++++++++++++++++++++++++++++++++++++++ 6 files changed, 488 insertions(+) create mode 100644 libavcodec/hca_data.h create mode 100644 libavcodec/hcadec.c diff --git a/libavcodec/Makefile b/libavcodec/Makefile index a88643b7d2..c1c9a44f2b 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -367,6 +367,7 @@ OBJS-$(CONFIG_H264_V4L2M2M_DECODER) += v4l2_m2m_dec.o OBJS-$(CONFIG_H264_V4L2M2M_ENCODER) += v4l2_m2m_enc.o OBJS-$(CONFIG_HAP_DECODER) += hapdec.o hap.o OBJS-$(CONFIG_HAP_ENCODER) += hapenc.o hap.o +OBJS-$(CONFIG_HCA_DECODER) += hcadec.o OBJS-$(CONFIG_HCOM_DECODER) += hcom.o OBJS-$(CONFIG_HEVC_DECODER) += hevcdec.o hevc_mvs.o \ hevc_cabac.o hevc_refs.o hevcpred.o \ diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index 71e14c73e3..b3184af954 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -432,6 +432,7 @@ extern AVCodec ff_g723_1_decoder; extern AVCodec ff_g729_decoder; extern AVCodec ff_gsm_decoder; extern AVCodec ff_gsm_ms_decoder; +extern AVCodec ff_hca_decoder; extern AVCodec ff_hcom_decoder; extern AVCodec ff_iac_decoder; extern AVCodec ff_ilbc_decoder; diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index e9c658fddc..6e03cb5902 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -668,6 +668,7 @@ enum AVCodecID { AV_CODEC_ID_ACELP_KELVIN, AV_CODEC_ID_MPEGH_3D_AUDIO, AV_CODEC_ID_SIREN, + AV_CODEC_ID_HCA, /* subtitle codecs */ AV_CODEC_ID_FIRST_SUBTITLE = 0x17000, ///< A dummy ID pointing at the start of subtitle codecs. diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c index 130e08c1f2..ece6eadae4 100644 --- a/libavcodec/codec_desc.c +++ b/libavcodec/codec_desc.c @@ -3079,6 +3079,13 @@ static const AVCodecDescriptor codec_descriptors[] = { .long_name = NULL_IF_CONFIG_SMALL("Siren"), .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY, }, + { + .id = AV_CODEC_ID_HCA, + .type = AVMEDIA_TYPE_AUDIO, + .name = "hca", + .long_name = NULL_IF_CONFIG_SMALL("CRI HCA"), + .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY, + }, /* subtitle codecs */ { diff --git a/libavcodec/hca_data.h b/libavcodec/hca_data.h new file mode 100644 index 0000000000..cf95f8a5f6 --- /dev/null +++ b/libavcodec/hca_data.h @@ -0,0 +1,129 @@ +/* + * 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 + */ + + +#ifndef AVCODEC_HCA_DATA_H +#define AVCODEC_HCA_DATA_H + +#include + +static const uint8_t max_bits_table[] = { + 0, 2, 3, 3, 4, 4, 4, 4, 5, 6, 7, 8, 9, 10, 11, 12, +}; + +static const uint8_t quant_spectrum_bits[] = +{ + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, + 1,1,2,2,0,0,0,0,0,0,0,0,0,0,0,0, + 2,2,2,2,2,2,3,3,0,0,0,0,0,0,0,0, + 2,2,3,3,3,3,3,3,0,0,0,0,0,0,0,0, + 3,3,3,3,3,3,3,3,3,3,3,3,3,3,4,4, + 3,3,3,3,3,3,3,3,3,3,4,4,4,4,4,4, + 3,3,3,3,3,3,4,4,4,4,4,4,4,4,4,4, + 3,3,4,4,4,4,4,4,4,4,4,4,4,4,4,4, +}; + +static const int8_t quant_spectrum_value[] = +{ + +0,+0,+0,+0,+0,+0,+0,+0,+0,+0,+0,+0,+0,+0,+0,+0, + +0,+0,+1,-1,+0,+0,+0,+0,+0,+0,+0,+0,+0,+0,+0,+0, + +0,+0,+1,+1,-1,-1,+2,-2,+0,+0,+0,+0,+0,+0,+0,+0, + +0,+0,+1,-1,+2,-2,+3,-3,+0,+0,+0,+0,+0,+0,+0,+0, + +0,+0,+1,+1,-1,-1,+2,+2,-2,-2,+3,+3,-3,-3,+4,-4, + +0,+0,+1,+1,-1,-1,+2,+2,-2,-2,+3,-3,+4,-4,+5,-5, + +0,+0,+1,+1,-1,-1,+2,-2,+3,-3,+4,-4,+5,-5,+6,-6, + +0,+0,+1,-1,+2,-2,+3,-3,+4,-4,+5,-5,+6,-6,+7,-7, +}; + +static const uint8_t scale_table[] = +{ + 14, 14, 14, 14, 14, 14, 13, 13, + 13, 13, 13, 13, 12, 12, 12, 12, + 12, 12, 11, 11, 11, 11, 11, 11, + 10, 10, 10, 10, 10, 10, 10, 9, + 9, 9, 9, 9, 9, 8, 8, 8, + 8, 8, 8, 7, 6, 6, 5, 4, + 4, 4, 3, 3, 3, 2, 2, 2, + 2, 0, 0, 0, 0, 0, 0, 0, +}; + +static const float window[128] = +{ + 0.000690534, 0.00197623, 0.00367386, 0.00572424, 0.0080967, 0.0107732, 0.0137425, 0.0169979, + 0.0205353, 0.0243529, 0.0284505, 0.0328291, 0.0374906, 0.0424379, 0.0476744, 0.0532043, + 0.0590321, 0.0651629, 0.071602, 0.0783552, 0.0854285, 0.092828, 0.10056, 0.108631, + 0.117048, 0.125817, 0.134944, 0.144437, 0.1543, 0.164539, 0.175161, 0.186169, + 0.197569, 0.209363, 0.221555, 0.234145, 0.247136, 0.260526, 0.274313, 0.288493, + 0.303062, 0.318012, 0.333333, 0.349015, 0.365044, 0.381403, 0.398073, 0.415034, + 0.43226, 0.449725, 0.4674, 0.485251, 0.503245, 0.521344, 0.539509, 0.557698, + 0.575869, 0.593978, 0.611981, 0.629831, 0.647486, 0.6649, 0.682031, 0.698838, + 0.71528, 0.731323, 0.746932, 0.762077, 0.776732, 0.790873, 0.804481, 0.817542, + 0.830044, 0.84198, 0.853347, 0.864144, 0.874375, 0.884046, 0.893167, 0.901749, + 0.909806, 0.917354, 0.924409, 0.93099, 0.937117, 0.942809, 0.948087, 0.952971, + 0.957482, 0.961641, 0.965467, 0.968981, 0.972202, 0.975148, 0.977838, 0.980289, + 0.982518, 0.98454, 0.986371, 0.988024, 0.989514, 0.990853, 0.992053, 0.993126, + 0.994082, 0.994931, 0.995682, 0.996344, 0.996926, 0.997433, 0.997875, 0.998256, + 0.998584, 0.998863, 0.999099, 0.999297, 0.999461, 0.999595, 0.999703, 0.999789, + 0.999856, 0.999906, 0.999942, 0.999967, 0.999984, 0.999993, 0.999998, 1.0, +}; + +static const float intensity_ratio_table[] = +{ + 2.0, 1.85714, 1.71429, 1.57143, 1.42857, 1.28571, 1.14286, 1.0, + 0.857143, 0.714286, 0.571429, 0.428571, 0.285714, 0.142857, 0.0, 0.0, + 0, 1.87066e-08, 2.49253e-08, 3.32113e-08, 4.42518e-08, 5.89626e-08, 7.85637e-08, 1.04681e-07, + 1.3948e-07, 1.85848e-07, 2.4763e-07, 3.2995e-07, 4.39636e-07, 5.85785e-07, 7.80519e-07, 1.03999e-06, + 1.38572e-06, 1.84637e-06, 2.46017e-06, 3.27801e-06, 4.36772e-06, 5.8197e-06, 7.75435e-06, 1.03321e-05, + 1.37669e-05, 1.83435e-05, 2.44414e-05, 3.25665e-05, 4.33927e-05, 5.78179e-05, 7.70384e-05, 0.000102648, + 0.000136772, 0.00018224, 0.000242822, 0.000323544, 0.000431101, 0.000574413, 0.000765366, 0.0010198, + 0.00135881, 0.00181053, 0.0024124, 0.00321437, 0.00428293, 0.00570671, 0.00760381, 0.0101316, + 0.0134996, 0.0179873, 0.0239669, 0.0319343, 0.0425503, 0.0566954, 0.0755428, 0.100656, + 0.134117, 0.178702, 0.238108, 0.317263, 0.422731, 0.563261, 0.750507, 0.0, +}; + +static const float scale_conversion_table[] = +{ + 1.0, 1.33243, 1.77538, 2.36557, 3.15196, 4.19978, 5.59592, 7.45618, + 9.93486, 13.2375, 17.6381, 23.5016, 31.3143, 41.7242, 55.5947, 74.0762, + 98.7015, 131.513, 175.232, 233.485, 311.103, 414.524, 552.326, 735.937, + 980.586, 1306.56, 1740.91, 2319.64, 3090.77, 4118.24, 5487.28, 7311.43, + 9741.98, 12980.5, 17295.7, 23045.3, 30706.4, 40914.2, 54515.4, 72638, + 96785.3, 128960, 171830, 228952, 305064, 406477, 541603, 721649, + 961548, 1.2812e+06, 1.70711e+06, 2.27461e+06, 3.03076e+06, 4.03829e+06, 5.38075e+06, 7.16948e+06, + 9.55285e+06, 1.27285e+07, 1.69599e+07, 2.25979e+07, 3.01102e+07, 4.01198e+07, 5.3457e+07, 0, +}; + +static const float dequantizer_scaling_table[] = +{ + 1.58838e-07, 2.11641e-07, 2.81998e-07, 3.75743e-07, 5.00652e-07, 6.67085e-07, 8.88846e-07, 1.18433e-06, + 1.57804e-06, 2.10263e-06, 2.80161e-06, 3.73296e-06, 4.97391e-06, 6.6274e-06, 8.83057e-06, 1.17661e-05, + 1.56776e-05, 2.08893e-05, 2.78336e-05, 3.70864e-05, 4.94151e-05, 6.58423e-05, 8.77305e-05, 0.000116895, + 0.000155755, 0.000207533, 0.000276523, 0.000368448, 0.000490933, 0.000654135, 0.00087159, 0.00116134, + 0.0015474, 0.00206181, 0.00274722, 0.00366048, 0.00487735, 0.00649874, 0.00865913, 0.0115377, + 0.0153732, 0.0204838, 0.0272932, 0.0363664, 0.0484558, 0.0645641, 0.0860272, 0.114626, + 0.152731, 0.203503, 0.271155, 0.361295, 0.481401, 0.641435, 0.854669, 1.13879, + 1.51736, 2.02178, 2.69388, 3.58942, 4.78266, 6.37257, 8.49102, 11.3137, +}; + +static const float quant_step_size[] = +{ + 0.0, 0.666667, 0.4, 0.285714, 0.222222, 0.181818, 0.153846, 0.133333, 0.0645161, + 0.031746, 0.015748, 0.00784314, 0.00391389, 0.00195503, 0.00097704, 0.000488401, +}; + +#endif /* AVCODEC_HCA_DATA_H */ diff --git a/libavcodec/hcadec.c b/libavcodec/hcadec.c new file mode 100644 index 0000000000..e737edde79 --- /dev/null +++ b/libavcodec/hcadec.c @@ -0,0 +1,349 @@ +/* + * 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/crc.h" +#include "libavutil/float_dsp.h" +#include "libavutil/intreadwrite.h" +#include "libavutil/tx.h" + +#include "avcodec.h" +#include "get_bits.h" +#include "internal.h" +#include "hca_data.h" + +typedef struct ChannelContext { + float base[128]; + DECLARE_ALIGNED(32, float, imdct_in)[128]; + DECLARE_ALIGNED(32, float, imdct_out)[128]; + DECLARE_ALIGNED(32, float, imdct_prev)[128]; + int8_t scale_factors[128]; + uint8_t scale[128]; + int8_t intensity[8]; + int8_t *hfr_scale; + unsigned count; + int chan_type; +} ChannelContext; + +typedef struct HCAContext { + GetBitContext gb; + + const AVCRC *crc_table; + + ChannelContext ch[16]; + + uint8_t ath[128]; + + int hfr_group_count; + uint8_t track_count; + uint8_t channel_config; + uint8_t total_band_count; + uint8_t base_band_count; + uint8_t stereo_band_count; + uint8_t bands_per_hfr_group; + + av_tx_fn tx_fn; + AVTXContext *tx_ctx; + AVFloatDSPContext *fdsp; +} HCAContext; + +static inline unsigned ceil2(unsigned a, unsigned b) +{ + return (b > 0) ? (a / b + ((a % b) ? 1 : 0)) : 0; +} + +static av_cold int decode_init(AVCodecContext *avctx) +{ + HCAContext *c = avctx->priv_data; + int8_t r[16] = { 0 }; + float scale = 1.f / 8.f; + unsigned b; + + avctx->sample_fmt = AV_SAMPLE_FMT_FLTP; + c->crc_table = av_crc_get_table(AV_CRC_16_ANSI); + + if (avctx->extradata_size < 12) + return AVERROR(EINVAL); + + if (avctx->channels <= 0 || avctx->channels > 16) + return AVERROR(EINVAL); + + if (avctx->extradata[0] != 1 || avctx->extradata[1] != 15 || !avctx->extradata[2]) + return AVERROR(EINVAL); + + c->track_count = avctx->extradata[2]; + c->channel_config = avctx->extradata[3]; + c->total_band_count = avctx->extradata[4]; + c->base_band_count = avctx->extradata[5]; + c->stereo_band_count = avctx->extradata[6]; + c->bands_per_hfr_group = avctx->extradata[7]; + + b = avctx->channels / c->track_count; + if (c->stereo_band_count && b > 1) { + int8_t *x = r; + + for (int i = 0; i < c->track_count; i++, x+=b) { + switch (b) { + case 2: + case 3: + x[0] = 1; + x[1] = 2; + break; + case 4: + x[0]=1; x[1] = 2; + if (c->channel_config == 0) { + x[2]=1; + x[3]=2; + } + break; + case 5: + x[0]=1; x[1] = 2; + if (c->channel_config <= 2) { + x[3]=1; + x[4]=2; + } + break; + case 6: + case 7: + x[0] = 1; x[1] = 2; x[4] = 1; x[5] = 2; + break; + case 8: + x[0] = 1; x[1] = 2; x[4] = 1; x[5] = 2; x[6] = 1; x[7] = 2; + break; + } + } + } + + for (int i = 0; i < avctx->channels; i++) { + c->ch[i].chan_type = r[i]; + c->ch[i].count = c->base_band_count + ((r[i] != 2) ? c->stereo_band_count : 0); + c->ch[i].hfr_scale = &c->ch[i].scale_factors[c->base_band_count + c->stereo_band_count]; + } + + c->hfr_group_count = ceil2(c->total_band_count - (c->base_band_count + c->stereo_band_count), c->bands_per_hfr_group); + + c->fdsp = avpriv_float_dsp_alloc(avctx->flags & AV_CODEC_FLAG_BITEXACT); + if (!c->fdsp) + return AVERROR(ENOMEM); + + return av_tx_init(&c->tx_ctx, &c->tx_fn, AV_TX_FLOAT_MDCT, 1, 128, &scale, 0); +} + +static void run_imdct(HCAContext *c, ChannelContext *ch, int index, float *out) +{ + c->tx_fn(c->tx_ctx, ch->imdct_out, ch->imdct_in, sizeof(float)); + + c->fdsp->vector_fmul_window(out, ch->imdct_prev + (128 >> 1), + ch->imdct_out, window, 128 >> 1); + + memcpy(ch->imdct_prev, ch->imdct_out, 128 * sizeof(float)); +} + +static void apply_intensity_stereo(HCAContext *s, ChannelContext *ch, ChannelContext *ch2, + int index, unsigned band_count, unsigned base_band_count, + unsigned stereo_band_count) +{ + float ratio_l = intensity_ratio_table[ch->intensity[index]]; + float ratio_r = ratio_l - 2.0f; + float *c1 = &ch->imdct_in[base_band_count]; + float *c2 = &ch2->imdct_in[base_band_count]; + + if (ch->chan_type != 1 || !stereo_band_count) + return; + + for (int i = 0; i < band_count; i++) { + *(c2++) = *c1 * ratio_r; + *(c1++) *= ratio_l; + } +} + +static void reconstruct_hfr(HCAContext *s, ChannelContext *ch, + unsigned hfr_group_count, + unsigned bands_per_hfr_group, + unsigned start_band, unsigned total_band_count) +{ + if (ch->chan_type == 2 || !bands_per_hfr_group) + return; + + for (int i = 0, k = start_band, l = start_band - 1; i < hfr_group_count; i++){ + for (int j = 0; j < bands_per_hfr_group && k < total_band_count; j++, k++, l--){ + ch->imdct_in[k] = scale_conversion_table[ch->hfr_scale[i] - ch->scale_factors[l]] * ch->imdct_in[l]; + } + } + + ch->imdct_in[127] = 0; +} + +static void dequantize_coefficients(HCAContext *c, ChannelContext *ch) +{ + GetBitContext *gb = &c->gb; + + for (int i = 0; i < ch->count; i++) { + unsigned scale = ch->scale[i]; + int nb_bits = max_bits_table[scale]; + int value = get_bitsz(gb, nb_bits); + float factor; + + if (scale > 7) { + value = (1 - ((value & 1) << 1)) * (value >> 1); + if (!value) + skip_bits_long(gb, -1); + factor = value; + } else { + value += scale << 4; + skip_bits_long(gb, quant_spectrum_bits[value] - nb_bits); + factor = quant_spectrum_value[value]; + } + ch->imdct_in[i] = factor * ch->base[i]; + } + + memset(ch->imdct_in + ch->count, 0, sizeof(ch->imdct_in) - ch->count * sizeof(ch->imdct_in[0])); +} + +static void unpack(HCAContext *c, ChannelContext *ch, + unsigned hfr_group_count, int packed_noise_level, const uint8_t *ath) +{ + GetBitContext *gb = &c->gb; + int delta_bits = get_bits(gb, 3); + + if (delta_bits > 5) { + for (int i = 0; i < ch->count; i++) + ch->scale_factors[i] = get_bits(gb, 6); + } else if (delta_bits) { + int factor = get_bits(gb, 6); + int max_value = (1 << delta_bits) - 1; + int half_max = max_value >> 1; + + ch->scale_factors[0] = factor; + for (int i = 1; i < ch->count; i++){ + int delta = get_bits(gb, delta_bits); + + if (delta == max_value) { + factor = get_bits(gb, 6); + } else { + factor += delta - half_max; + } + + ch->scale_factors[i] = factor; + } + } else { + memset(ch->scale_factors, 0, 128); + } + + if (ch->chan_type == 2){ + ch->intensity[0] = get_bits(gb, 4); + if (ch->intensity[0] < 15) { + for (int i = 1; i < 8; i++) + ch->intensity[i] = get_bits(gb, 4); + } + } else { + for (int i = 0; i < hfr_group_count; i++) + ch->hfr_scale[i] = get_bits(gb, 6); + } + + for (int i = 0; i < ch->count; i++) { + int scale = ch->scale_factors[i]; + + if (scale) { + scale = c->ath[i] + ((packed_noise_level + i) >> 8) - ((scale * 5) >> 1) + 1; + if (scale < 0) { + scale = 15; + } else if (scale > 56) { + scale = 1; + } else { + scale = scale_table[scale]; + } + } + ch->scale[i] = scale; + } + + memset(ch->scale + ch->count, 0, sizeof(ch->scale) - ch->count); + + for (int i = 0; i < ch->count; i++) + ch->base[i] = dequantizer_scaling_table[ch->scale_factors[i]] * quant_step_size[ch->scale[i]]; +} + +static int decode_frame(AVCodecContext *avctx, void *data, + int *got_frame_ptr, AVPacket *avpkt) +{ + AVFrame *frame = data; + HCAContext *c = avctx->priv_data; + int ch, ret, packed_noise_level; + GetBitContext *gb = &c->gb; + float **samples; + + if (av_crc(c->crc_table, 0, avpkt->data, avpkt->size)) + return AVERROR_INVALIDDATA; + + frame->nb_samples = 1024; + if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) + return ret; + samples = (float **)frame->extended_data; + + if ((ret = init_get_bits8(gb, avpkt->data, avpkt->size)) < 0) + return ret; + + if (get_bits(gb, 16) != 0xFFFF) + return AVERROR_INVALIDDATA; + + packed_noise_level = (get_bits(gb, 9) << 8) - get_bits(gb, 7); + + for (ch = 0; ch < avctx->channels; ch++) + unpack(c, &c->ch[ch], c->hfr_group_count, packed_noise_level, c->ath); + + for (int i = 0; i < 8; i++) { + for (ch = 0; ch < avctx->channels; ch++) + dequantize_coefficients(c, &c->ch[ch]); + for (ch = 0; ch < avctx->channels; ch++) + reconstruct_hfr(c, &c->ch[ch], c->hfr_group_count, c->bands_per_hfr_group, + c->stereo_band_count + c->base_band_count, c->total_band_count); + for (ch = 0; ch < avctx->channels - 1; ch++) + apply_intensity_stereo(c, &c->ch[ch], &c->ch[ch+1], i, + c->total_band_count - c->base_band_count, + c->base_band_count, c->stereo_band_count); + for (ch = 0; ch < avctx->channels; ch++) + run_imdct(c, &c->ch[ch], i, samples[ch] + i * 128); + } + + *got_frame_ptr = 1; + + return avpkt->size; +} + +static av_cold int decode_close(AVCodecContext *avctx) +{ + HCAContext *c = avctx->priv_data; + + av_freep(&c->fdsp); + av_tx_uninit(&c->tx_ctx); + + return 0; +} + +AVCodec ff_hca_decoder = { + .name = "hca", + .long_name = NULL_IF_CONFIG_SMALL("CRI HCA"), + .type = AVMEDIA_TYPE_AUDIO, + .id = AV_CODEC_ID_HCA, + .priv_data_size = sizeof(HCAContext), + .init = decode_init, + .decode = decode_frame, + .close = decode_close, + .capabilities = AV_CODEC_CAP_DR1, + .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP, + AV_SAMPLE_FMT_NONE }, +}; From patchwork Mon Mar 16 10:30:50 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: 18244 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 D45F644A9BF for ; Mon, 16 Mar 2020 12:31:14 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BE2BF68B534; Mon, 16 Mar 2020 12:31:14 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5F88B68B535 for ; Mon, 16 Mar 2020 12:31:06 +0200 (EET) Received: by mail-wm1-f65.google.com with SMTP id a141so17368830wme.2 for ; Mon, 16 Mar 2020 03:31:06 -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=w1vF6zwuSbvov9HDR7+DNTgCmPG4UPnFPqQP1eFJozY=; b=cLHQyNSGBBepS0extSVYlnK4FXsck84/FdTzhpMxL4jaKBMFe74zZIob/fnPGRdHa3 PVWlpciF3lJbZjFgu8dgZMEfnet+1idX8f3qIX8t2P7AIXlefQbdl6RnYUEs/EJgmkdA 8AwRnwWpZzPYDE85wL7LRow/SY3PcDafBPWPjP0vXvdknkKUIO5G6E1LfqLhaRMi5GCy 3fsjZgo05W3ymMEVtM5BrXl0MO9cR44H62nirbdVF5VGXA6gBmxB+vCabZ3ha+o7RHJO rv4bkvbSWSQvG473xaNmorQLkMLVh1XGw7nCB9lajWQYxD9yILrvdoAIoszlwtWhN52e fChg== 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=w1vF6zwuSbvov9HDR7+DNTgCmPG4UPnFPqQP1eFJozY=; b=fMnqy80H5m/+zdJdqWOfqsh5tk51Wwiq7fHYYUz4ic4Aow0awB+Y+PVS4V+DUOLHFo SpOdyhnzjuO5dI4X8YRUkiz1jhVNTGfl1zf0x0Q0LIR48ziRcSrmHK9IaWkzxv496L1q 4v8grf6thE1fXJK6IY6ojK1RRiDU4Em7ezkqcYOjTEPSFY599fRIpTvSLQwltEuRfK1H gbY2ukip+JiCK8pKjUfo7CeGK8yxTTIyq5/R69NNVf1s3Kj1A8IiuhKyaoNPRDxAYGiP 32afACtFxp57/rgjamXZuGuQRBl6+ZRUXCadFyfzMJ2Zbh4By8/LUw/fpcF22PHBEm8W ZWgA== X-Gm-Message-State: ANhLgQ0AU57EVDYAJZdlXQeFm179zpUYWFz15gBKLJ9VkOkV+yvXJKXJ +Fv4u22AwaX8Gqh8u3uJ5VBdGwDT X-Google-Smtp-Source: ADFU+vsI+Gq0fXgucT7dc/0uLA2+021V/CFqtWS/+IN89NnWgxSjNXbJ4a+Dtxgz1EsWqeKJlVVWDw== X-Received: by 2002:a1c:196:: with SMTP id 144mr27832108wmb.100.1584354665383; Mon, 16 Mar 2020 03:31:05 -0700 (PDT) Received: from localhost.localdomain ([37.244.255.176]) by smtp.gmail.com with ESMTPSA id o4sm1504431wrp.84.2020.03.16.03.31.04 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Mar 2020 03:31:04 -0700 (PDT) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Mon, 16 Mar 2020 11:30:50 +0100 Message-Id: <20200316103050.22529-7-onemda@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200316103050.22529-1-onemda@gmail.com> References: <20200316103050.22529-1-onemda@gmail.com> Subject: [FFmpeg-devel] [PATCH 7/7] avformat: add hca 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/hca.c | 148 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 150 insertions(+) create mode 100644 libavformat/hca.c diff --git a/libavformat/Makefile b/libavformat/Makefile index 27615cd746..5196f998ed 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -224,6 +224,7 @@ OBJS-$(CONFIG_H263_MUXER) += rawenc.o OBJS-$(CONFIG_H264_DEMUXER) += h264dec.o rawdec.o OBJS-$(CONFIG_H264_MUXER) += rawenc.o OBJS-$(CONFIG_HASH_MUXER) += hashenc.o +OBJS-$(CONFIG_HCA_DEMUXER) += hca.o OBJS-$(CONFIG_HCOM_DEMUXER) += hcom.o pcm.o OBJS-$(CONFIG_HDS_MUXER) += hdsenc.o OBJS-$(CONFIG_HEVC_DEMUXER) += hevcdec.o rawdec.o diff --git a/libavformat/allformats.c b/libavformat/allformats.c index af10def88b..39d2c352f5 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -182,6 +182,7 @@ extern AVOutputFormat ff_h263_muxer; extern AVInputFormat ff_h264_demuxer; extern AVOutputFormat ff_h264_muxer; extern AVOutputFormat ff_hash_muxer; +extern AVInputFormat ff_hca_demuxer; extern AVInputFormat ff_hcom_demuxer; extern AVOutputFormat ff_hds_muxer; extern AVInputFormat ff_hevc_demuxer; diff --git a/libavformat/hca.c b/libavformat/hca.c new file mode 100644 index 0000000000..58575356aa --- /dev/null +++ b/libavformat/hca.c @@ -0,0 +1,148 @@ +/* + * HCA 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 "avformat.h" +#include "internal.h" + +static int hca_probe(const AVProbeData *p) +{ + if (AV_RL32(p->buf) != MKTAG('H', 'C', 'A', 0)) + return 0; + + if (AV_RL32(p->buf + 8) != MKTAG('f', 'm', 't', 0)) + return 0; + + return AVPROBE_SCORE_MAX / 3; +} + +static int hca_read_header(AVFormatContext *s) +{ + AVCodecParameters *par; + AVIOContext *pb = s->pb; + AVStream *st; + uint32_t chunk; + uint16_t version; + uint32_t block_count; + uint16_t block_size; + int ret, ath_type; + + avio_skip(pb, 4); + version = avio_rb16(pb); + ath_type = version < 0x200 ? 1 : 0; + s->internal->data_offset = avio_rb16(pb); + + if (avio_rl32(pb) != MKTAG('f', 'm', 't', 0)) + return AVERROR_INVALIDDATA; + + st = avformat_new_stream(s, NULL); + if (!st) + return AVERROR(ENOMEM); + + par = st->codecpar; + par->codec_type = AVMEDIA_TYPE_AUDIO; + par->codec_id = AV_CODEC_ID_HCA; + par->codec_tag = 0; + par->channels = avio_r8(pb); + par->sample_rate = avio_rb24(pb); + block_count = avio_rb32(pb); + avio_skip(pb, 4); + ret = ff_alloc_extradata(par, 12); + if (ret < 0) + return ret; + memset(par->extradata, 0, 12); + + chunk = avio_rl32(pb); + if (chunk == MKTAG('c', 'o', 'm', 'p')) { + block_size = avio_rb16(pb); + avio_read(pb, par->extradata, 8); + avio_skip(pb, 2); + } else if (chunk == MKTAG('d', 'e', 'c', 0)) { + int count1, count2, count3, enable; + + block_size = avio_rb16(pb); + par->extradata[0] = avio_r8(pb); + par->extradata[1] = avio_r8(pb); + count1 = avio_r8(pb); + count2 = avio_r8(pb); + count3 = avio_r8(pb); + enable = avio_r8(pb); + par->extradata[2] = FFMAX(count3 >> 4, 1); + par->extradata[3] = count3 & 0xf; + par->extradata[4] = count1 + 1; + par->extradata[5] = (enable ? count2 : count1) + 1; + par->extradata[6] = par->extradata[4] - par->extradata[5]; + } else { + return AVERROR_INVALIDDATA; + } + + if (block_size < 8) { + return AVERROR_INVALIDDATA; + } + par->block_align = block_size; + st->duration = 1024 * block_count; + + while (avio_tell(pb) < s->internal->data_offset && !avio_feof(pb)) { + chunk = avio_rl32(pb) & 0x7f7f7f7f; + + if (chunk == MKTAG('v', 'b', 'r', 0)) { + avio_skip(pb, 4); + } else if (chunk == MKTAG('a', 't', 'h', 0)) { + ath_type = avio_rb16(pb); + } else if (chunk == MKTAG('l', 'o', 'o', 'p')) { + avio_skip(pb, 12); + } else if (chunk == MKTAG('c', 'i', 'p', 'h')) { + par->extradata[8] = avio_r8(pb); + par->extradata[9] = avio_r8(pb); + } else if (chunk == MKTAG('r', 'v', 'a', 0)) { + avio_skip(pb, 4); + } else if (chunk == MKTAG('c', 'o', 'm', 'm')) { + avio_skip(pb, avio_r8(pb)); + } else if (chunk == MKTAG('p', 'a', 'd', 0)) { + break; + } + } + + avio_seek(pb, s->internal->data_offset, SEEK_SET); + avpriv_set_pts_info(st, 64, 1, par->sample_rate); + + return 0; +} + +static int hca_read_packet(AVFormatContext *s, AVPacket *pkt) +{ + AVCodecContext *codec = s->streams[0]->codec; + int ret; + + ret = av_get_packet(s->pb, pkt, codec->block_align); + pkt->duration = 1024; + return ret; +} + +AVInputFormat ff_hca_demuxer = { + .name = "hca", + .long_name = NULL_IF_CONFIG_SMALL("CRI HCA"), + .read_probe = hca_probe, + .read_header = hca_read_header, + .read_packet = hca_read_packet, + .extensions = "hca", + .flags = AVFMT_GENERIC_INDEX, +};