From patchwork Tue Jun 9 00:19:28 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zane van Iperen X-Patchwork-Id: 20225 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 59DB044AA97 for ; Tue, 9 Jun 2020 03:19:37 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 45D9568B330; Tue, 9 Jun 2020 03:19:37 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-40134.protonmail.ch (mail-40134.protonmail.ch [185.70.40.134]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D789168B32B for ; Tue, 9 Jun 2020 03:19:30 +0300 (EEST) Date: Tue, 09 Jun 2020 00:19:28 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zanevaniperen.com; s=protonmail; t=1591661969; bh=n8eAZM0lTCfwaEpcFT7Zk9oT7yEVzwlYC+1D2qWLo+I=; h=Date:To:From:Cc:Reply-To:Subject:In-Reply-To:References:From; b=TPnArk6Gbf7bR73MFEsKWo6NWR0QkaLwH03mY+cDeesbOnTFykE5exWrXxVDozLZu lDvBHLzbJdTf/DnyUQ4An5jWa8qBZQPeJZCEhUv4yPLCYm1/2imKpUmmvazNuIdLGg RwXqaT53/FaWnEPmWY9PV2A50DW97vK9fWvv82eI= To: ffmpeg-devel@ffmpeg.org From: Zane van Iperen Message-ID: <20200609001730.961175-2-zane@zanevaniperen.com> In-Reply-To: <20200609001730.961175-1-zane@zanevaniperen.com> References: <20200609001730.961175-1-zane@zanevaniperen.com> MIME-Version: 1.0 X-Spam-Status: No, score=-1.2 required=7.0 tests=ALL_TRUSTED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF shortcircuit=no autolearn=disabled version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on mail.protonmail.ch Subject: [FFmpeg-devel] [PATCH 1/7] avformat/apm: prepare extradata handling for muxer 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 Cc: Zane van Iperen Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Zane van Iperen --- libavformat/Makefile | 2 +- libavformat/apm.c | 131 +++++++++++++++++++++++-------------------- 2 files changed, 71 insertions(+), 62 deletions(-) diff --git a/libavformat/Makefile b/libavformat/Makefile index 0658fa3710..bb09dc6563 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -93,7 +93,7 @@ OBJS-$(CONFIG_AMRWB_DEMUXER) += amr.o OBJS-$(CONFIG_ANM_DEMUXER) += anm.o OBJS-$(CONFIG_APC_DEMUXER) += apc.o OBJS-$(CONFIG_APE_DEMUXER) += ape.o apetag.o img2.o -OBJS-$(CONFIG_APM_DEMUXER) += apm.o riffdec.o +OBJS-$(CONFIG_APM_DEMUXER) += apm.o OBJS-$(CONFIG_APNG_DEMUXER) += apngdec.o OBJS-$(CONFIG_APNG_MUXER) += apngenc.o OBJS-$(CONFIG_APTX_DEMUXER) += aptxdec.o rawdec.o diff --git a/libavformat/apm.c b/libavformat/apm.c index 9d2a856cc4..16ac6a2b1a 100644 --- a/libavformat/apm.c +++ b/libavformat/apm.c @@ -21,13 +21,15 @@ */ #include "avformat.h" #include "internal.h" -#include "riff.h" #include "libavutil/internal.h" #include "libavutil/intreadwrite.h" -#define APM_FILE_HEADER_SIZE 20 -#define APM_VS12_CHUNK_SIZE 76 +#define APM_FILE_HEADER_SIZE 18 +#define APM_FILE_EXTRADATA_SIZE 80 +#define APM_EXTRADATA_SIZE 28 + #define APM_MAX_READ_SIZE 4096 +#define APM_CODEC_TAG 0x2000 #define APM_TAG_VS12 MKTAG('v', 's', '1', '2') #define APM_TAG_DATA MKTAG('D', 'A', 'T', 'A') @@ -42,34 +44,37 @@ typedef struct APMState { int32_t saved_l; } APMState; -typedef struct APMVS12Chunk { +typedef struct APMExtraData { uint32_t magic; uint32_t file_size; uint32_t data_size; uint32_t unk1; uint32_t unk2; APMState state; - uint32_t pad[7]; -} APMVS12Chunk; + uint32_t unk3[7]; + uint32_t data; +} APMExtraData; -static void apm_parse_vs12(APMVS12Chunk *vs12, const uint8_t *buf) +static void apm_parse_extradata(APMExtraData *ed, const uint8_t *buf) { - vs12->magic = AV_RL32(buf + 0); - vs12->file_size = AV_RL32(buf + 4); - vs12->data_size = AV_RL32(buf + 8); - vs12->unk1 = AV_RL32(buf + 12); - vs12->unk2 = AV_RL32(buf + 16); - - vs12->state.has_saved = AV_RL32(buf + 20); - vs12->state.predictor_r = AV_RL32(buf + 24); - vs12->state.step_index_r = AV_RL32(buf + 28); - vs12->state.saved_r = AV_RL32(buf + 32); - vs12->state.predictor_l = AV_RL32(buf + 36); - vs12->state.step_index_l = AV_RL32(buf + 40); - vs12->state.saved_l = AV_RL32(buf + 44); - - for (int i = 0; i < FF_ARRAY_ELEMS(vs12->pad); i++) - vs12->pad[i] = AV_RL32(buf + 48 + (i * 4)); + ed->magic = AV_RL32(buf + 0); + ed->file_size = AV_RL32(buf + 4); + ed->data_size = AV_RL32(buf + 8); + ed->unk1 = AV_RL32(buf + 12); + ed->unk2 = AV_RL32(buf + 16); + + ed->state.has_saved = AV_RL32(buf + 20); + ed->state.predictor_r = AV_RL32(buf + 24); + ed->state.step_index_r = AV_RL32(buf + 28); + ed->state.saved_r = AV_RL32(buf + 32); + ed->state.predictor_l = AV_RL32(buf + 36); + ed->state.step_index_l = AV_RL32(buf + 40); + ed->state.saved_l = AV_RL32(buf + 44); + + for (int i = 0; i < FF_ARRAY_ELEMS(ed->unk3); i++) + ed->unk3[i] = AV_RL32(buf + 48 + (i * 4)); + + ed->data = AV_RL32(buf + 76); } static int apm_probe(const AVProbeData *p) @@ -90,71 +95,75 @@ static int apm_read_header(AVFormatContext *s) { int64_t ret; AVStream *st; - APMVS12Chunk vs12; - uint8_t buf[APM_VS12_CHUNK_SIZE]; + APMExtraData extradata; + AVCodecParameters *par; + uint8_t buf[APM_FILE_EXTRADATA_SIZE]; if (!(st = avformat_new_stream(s, NULL))) return AVERROR(ENOMEM); - /* The header starts with a WAVEFORMATEX */ - if ((ret = ff_get_wav_header(s, s->pb, st->codecpar, APM_FILE_HEADER_SIZE, 0)) < 0) - return ret; - - if (st->codecpar->bits_per_coded_sample != 4) + /* + * This is 98% a WAVEFORMATEX, but there's something screwy with the extradata + * that ff_get_wav_header() can't (and shouldn't) handle properly. + */ + if (avio_rl16(s->pb) != APM_CODEC_TAG) return AVERROR_INVALIDDATA; - if (st->codecpar->codec_tag != 0x2000) + par = st->codecpar; + par->channels = avio_rl16(s->pb); + par->sample_rate = avio_rl32(s->pb); + par->bit_rate = avio_rl32(s->pb) * 8; + par->block_align = avio_rl16(s->pb); + par->bits_per_coded_sample = avio_rl16(s->pb); + + if (avio_rl16(s->pb) != APM_FILE_EXTRADATA_SIZE) return AVERROR_INVALIDDATA; - /* ff_get_wav_header() does most of the work, but we need to fix a few things. */ - st->codecpar->codec_id = AV_CODEC_ID_ADPCM_IMA_APM; - st->codecpar->codec_tag = 0; + if (par->bits_per_coded_sample != 4) + return AVERROR_INVALIDDATA; - if (st->codecpar->channels == 2) - st->codecpar->channel_layout = AV_CH_LAYOUT_STEREO; - else if (st->codecpar->channels == 1) - st->codecpar->channel_layout = AV_CH_LAYOUT_MONO; + if (par->channels == 2) + par->channel_layout = AV_CH_LAYOUT_STEREO; + else if (par->channels == 1) + par->channel_layout = AV_CH_LAYOUT_MONO; else return AVERROR_INVALIDDATA; - st->codecpar->format = AV_SAMPLE_FMT_S16; - st->codecpar->bits_per_raw_sample = 16; - st->codecpar->bit_rate = st->codecpar->channels * - st->codecpar->sample_rate * - st->codecpar->bits_per_coded_sample; + par->codec_type = AVMEDIA_TYPE_AUDIO; + par->codec_id = AV_CODEC_ID_ADPCM_IMA_APM; + par->format = AV_SAMPLE_FMT_S16; + par->bits_per_raw_sample = 16; + + /* Now skip the pad that ruins everything. */ + if ((ret = avio_skip(s->pb, 2)) < 0) + return ret; - if ((ret = avio_read(s->pb, buf, APM_VS12_CHUNK_SIZE)) < 0) + if ((ret = avio_read(s->pb, buf, APM_FILE_EXTRADATA_SIZE)) < 0) return ret; - else if (ret != APM_VS12_CHUNK_SIZE) + else if (ret != APM_FILE_EXTRADATA_SIZE) return AVERROR(EIO); - apm_parse_vs12(&vs12, buf); + apm_parse_extradata(&extradata, buf); - if (vs12.magic != APM_TAG_VS12) { + if (extradata.magic != APM_TAG_VS12 || extradata.data != APM_TAG_DATA) return AVERROR_INVALIDDATA; - } - if (vs12.state.has_saved) { + if (extradata.state.has_saved) { avpriv_request_sample(s, "Saved Samples"); return AVERROR_PATCHWELCOME; } - if (avio_rl32(s->pb) != APM_TAG_DATA) - return AVERROR_INVALIDDATA; - - if ((ret = ff_alloc_extradata(st->codecpar, 16)) < 0) + if ((ret = ff_alloc_extradata(par, APM_EXTRADATA_SIZE)) < 0) return ret; - AV_WL32(st->codecpar->extradata + 0, vs12.state.predictor_l); - AV_WL32(st->codecpar->extradata + 4, vs12.state.step_index_l); - AV_WL32(st->codecpar->extradata + 8, vs12.state.predictor_r); - AV_WL32(st->codecpar->extradata + 12, vs12.state.step_index_r); + /* Use the entire state as extradata. */ + memcpy(par->extradata, buf + 20, APM_EXTRADATA_SIZE); - avpriv_set_pts_info(st, 64, 1, st->codecpar->sample_rate); + avpriv_set_pts_info(st, 64, 1, par->sample_rate); st->start_time = 0; - st->duration = vs12.data_size * - (8 / st->codecpar->bits_per_coded_sample) / - st->codecpar->channels; + st->duration = extradata.data_size * + (8 / par->bits_per_coded_sample) / + par->channels; return 0; } From patchwork Tue Jun 9 00:19:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zane van Iperen X-Patchwork-Id: 20226 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 271F744AA97 for ; Tue, 9 Jun 2020 03:19:50 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 10CF768B332; Tue, 9 Jun 2020 03:19:50 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-40134.protonmail.ch (mail-40134.protonmail.ch [185.70.40.134]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5B5546882D5 for ; Tue, 9 Jun 2020 03:19:43 +0300 (EEST) Date: Tue, 09 Jun 2020 00:19:33 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zanevaniperen.com; s=protonmail; t=1591661982; bh=/nYnoQSo7WdXLRLWdxj8hU8ZlLzofKj5B7n24gPlPt8=; h=Date:To:From:Cc:Reply-To:Subject:In-Reply-To:References:From; b=M4wR0LfnVxFrXaQMsaA6fFKZoNUG20uX9jtpNfuZbNfGDWvdAwTD2ARFROvLMclOi z7VSEr3tan9mHD5Xs843A3mQgY+Y5NIIVkbTMLoyrqC0BUWKM1JFkE8XNke9ixfU4d T9fXSAh1PDpXd8Lh+c/tKNHlbZ9M+eHeKGdDKEO0= To: ffmpeg-devel@ffmpeg.org From: Zane van Iperen Message-ID: <20200609001730.961175-3-zane@zanevaniperen.com> In-Reply-To: <20200609001730.961175-1-zane@zanevaniperen.com> References: <20200609001730.961175-1-zane@zanevaniperen.com> MIME-Version: 1.0 X-Spam-Status: No, score=-1.2 required=7.0 tests=ALL_TRUSTED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF shortcircuit=no autolearn=disabled version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on mail.protonmail.ch Subject: [FFmpeg-devel] [PATCH 2/7] avcodec/adpcm_ima_apm: prepare extradata handling for encoder 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 Cc: Zane van Iperen Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Zane van Iperen --- libavcodec/adpcm.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c index 79c5d625d1..328971adf1 100644 --- a/libavcodec/adpcm.c +++ b/libavcodec/adpcm.c @@ -162,11 +162,11 @@ static av_cold int adpcm_decode_init(AVCodecContext * avctx) } break; case AV_CODEC_ID_ADPCM_IMA_APM: - if (avctx->extradata && avctx->extradata_size >= 16) { - c->status[0].predictor = av_clip_intp2(AV_RL32(avctx->extradata + 0), 18); - c->status[0].step_index = av_clip(AV_RL32(avctx->extradata + 4), 0, 88); - c->status[1].predictor = av_clip_intp2(AV_RL32(avctx->extradata + 8), 18); - c->status[1].step_index = av_clip(AV_RL32(avctx->extradata + 12), 0, 88); + if (avctx->extradata && avctx->extradata_size >= 28) { + c->status[0].predictor = av_clip_intp2(AV_RL32(avctx->extradata + 16), 18); + c->status[0].step_index = av_clip(AV_RL32(avctx->extradata + 20), 0, 88); + c->status[1].predictor = av_clip_intp2(AV_RL32(avctx->extradata + 4), 18); + c->status[1].step_index = av_clip(AV_RL32(avctx->extradata + 8), 0, 88); } break; case AV_CODEC_ID_ADPCM_IMA_WS: From patchwork Tue Jun 9 00:19:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zane van Iperen X-Patchwork-Id: 20227 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 1E3F344AA97 for ; Tue, 9 Jun 2020 03:19:54 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 08FC268B38E; Tue, 9 Jun 2020 03:19:54 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-40134.protonmail.ch (mail-40134.protonmail.ch [185.70.40.134]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EFC4F68B2AB for ; Tue, 9 Jun 2020 03:19:47 +0300 (EEST) Date: Tue, 09 Jun 2020 00:19:38 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zanevaniperen.com; s=protonmail; t=1591661987; bh=gjJ6/KNcVcZ+jSY5bqdevGM4iaL1/WLx6Tylr0hYrv4=; h=Date:To:From:Cc:Reply-To:Subject:In-Reply-To:References:From; b=apuKMV7VzJUwiX8FpPqn5/IrW0TX9MTik2IW+K/BEk9RxICFCpWqRbjqcQF+FIBYW z4d1P+4sGb2JTVz2xfpvbQa7B5Lk4fBBB5z8iNI/CfYmW/6qeVhUPT33ChoTWOT7dx vS6wg6OlLRJQFvMJNbrq+nQj7KkmAXs9CnMrWuek= To: ffmpeg-devel@ffmpeg.org From: Zane van Iperen Message-ID: <20200609001730.961175-4-zane@zanevaniperen.com> In-Reply-To: <20200609001730.961175-1-zane@zanevaniperen.com> References: <20200609001730.961175-1-zane@zanevaniperen.com> MIME-Version: 1.0 X-Spam-Status: No, score=-1.2 required=7.0 tests=ALL_TRUSTED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF shortcircuit=no autolearn=disabled version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on mail.protonmail.ch Subject: [FFmpeg-devel] [PATCH 3/7] avcodec: add adpcm_ima_apm encoder 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 Cc: Zane van Iperen Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Zane van Iperen --- doc/general.texi | 2 +- libavcodec/Makefile | 1 + libavcodec/adpcmenc.c | 34 ++++++++++++++++++++++++++++++++-- libavcodec/allcodecs.c | 1 + libavcodec/utils.c | 1 + 5 files changed, 36 insertions(+), 3 deletions(-) diff --git a/doc/general.texi b/doc/general.texi index 9b0ee96752..8df7445c36 100644 --- a/doc/general.texi +++ b/doc/general.texi @@ -1109,7 +1109,7 @@ following image formats are supported: @item ADPCM IMA High Voltage Software ALP @tab @tab X @item ADPCM IMA QuickTime @tab X @tab X @item ADPCM IMA Simon & Schuster Interactive @tab X @tab X -@item ADPCM IMA Ubisoft APM @tab @tab X +@item ADPCM IMA Ubisoft APM @tab X @tab X @item ADPCM IMA Loki SDL MJPEG @tab @tab X @item ADPCM IMA WAV @tab X @tab X @item ADPCM IMA Westwood @tab @tab X diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 5a6ea59715..4ee0bf2d4c 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -853,6 +853,7 @@ OBJS-$(CONFIG_ADPCM_IMA_AMV_DECODER) += adpcm.o adpcm_data.o OBJS-$(CONFIG_ADPCM_IMA_ALP_DECODER) += adpcm.o adpcm_data.o OBJS-$(CONFIG_ADPCM_IMA_APC_DECODER) += adpcm.o adpcm_data.o OBJS-$(CONFIG_ADPCM_IMA_APM_DECODER) += adpcm.o adpcm_data.o +OBJS-$(CONFIG_ADPCM_IMA_APM_ENCODER) += adpcmenc.o adpcm_data.o OBJS-$(CONFIG_ADPCM_IMA_CUNNING_DECODER) += adpcm.o adpcm_data.o OBJS-$(CONFIG_ADPCM_IMA_DAT4_DECODER) += adpcm.o adpcm_data.o OBJS-$(CONFIG_ADPCM_IMA_DK3_DECODER) += adpcm.o adpcm_data.o diff --git a/libavcodec/adpcmenc.c b/libavcodec/adpcmenc.c index d5fbc0b9a7..242c92e61a 100644 --- a/libavcodec/adpcmenc.c +++ b/libavcodec/adpcmenc.c @@ -77,7 +77,9 @@ static av_cold int adpcm_encode_init(AVCodecContext *avctx) return AVERROR(EINVAL); } - if (avctx->trellis && avctx->codec->id == AV_CODEC_ID_ADPCM_IMA_SSI) { + if (avctx->trellis && + (avctx->codec->id == AV_CODEC_ID_ADPCM_IMA_SSI || + avctx->codec->id == AV_CODEC_ID_ADPCM_IMA_APM)) { /* * The current trellis implementation doesn't work for extended * runs of samples without periodic resets. Disallow it. @@ -152,6 +154,14 @@ static av_cold int adpcm_encode_init(AVCodecContext *avctx) avctx->frame_size = BLKSIZE * 2 / avctx->channels; avctx->block_align = BLKSIZE; break; + case AV_CODEC_ID_ADPCM_IMA_APM: + avctx->frame_size = BLKSIZE * 2 / avctx->channels; + avctx->block_align = BLKSIZE; + + if(!(avctx->extradata = av_mallocz(28))) + goto error; + avctx->extradata_size = 28; + break; default: ret = AVERROR(EINVAL); goto error; @@ -496,7 +506,8 @@ static int adpcm_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, if (avctx->codec_id == AV_CODEC_ID_ADPCM_SWF) pkt_size = (2 + avctx->channels * (22 + 4 * (frame->nb_samples - 1)) + 7) / 8; - else if (avctx->codec_id == AV_CODEC_ID_ADPCM_IMA_SSI) + else if (avctx->codec_id == AV_CODEC_ID_ADPCM_IMA_SSI || + avctx->codec_id == AV_CODEC_ID_ADPCM_IMA_APM) pkt_size = (frame->nb_samples * avctx->channels) / 2; else pkt_size = avctx->block_align; @@ -717,6 +728,24 @@ static int adpcm_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, *dst++ = nibble; } break; + case AV_CODEC_ID_ADPCM_IMA_APM: + { + PutBitContext pb; + init_put_bits(&pb, dst, pkt_size); + + av_assert0(avctx->trellis == 0); + + for (n = frame->nb_samples / 2; n > 0; n--) { + for (ch = 0; ch < avctx->channels; ch++) { + put_bits(&pb, 4, adpcm_ima_qt_compress_sample(c->status + ch, *samples++)); + put_bits(&pb, 4, adpcm_ima_qt_compress_sample(c->status + ch, samples[st])); + } + samples += avctx->channels; + } + + flush_put_bits(&pb); + break; + } default: return AVERROR(EINVAL); } @@ -751,6 +780,7 @@ AVCodec ff_ ## name_ ## _encoder = { \ .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, \ } +ADPCM_ENCODER(AV_CODEC_ID_ADPCM_IMA_APM, adpcm_ima_apm, sample_fmts, AV_CODEC_CAP_SMALL_LAST_FRAME, "ADPCM IMA Ubisoft APM"); ADPCM_ENCODER(AV_CODEC_ID_ADPCM_IMA_QT, adpcm_ima_qt, sample_fmts_p, 0, "ADPCM IMA QuickTime"); ADPCM_ENCODER(AV_CODEC_ID_ADPCM_IMA_SSI, adpcm_ima_ssi, sample_fmts, AV_CODEC_CAP_SMALL_LAST_FRAME, "ADPCM IMA Simon & Schuster Interactive"); ADPCM_ENCODER(AV_CODEC_ID_ADPCM_IMA_WAV, adpcm_ima_wav, sample_fmts_p, 0, "ADPCM IMA WAV"); diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index 80f128cade..f7d560052e 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -607,6 +607,7 @@ extern AVCodec ff_adpcm_ima_amv_decoder; extern AVCodec ff_adpcm_ima_alp_decoder; extern AVCodec ff_adpcm_ima_apc_decoder; extern AVCodec ff_adpcm_ima_apm_decoder; +extern AVCodec ff_adpcm_ima_apm_encoder; extern AVCodec ff_adpcm_ima_cunning_decoder; extern AVCodec ff_adpcm_ima_dat4_decoder; extern AVCodec ff_adpcm_ima_dk3_decoder; diff --git a/libavcodec/utils.c b/libavcodec/utils.c index a9c69e30dd..b47c98a9b2 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -1472,6 +1472,7 @@ int av_get_exact_bits_per_sample(enum AVCodecID codec_id) case AV_CODEC_ID_8SVX_FIB: case AV_CODEC_ID_ADPCM_CT: case AV_CODEC_ID_ADPCM_IMA_APC: + case AV_CODEC_ID_ADPCM_IMA_APM: case AV_CODEC_ID_ADPCM_IMA_EA_SEAD: case AV_CODEC_ID_ADPCM_IMA_OKI: case AV_CODEC_ID_ADPCM_IMA_WS: From patchwork Tue Jun 9 00:19:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zane van Iperen X-Patchwork-Id: 20228 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 6397944AA97 for ; Tue, 9 Jun 2020 03:19:55 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id EEEE768B386; Tue, 9 Jun 2020 03:19:54 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail1.protonmail.ch (mail1.protonmail.ch [185.70.40.18]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B809968B329 for ; Tue, 9 Jun 2020 03:19:53 +0300 (EEST) Date: Tue, 09 Jun 2020 00:19:42 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zanevaniperen.com; s=protonmail; t=1591661992; bh=lCDT0w555MlI7zjoQ92Kudam4JzTAoFOyUMjPSchmTs=; h=Date:To:From:Cc:Reply-To:Subject:In-Reply-To:References:From; b=A4+SJRRXkMT6V/rKcx59GU9+no9X0HV+Ju2OCfbsMybiDvKiIx70d/swZse24Gtli NlIq6+/1QwiZW+Pp/p+MIfWQ8sLEYRSFr+NgNiTGrigVlJL2VxQKRCFkbKFBWOzS9I uZP8It58rB6TiHGqkE308WFJfu3FwboBVho7amIw= To: ffmpeg-devel@ffmpeg.org From: Zane van Iperen Message-ID: <20200609001730.961175-5-zane@zanevaniperen.com> In-Reply-To: <20200609001730.961175-1-zane@zanevaniperen.com> References: <20200609001730.961175-1-zane@zanevaniperen.com> MIME-Version: 1.0 X-Spam-Status: No, score=-1.2 required=7.0 tests=ALL_TRUSTED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF shortcircuit=no autolearn=disabled version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on mail.protonmail.ch Subject: [FFmpeg-devel] [PATCH 4/7] avformat: add apm muxer 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 Cc: Zane van Iperen Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Zane van Iperen --- Changelog | 1 + libavformat/Makefile | 1 + libavformat/allformats.c | 1 + libavformat/apm.c | 112 ++++++++++++++++++++++++++++++++++++++- 4 files changed, 113 insertions(+), 2 deletions(-) diff --git a/Changelog b/Changelog index 3c82f2ebd6..1f5250bb35 100644 --- a/Changelog +++ b/Changelog @@ -78,6 +78,7 @@ version 4.3: - PFM decoder - dblur video filter - Real War KVAG muxer +- Rayman 2 APM muxer version 4.2: diff --git a/libavformat/Makefile b/libavformat/Makefile index bb09dc6563..a2691cb626 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -94,6 +94,7 @@ OBJS-$(CONFIG_ANM_DEMUXER) += anm.o OBJS-$(CONFIG_APC_DEMUXER) += apc.o OBJS-$(CONFIG_APE_DEMUXER) += ape.o apetag.o img2.o OBJS-$(CONFIG_APM_DEMUXER) += apm.o +OBJS-$(CONFIG_APM_MUXER) += apm.o rawenc.o OBJS-$(CONFIG_APNG_DEMUXER) += apngdec.o OBJS-$(CONFIG_APNG_MUXER) += apngenc.o OBJS-$(CONFIG_APTX_DEMUXER) += aptxdec.o rawdec.o diff --git a/libavformat/allformats.c b/libavformat/allformats.c index a7c5c9db89..0c8788ef42 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -55,6 +55,7 @@ extern AVInputFormat ff_anm_demuxer; extern AVInputFormat ff_apc_demuxer; extern AVInputFormat ff_ape_demuxer; extern AVInputFormat ff_apm_demuxer; +extern AVOutputFormat ff_apm_muxer; extern AVInputFormat ff_apng_demuxer; extern AVOutputFormat ff_apng_muxer; extern AVInputFormat ff_aptx_demuxer; diff --git a/libavformat/apm.c b/libavformat/apm.c index 16ac6a2b1a..46a0c67b79 100644 --- a/libavformat/apm.c +++ b/libavformat/apm.c @@ -1,5 +1,5 @@ /* - * Rayman 2 APM Demuxer + * Rayman 2 APM (De)muxer * * Copyright (C) 2020 Zane van Iperen (zane@zanevaniperen.com) * @@ -21,6 +21,8 @@ */ #include "avformat.h" #include "internal.h" +#include "rawenc.h" +#include "libavutil/avassert.h" #include "libavutil/internal.h" #include "libavutil/intreadwrite.h" @@ -48,13 +50,14 @@ typedef struct APMExtraData { uint32_t magic; uint32_t file_size; uint32_t data_size; - uint32_t unk1; + int32_t unk1; uint32_t unk2; APMState state; uint32_t unk3[7]; uint32_t data; } APMExtraData; +#if CONFIG_APM_DEMUXER static void apm_parse_extradata(APMExtraData *ed, const uint8_t *buf) { ed->magic = AV_RL32(buf + 0); @@ -195,3 +198,108 @@ AVInputFormat ff_apm_demuxer = { .read_header = apm_read_header, .read_packet = apm_read_packet }; +#endif + +#if CONFIG_APM_MUXER +static int apm_write_init(AVFormatContext *s) +{ + AVCodecParameters *par; + + if (s->nb_streams != 1) { + av_log(s, AV_LOG_ERROR, "APM files have exactly one stream\n"); + return AVERROR(EINVAL); + } + + par = s->streams[0]->codecpar; + + if (par->codec_id != AV_CODEC_ID_ADPCM_IMA_APM) { + av_log(s, AV_LOG_ERROR, "%s codec not supported\n", + avcodec_get_name(par->codec_id)); + return AVERROR(EINVAL); + } + + if (par->channels > 2) { + av_log(s, AV_LOG_ERROR, "APM files only support up to 2 channels\n"); + return AVERROR(EINVAL); + } + + if (par->extradata_size != APM_EXTRADATA_SIZE) { + av_log(s, AV_LOG_ERROR, "Invalid/missing extradata\n"); + return AVERROR(EINVAL); + } + + if (!(s->pb->seekable & AVIO_SEEKABLE_NORMAL)) { + av_log(s, AV_LOG_WARNING, "Stream not seekable, unable to write output file\n"); + return AVERROR(EINVAL); + } + + return 0; +} + +static int apm_write_header(AVFormatContext *s) +{ + APMExtraData extradata; + uint8_t buf[APM_FILE_EXTRADATA_SIZE]; + AVCodecParameters *par = s->streams[0]->codecpar; + + memset(buf, 0, APM_FILE_EXTRADATA_SIZE); + + /* + * Bodge a WAVEFORMATEX manually, ff_put_wav_header() can't + * be used because of the extra 2 bytes. + */ + avio_wl16(s->pb, APM_CODEC_TAG); + avio_wl16(s->pb, par->channels); + avio_wl32(s->pb, par->sample_rate); + avio_wl32(s->pb, par->sample_rate * par->channels * 2); + avio_wl16(s->pb, par->block_align); + avio_wl16(s->pb, par->bits_per_coded_sample); + avio_wl16(s->pb, APM_FILE_EXTRADATA_SIZE); + + avio_wl16(s->pb, 0); /* pad */ + + /* + * Build the extradata. Assume the codec's given us correct data. + * File and data sizes are fixed later. + */ + AV_WL32(buf + 0, APM_TAG_VS12); /* magic */ + AV_WL32(buf + 12, -1); /* unk1, always seems to be -1 */ + memcpy( buf + 20, par->extradata, APM_EXTRADATA_SIZE); + AV_WL32(buf + 76, APM_TAG_DATA); /* data */ + + avio_write(s->pb, buf, APM_FILE_EXTRADATA_SIZE); + return 0; +} + +static int apm_write_trailer(AVFormatContext *s) +{ + int64_t file_size, data_size; + + file_size = avio_tell(s->pb); + data_size = file_size - (APM_FILE_HEADER_SIZE + 2 + APM_FILE_EXTRADATA_SIZE); + + if (file_size < UINT32_MAX && data_size < UINT32_MAX) { + avio_seek(s->pb, 24, SEEK_SET); + avio_wl32(s->pb, (uint32_t)file_size); + avio_wl32(s->pb, (uint32_t)data_size); + } else { + av_log(s, AV_LOG_WARNING, + "Filesize %"PRId64" invalid for APM, output file will be broken\n", + file_size); + } + + return 0; +} + +AVOutputFormat ff_apm_muxer = { + .name = "apm", + .long_name = NULL_IF_CONFIG_SMALL("Ubisoft Rayman 2 APM"), + .extensions = "apm", + .audio_codec = AV_CODEC_ID_ADPCM_IMA_APM, + .video_codec = AV_CODEC_ID_NONE, + .init = apm_write_init, + .write_header = apm_write_header, + .write_packet = ff_raw_write_packet, + .write_trailer = apm_write_trailer +}; +#endif From patchwork Tue Jun 9 00:19:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zane van Iperen X-Patchwork-Id: 20234 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:bac9:0:0:0:0:0 with SMTP id a9csp112317ybk; Mon, 8 Jun 2020 17:20:30 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzRCmeHXGlYj45ik/uBdc2MGXE5qr7+A5zgECOgu2tHtMX/xCr8UlvWsivS+F/vimADxLWU X-Received: by 2002:a05:6000:d:: with SMTP id h13mr1309816wrx.17.1591662030619; Mon, 08 Jun 2020 17:20:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1591662030; cv=none; d=google.com; s=arc-20160816; b=Qg6OnSfwxL0sVF8I83DX4ZuwgvgnRq+wEJYghK5F3yh7kMDiWKhnQkdJkw0blNgFYj YsKGlYk/+cA9rUUb4n3XX5CP56lysx+eF2UvROTeP3SmBW1ef4F2cNNSCxS5IMH6rUKY PqcKNLToPZT4JlMBpSDvaDCLkLxQlr27vystJLKmudWIAUgJ75LI+J3J3Hs8EPyOwjmQ nPTvh5PJrEJAZbqw94+r5IGWznaE5r6LFEqSe7u/ZYaorSD4JGDp0IzHCpVzwD4PFsEa uHcaRtUMmXp4ekpMtmCkCWy2xB3dNyB40mfYikFYaY7T0z1YYVeEw+Q+VUObHLXXePkb S5ew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:message-id:from:to :dkim-signature:date:delivered-to; bh=gz8UVffQUTMkYllcEF0PF2xAa2v9zaKCJArk74lBX/8=; b=daCO76ubUGMeAW+S6VPvqvyePSxtYR/vpKpFjgTcjUPtJbU+qTFxe8XYg14qOBbTzi XVLj6XBI2+E2axLyneFSFHMXXyCcFlppWpvpoC3WFfPtNj1lmaD6uT5n4IY9uNMgquuG ZH9acgxgkzzb6UJ13YZ2pOVKyxV09IKlwallx5jbyxu24KZB1V1lt9zLENdYyxCayH9l UaxOmtJPaaA0+9rYLZYW18cVktfQYLepkNtTpQlFUIU10Kt2yDeVkNNWxGaMot1IB0oq 7/5Qg6jxXW3g4qiAYBx8wGPWAg3K0j8n5WcvO1pTQKsQvOtplSXV0syvj04Jf0U1Sz1R grvg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@zanevaniperen.com header.s=protonmail header.b=F9kYOtz3; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=zanevaniperen.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id e3si1055165wru.534.2020.06.08.17.20.30; Mon, 08 Jun 2020 17:20:30 -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=@zanevaniperen.com header.s=protonmail header.b=F9kYOtz3; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=zanevaniperen.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8B8FC68B3A5; Tue, 9 Jun 2020 03:20:03 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail2.protonmail.ch (mail2.protonmail.ch [185.70.40.22]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7DC8B68B32B for ; Tue, 9 Jun 2020 03:20:02 +0300 (EEST) Date: Tue, 09 Jun 2020 00:19:50 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zanevaniperen.com; s=protonmail; t=1591662001; bh=sVX9jBYcnZoWe+9Lg8ZCXqBGRCUBhdJRtWcxPq6+76g=; h=Date:To:From:Cc:Reply-To:Subject:From; b=F9kYOtz3mRNCfhbPPysg1XLWbyaEs08NjQlR+kGuhVWTc70sV+p97zL6ud4QmQzlm UCsbesgTwSHsMJ1o3umLWbkT3F1lgtg85iuXNpMHUi2lmohNmctN8YKj9hkSRmY7wK PkyXAmyeGe/KIfgbhxkJz9aZnn2wGl77MHbktg34= To: ffmpeg-devel@ffmpeg.org From: Zane van Iperen Message-ID: <20200609001730.961175-6-zane@zanevaniperen.com> MIME-Version: 1.0 X-Spam-Status: No, score=-1.2 required=7.0 tests=ALL_TRUSTED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF shortcircuit=no autolearn=disabled version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on mail.protonmail.ch Subject: [FFmpeg-devel] [PATCH 5/7] fate: add adpcm_ima_apm encoding test 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 Cc: Zane van Iperen Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: Ngr3Ii8jrsIN Content-Length: 2477 Signed-off-by: Zane van Iperen --- tests/fate/acodec.mak | 2 ++ tests/ref/acodec/adpcm-ima_apm | 4 ++++ 2 files changed, 6 insertions(+) create mode 100644 tests/ref/acodec/adpcm-ima_apm diff --git a/tests/fate/acodec.mak b/tests/fate/acodec.mak index bb6bfe5ada..197b6ed7c0 100644 --- a/tests/fate/acodec.mak +++ b/tests/fate/acodec.mak @@ -45,6 +45,7 @@ fate-acodec-pcm-u%le: FMT = nut fate-acodec-pcm-f%be: FMT = au FATE_ACODEC_ADPCM-$(call ENCDEC, ADPCM_ADX, ADX) += adx +FATE_ACODEC_ADPCM-$(call ENCDEC, ADPCM_IMA_APM, APM) += ima_apm FATE_ACODEC_ADPCM-$(call ENCDEC, ADPCM_IMA_QT, AIFF) += ima_qt FATE_ACODEC_ADPCM-$(call ENCDEC, ADPCM_IMA_SSI, KVAG) += ima_ssi FATE_ACODEC_ADPCM-$(call ENCDEC, ADPCM_IMA_WAV, WAV) += ima_wav @@ -59,6 +60,7 @@ fate-acodec-adpcm: $(FATE_ACODEC_ADPCM) fate-acodec-adpcm-%: CODEC = adpcm_$(@:fate-acodec-adpcm-%=%) fate-acodec-adpcm-adx: FMT = adx +fate-acodec-adpcm-ima_apm: FMT = apm fate-acodec-adpcm-ima_qt: FMT = aiff fate-acodec-adpcm-ima_ssi: FMT = kvag fate-acodec-adpcm-ima_wav: FMT = wav diff --git a/tests/ref/acodec/adpcm-ima_apm b/tests/ref/acodec/adpcm-ima_apm new file mode 100644 index 0000000000..83bd21f831 --- /dev/null +++ b/tests/ref/acodec/adpcm-ima_apm @@ -0,0 +1,4 @@ +2e795c6c06baabe01ab92864d963e71b *tests/data/fate/acodec-adpcm-ima_apm.apm +264700 tests/data/fate/acodec-adpcm-ima_apm.apm +201607bf7610f062b9a1e6524354c569 *tests/data/fate/acodec-adpcm-ima_apm.out.wav +stddev: 904.76 PSNR: 37.20 MAXDIFF:34029 bytes: 1058400/ 1058400 From patchwork Tue Jun 9 00:19:55 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zane van Iperen X-Patchwork-Id: 20232 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:bac9:0:0:0:0:0 with SMTP id a9csp112413ybk; Mon, 8 Jun 2020 17:20:42 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyiyl3lF0v8szvpc3EZx2baQKkTvgBppJebf3zv/9S21SW90WLz1V48kS95K6XWduSrJ2UA X-Received: by 2002:a5d:68c2:: with SMTP id p2mr1329263wrw.253.1591662041969; Mon, 08 Jun 2020 17:20:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1591662041; cv=none; d=google.com; s=arc-20160816; b=l7G2W0wm9P2+1wYQG6XkUlv2a++G9S5NlBvdmPij+N3VYMwYGdcP2d+o6DIrxMgfyu IInvOewnhakrKMMSw6e/cE/d4Mg1Aj4dZnKQS3qYFojK5/1yxG3U9wgsgPpQqA+8PXN2 9zUm7pUXNrV+FoZqSJxrxQY0pJ+tp+8mPRfMJfLCGqRdlTtxReoY3FCyqHTcGz8cNad8 4fhcwGVtYIbmTnwnaqJJvc2fTNVjkqrW3ylzaK5l1kC92bnV0ro7ASak/i80MGzcImmM kvQdOEw0LThxy8FNnjWMfXlEWe+8PIUrDNO2q/FYm2smcz4bu6vMBDWJY8ggP2iF+8fi Rzxg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:message-id:from:to :dkim-signature:date:delivered-to; bh=UshiBjF1qbjdVx8sRggMQcaqsDI2/wp8EgMHIgejR54=; b=VFkx/LQL8CumRExpKjnhb2h78B2aDg0w8MSb1P6xrVld1uXYJYOyUFPJL+hwjXQ1tG OdGuT9jurzKiHqiplCUnM/jZnDQYydu5wmWqqkqZrYxQfxW2T0aKuPFZuS8/G90cuBus L8fCACKu9vxkwx7odAobwKMTwhM1gw2Ywj9HpxKigBf36s0u+zckAlYqUp7OGsnx7DQN NEx92rTbgoA77uU0ePy+iQFrjfpK3ZQL8I8sGmO4AogTkuKIbGYWwv2NvhXOnO3zo/FQ +jydTOKNVg5eqic+TuY3TqH2AsibJWuzJD0CdkC3P0BsSXBz+he8elknSv2N+FEgSq6M Y8wg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@zanevaniperen.com header.s=protonmail header.b=cYlG+EGm; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=zanevaniperen.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 2si1381518wrd.270.2020.06.08.17.20.40; Mon, 08 Jun 2020 17:20:41 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@zanevaniperen.com header.s=protonmail header.b=cYlG+EGm; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=zanevaniperen.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8515E68B3E4; Tue, 9 Jun 2020 03:20:05 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-40134.protonmail.ch (mail-40134.protonmail.ch [185.70.40.134]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EBD8768B3CB for ; Tue, 9 Jun 2020 03:20:03 +0300 (EEST) Date: Tue, 09 Jun 2020 00:19:55 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zanevaniperen.com; s=protonmail; t=1591662003; bh=77D7wJO/WpvMigkeOR9bgWpqa+nQGxWcFrtuZM04bOQ=; h=Date:To:From:Cc:Reply-To:Subject:From; b=cYlG+EGmjh6au6i+tR5yKwHhggNig9sz0V71HK4+SsAO25Wfv2tHY9AxrodUiSCfN brpI/j5UHWendTLZOr47wLHHLSfjgm58TxmkjA0UXRDw/Dt5NZfpWC3Q1uFzXhEmZM sbw3i4NCODrE6XhkTMvyiC7iyhZaU0iCFWU5QrZc= To: ffmpeg-devel@ffmpeg.org From: Zane van Iperen Message-ID: <20200609001730.961175-7-zane@zanevaniperen.com> MIME-Version: 1.0 X-Spam-Status: No, score=-1.2 required=7.0 tests=ALL_TRUSTED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF shortcircuit=no autolearn=disabled version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on mail.protonmail.ch Subject: [FFmpeg-devel] [PATCH 6/7] avformat/apm: name and probe fix 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 Cc: Zane van Iperen Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: b4iQW8Z7ek8Z Content-Length: 2533 Signed-off-by: Zane van Iperen --- libavformat/apm.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/libavformat/apm.c b/libavformat/apm.c index 46a0c67b79..8ece104ae7 100644 --- a/libavformat/apm.c +++ b/libavformat/apm.c @@ -31,8 +31,8 @@ #define APM_EXTRADATA_SIZE 28 #define APM_MAX_READ_SIZE 4096 -#define APM_CODEC_TAG 0x2000 +#define APM_TAG_CODEC 0x2000 #define APM_TAG_VS12 MKTAG('v', 's', '1', '2') #define APM_TAG_DATA MKTAG('D', 'A', 'T', 'A') @@ -82,6 +82,9 @@ static void apm_parse_extradata(APMExtraData *ed, const uint8_t *buf) static int apm_probe(const AVProbeData *p) { + if (AV_RL16(p->buf) != APM_TAG_CODEC) + return 0; + if (p->buf_size < 100) return 0; @@ -109,7 +112,7 @@ static int apm_read_header(AVFormatContext *s) * This is 98% a WAVEFORMATEX, but there's something screwy with the extradata * that ff_get_wav_header() can't (and shouldn't) handle properly. */ - if (avio_rl16(s->pb) != APM_CODEC_TAG) + if (avio_rl16(s->pb) != APM_TAG_CODEC) return AVERROR_INVALIDDATA; par = st->codecpar; @@ -248,7 +251,7 @@ static int apm_write_header(AVFormatContext *s) * Bodge a WAVEFORMATEX manually, ff_put_wav_header() can't * be used because of the extra 2 bytes. */ - avio_wl16(s->pb, APM_CODEC_TAG); + avio_wl16(s->pb, APM_TAG_CODEC); avio_wl16(s->pb, par->channels); avio_wl32(s->pb, par->sample_rate); avio_wl32(s->pb, par->sample_rate * par->channels * 2); From patchwork Tue Jun 9 00:20:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zane van Iperen X-Patchwork-Id: 20229 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 6DCF944B16A for ; Tue, 9 Jun 2020 03:20:19 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 59A5668B3E7; Tue, 9 Jun 2020 03:20:19 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-40131.protonmail.ch (mail-40131.protonmail.ch [185.70.40.131]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id ECF1768B329 for ; Tue, 9 Jun 2020 03:20:17 +0300 (EEST) Date: Tue, 09 Jun 2020 00:20:10 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zanevaniperen.com; s=protonmail; t=1591662016; bh=/ZilwxU4zyIcc5C/4YLal2exQiJ3poF426q7lxHlb44=; h=Date:To:From:Cc:Reply-To:Subject:From; b=Kt9yfu1IXbDtSMrDxgeZDHmqKHUYeR0LoXOAd5G3mHDSFLri6zoZqG908DdDfsobl sQq33CyepnVDgPahAx/8Mz6kYtBT16sob6P28KrcfOaUK2z6DBW7DhhS9RoL/01C73 9FrR9tPgmh9CY637KF7pom7uoo9ACzXlVdJg9jqQ= To: ffmpeg-devel@ffmpeg.org From: Zane van Iperen Message-ID: <20200609001730.961175-8-zane@zanevaniperen.com> MIME-Version: 1.0 X-Spam-Status: No, score=-1.2 required=7.0 tests=ALL_TRUSTED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF shortcircuit=no autolearn=disabled version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on mail.protonmail.ch Subject: [FFmpeg-devel] [PATCH 7/7] avcodec/adpcmenc: cleanup trellis checks 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 Cc: Zane van Iperen Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Zane van Iperen --- libavcodec/adpcmenc.c | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/libavcodec/adpcmenc.c b/libavcodec/adpcmenc.c index 242c92e61a..c18e67a94f 100644 --- a/libavcodec/adpcmenc.c +++ b/libavcodec/adpcmenc.c @@ -72,23 +72,22 @@ static av_cold int adpcm_encode_init(AVCodecContext *avctx) return AVERROR(EINVAL); } - if (avctx->trellis && (unsigned)avctx->trellis > 16U) { - av_log(avctx, AV_LOG_ERROR, "invalid trellis size\n"); - return AVERROR(EINVAL); - } + if (avctx->trellis) { + if ((unsigned)avctx->trellis > 16U) { + av_log(avctx, AV_LOG_ERROR, "invalid trellis size\n"); + return AVERROR(EINVAL); + } - if (avctx->trellis && - (avctx->codec->id == AV_CODEC_ID_ADPCM_IMA_SSI || - avctx->codec->id == AV_CODEC_ID_ADPCM_IMA_APM)) { - /* - * The current trellis implementation doesn't work for extended - * runs of samples without periodic resets. Disallow it. - */ - av_log(avctx, AV_LOG_ERROR, "trellis not supported\n"); - return AVERROR_PATCHWELCOME; - } + if (avctx->codec->id == AV_CODEC_ID_ADPCM_IMA_SSI || + avctx->codec->id == AV_CODEC_ID_ADPCM_IMA_APM) { + /* + * The current trellis implementation doesn't work for extended + * runs of samples without periodic resets. Disallow it. + */ + av_log(avctx, AV_LOG_ERROR, "trellis not supported\n"); + return AVERROR_PATCHWELCOME; + } - if (avctx->trellis) { int frontier = 1 << avctx->trellis; int max_paths = frontier * FREEZE_INTERVAL; FF_ALLOC_OR_GOTO(avctx, s->paths,