From patchwork Sat Mar 7 14:15:44 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: 18079 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 BBDE6449756 for ; Sat, 7 Mar 2020 16:15:56 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A78CE68AF0D; Sat, 7 Mar 2020 16:15:56 +0200 (EET) 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 8340268AEC5 for ; Sat, 7 Mar 2020 16:15:50 +0200 (EET) Date: Sat, 07 Mar 2020 14:15:44 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zanevaniperen.com; s=protonmail; t=1583590549; bh=Ut2KnjJEbuRsVMqzHKh6XZoU5Bl/DTo3Kdk5Z7fZYkU=; h=Date:To:From:Cc:Reply-To:Subject:In-Reply-To:References: Feedback-ID:From; b=I9yEJq46+V4RpZOMmGEvr0Q80YPBnm8fKdvdAxxCTMxbykg9VYMarejTUauMidhRn ZKgpkb18s96p37a3m5T73NM6ehXb6N7+SbtOsVcurIZlMkFPyQ2PebaEianqmlG87K wz1xu3CPWX1vIJTnpuVdXADh7Y0Z/HOwQs0CvRNk= To: ffmpeg-devel@ffmpeg.org From: Zane van Iperen Message-ID: <20200307141326.24374-2-zane@zanevaniperen.com> In-Reply-To: <20200307141326.24374-1-zane@zanevaniperen.com> References: <20200307141326.24374-1-zane@zanevaniperen.com> Feedback-ID: xylLYHwBzJW7F28tHN-oL9EBm6h5yqtCqG6YwPpJ2oMwBYJT6-HxTnFTF6p18axLiSywX61iUfj4CElBGg8-GA==:Ext:ProtonMail 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 v2 1/4] avcodec: add decoder for High Voltage Software's ALP ADPCM 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/Makefile | 1 + libavcodec/adpcm.c | 36 ++++++++++++++++++++++++++++++++++++ libavcodec/allcodecs.c | 1 + libavcodec/avcodec.h | 1 + libavcodec/codec_desc.c | 7 +++++++ libavcodec/version.h | 4 ++-- 6 files changed, 48 insertions(+), 2 deletions(-) diff --git a/libavcodec/Makefile b/libavcodec/Makefile index f1c032b456..0fd374ffed 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -834,6 +834,7 @@ OBJS-$(CONFIG_ADPCM_G726_ENCODER) += g726.o OBJS-$(CONFIG_ADPCM_G726LE_DECODER) += g726.o OBJS-$(CONFIG_ADPCM_G726LE_ENCODER) += g726.o 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_DAT4_DECODER) += adpcm.o adpcm_data.o diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c index 5f152ee6ef..c69cac3379 100644 --- a/libavcodec/adpcm.c +++ b/libavcodec/adpcm.c @@ -15,6 +15,7 @@ * Argonaut Games ADPCM decoder by Zane van Iperen (zane@zanevaniperen.com) * Simon & Schuster Interactive ADPCM decoder by Zane van Iperen (zane@zanevaniperen.com) * Ubisoft ADPCM decoder by Zane van Iperen (zane@zanevaniperen.com) + * High Voltage Software ALP decoder by Zane van Iperen (zane@zanevaniperen.com) * * This file is part of FFmpeg. * @@ -280,6 +281,29 @@ static inline int16_t adpcm_ima_expand_nibble(ADPCMChannelStatus *c, int8_t nibb return (int16_t)c->predictor; } +static inline int16_t adpcm_ima_alp_expand_nibble(ADPCMChannelStatus *c, int8_t nibble, int shift) +{ + int step_index; + int predictor; + int sign, delta, diff, step; + + step = ff_adpcm_step_table[c->step_index]; + step_index = c->step_index + ff_adpcm_index_table[(unsigned)nibble]; + step_index = av_clip(step_index, 0, 88); + + sign = nibble & 8; + delta = nibble & 7; + diff = (delta * step) >> shift; + predictor = c->predictor; + if (sign) predictor -= diff; + else predictor += diff; + + c->predictor = av_clip_int16(predictor); + c->step_index = step_index; + + 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; @@ -675,6 +699,7 @@ static int get_nb_samples(AVCodecContext *avctx, GetByteContext *gb, case AV_CODEC_ID_ADPCM_AICA: case AV_CODEC_ID_ADPCM_IMA_SSI: case AV_CODEC_ID_ADPCM_IMA_APM: + case AV_CODEC_ID_ADPCM_IMA_ALP: nb_samples = buf_size * 2 / ch; break; } @@ -1247,6 +1272,16 @@ static int adpcm_decode_frame(AVCodecContext *avctx, void *data, samples += avctx->channels; } break; + case AV_CODEC_ID_ADPCM_IMA_ALP: + for (n = nb_samples / 2; n > 0; n--) { + for (channel = 0; channel < avctx->channels; channel++) { + int v = bytestream2_get_byteu(&gb); + *samples++ = adpcm_ima_alp_expand_nibble(&c->status[channel], v >> 4 , 2); + samples[st] = adpcm_ima_alp_expand_nibble(&c->status[channel], v & 0x0F, 2); + } + samples += avctx->channels; + } + break; case AV_CODEC_ID_ADPCM_IMA_OKI: while (bytestream2_get_bytes_left(&gb) > 0) { int v = bytestream2_get_byteu(&gb); @@ -1997,6 +2032,7 @@ ADPCM_DECODER(AV_CODEC_ID_ADPCM_IMA_QT, sample_fmts_s16p, adpcm_ima_qt, ADPCM_DECODER(AV_CODEC_ID_ADPCM_IMA_RAD, sample_fmts_s16, adpcm_ima_rad, "ADPCM IMA Radical"); ADPCM_DECODER(AV_CODEC_ID_ADPCM_IMA_SSI, sample_fmts_s16, adpcm_ima_ssi, "ADPCM IMA Simon & Schuster Interactive"); ADPCM_DECODER(AV_CODEC_ID_ADPCM_IMA_SMJPEG, sample_fmts_s16, adpcm_ima_smjpeg, "ADPCM IMA Loki SDL MJPEG"); +ADPCM_DECODER(AV_CODEC_ID_ADPCM_IMA_ALP, sample_fmts_s16, adpcm_ima_alp, "ADPCM IMA High Voltage Software ALP"); ADPCM_DECODER(AV_CODEC_ID_ADPCM_IMA_WAV, sample_fmts_s16p, adpcm_ima_wav, "ADPCM IMA WAV"); ADPCM_DECODER(AV_CODEC_ID_ADPCM_IMA_WS, sample_fmts_both, adpcm_ima_ws, "ADPCM IMA Westwood"); ADPCM_DECODER(AV_CODEC_ID_ADPCM_MS, sample_fmts_both, adpcm_ms, "ADPCM Microsoft"); diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index 674995df72..f4cf180716 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -599,6 +599,7 @@ extern AVCodec ff_adpcm_g726_decoder; extern AVCodec ff_adpcm_g726le_encoder; extern AVCodec ff_adpcm_g726le_decoder; 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_dat4_decoder; diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 5a0fc3405c..833642d692 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -552,6 +552,7 @@ enum AVCodecID { AV_CODEC_ID_ADPCM_IMA_SSI, AV_CODEC_ID_ADPCM_ZORK, AV_CODEC_ID_ADPCM_IMA_APM, + AV_CODEC_ID_ADPCM_IMA_ALP, /* AMR */ AV_CODEC_ID_AMR_NB = 0x12000, diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c index 52178e7afe..0f5ddd9a9f 100644 --- a/libavcodec/codec_desc.c +++ b/libavcodec/codec_desc.c @@ -2325,6 +2325,13 @@ static const AVCodecDescriptor codec_descriptors[] = { .long_name = NULL_IF_CONFIG_SMALL("ADPCM IMA Ubisoft APM"), .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY, }, + { + .id = AV_CODEC_ID_ADPCM_IMA_ALP, + .type = AVMEDIA_TYPE_AUDIO, + .name = "adpcm_ima_alp", + .long_name = NULL_IF_CONFIG_SMALL("ADPCM IMA High Voltage Software ALP"), + .props = AV_CODEC_PROP_INTRA_ONLY | AV_CODEC_PROP_LOSSY, + }, /* AMR */ { diff --git a/libavcodec/version.h b/libavcodec/version.h index 36536c3725..c051ac0754 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -28,8 +28,8 @@ #include "libavutil/version.h" #define LIBAVCODEC_VERSION_MAJOR 58 -#define LIBAVCODEC_VERSION_MINOR 73 -#define LIBAVCODEC_VERSION_MICRO 102 +#define LIBAVCODEC_VERSION_MINOR 74 +#define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \ From patchwork Sat Mar 7 14:15: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: 18084 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a0c:9128:0:0:0:0:0 with SMTP id q37csp715377qvq; Sat, 7 Mar 2020 06:16:20 -0800 (PST) X-Google-Smtp-Source: ADFU+vv2iVriclncmnHJculz1r7p0Doyl9GGW1wno0itWXuJ3Nw4EFiJ3l0jxsz93pMguRXkutyX X-Received: by 2002:a05:6402:214:: with SMTP id t20mr1047167edv.78.1583590580590; Sat, 07 Mar 2020 06:16:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1583590580; cv=none; d=google.com; s=arc-20160816; b=CXjaYnIaD4E9Gdqt6sPpydyR/AIIfvQ9Euco9Vcwz3Kvc3WTDwluVZWg8DOYLEPGxP VA0KWw/lQSIoqucb7ndvh2MS1pWpeqsMJCk1Xw8CRXNFxLKnRxfCvp5q9VF2+jGFdsUS gz0/JKNUE6z6nI8fRiEyBqV2f6YePDHEMtrXf0nkKAmbPCcZOkeZN8jJWIRMixtyszYe yAE8XHYgCXC5YZJ7YiSJJVCUK5s/Bed2Q/iu/k8W7dnrBjGh3WDYM6zzjwl/hYaD5lf7 y6goPP1NOQS2A6NAJeYB940/671T/vBUuaPmFsTG14dfit332MzOg+ULugdWvczeLPkh fBqQ== 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:feedback-id:references :in-reply-to:message-id:from:to:dkim-signature:date:delivered-to; bh=7tk6Zu14ZTxaL7e96aHi8I2IG9Dk8dVnyDyzPMFSePU=; b=WkwbojvJXJXSN1BNRABjDiUonYQevyWDEz8GtxjhmjZKODclmj4JSu9kKCV8EKUXcX MbDd91HCg5qsOQ+xVSbB5YmcMCeJ8zugv+y1k7b1EqOMLI03jRh+sD5CZUBfzJkEO/Px jTK1/waMhrZjUX3UmJDahUqJ7fSZmaXcsGRdkX/R9Fj9Cdcbu2Xz4tRcJsiNdZtBDgQK Dfm31c+8mUGbYFTlJWgRG/ZVctlvLNbmUYdlw53ZwVZQZWmXht6BlCaGD+bzJ62THEu/ vnrk7YgFOf03EzBIOgfzScfjbKhqwCvP8s+iJwMENyTsGxW+/MVxVAzmoqLma/qfZzY1 1Aag== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@zanevaniperen.com header.s=protonmail header.b=Q7JqOvE3; 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 g14si4044535edp.50.2020.03.07.06.16.20; Sat, 07 Mar 2020 06:16:20 -0800 (PST) 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=Q7JqOvE3; 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 E1A2B68AEC5; Sat, 7 Mar 2020 16:16:02 +0200 (EET) 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 45ECD68AEC5 for ; Sat, 7 Mar 2020 16:15:56 +0200 (EET) Date: Sat, 07 Mar 2020 14:15:50 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zanevaniperen.com; s=protonmail; t=1583590555; bh=NP28hD4GqTgnqf3T2mybDbuFOf5bNOqqjORA1qhvXuE=; h=Date:To:From:Cc:Reply-To:Subject:In-Reply-To:References: Feedback-ID:From; b=Q7JqOvE3gHUXHGEoxsU/Xl+Y6TqrTu048fyNYnm154g1Vx8vSBRCtF9NiEmp/gNYH SZMepFNSHi/wkW3vnl6p1rOVj8VWVnz19spPqj59Gbz17hzx8Q6bbLDDXNn0mB7Eg/ HYeL1hLJPxglofit0H1/3g6hiWFjJt9YWGx2J98I= To: ffmpeg-devel@ffmpeg.org From: Zane van Iperen Message-ID: <20200307141326.24374-3-zane@zanevaniperen.com> In-Reply-To: <20200307141326.24374-1-zane@zanevaniperen.com> References: <20200307141326.24374-1-zane@zanevaniperen.com> Feedback-ID: xylLYHwBzJW7F28tHN-oL9EBm6h5yqtCqG6YwPpJ2oMwBYJT6-HxTnFTF6p18axLiSywX61iUfj4CElBGg8-GA==:Ext:ProtonMail 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 v2 2/4] avformat: add demuxer for LEGO Racers' ALP format 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: a4wWdkfYEMU6 Content-Length: 9682 Signed-off-by: Zane van Iperen --- libavformat/Makefile | 1 + libavformat/allformats.c | 1 + libavformat/alp.c | 146 +++++++++++++++++++++++++++++++++++++++ libavformat/version.h | 4 +- 4 files changed, 150 insertions(+), 2 deletions(-) create mode 100644 libavformat/alp.c diff --git a/libavformat/Makefile b/libavformat/Makefile index e0681058a2..fbb29505ff 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -85,6 +85,7 @@ OBJS-$(CONFIG_AIFF_DEMUXER) += aiffdec.o pcm.o isom.o \ mov_chan.o replaygain.o OBJS-$(CONFIG_AIFF_MUXER) += aiffenc.o id3v2enc.o OBJS-$(CONFIG_AIX_DEMUXER) += aixdec.o +OBJS-$(CONFIG_ALP_DEMUXER) += alp.o OBJS-$(CONFIG_AMR_DEMUXER) += amr.o OBJS-$(CONFIG_AMR_MUXER) += amr.o OBJS-$(CONFIG_AMRNB_DEMUXER) += amr.o diff --git a/libavformat/allformats.c b/libavformat/allformats.c index 0209bf0e30..08012ea208 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -46,6 +46,7 @@ extern AVInputFormat ff_afc_demuxer; extern AVInputFormat ff_aiff_demuxer; extern AVOutputFormat ff_aiff_muxer; extern AVInputFormat ff_aix_demuxer; +extern AVInputFormat ff_alp_demuxer; extern AVInputFormat ff_amr_demuxer; extern AVOutputFormat ff_amr_muxer; extern AVInputFormat ff_amrnb_demuxer; diff --git a/libavformat/alp.c b/libavformat/alp.c new file mode 100644 index 0000000000..c0c7905380 --- /dev/null +++ b/libavformat/alp.c @@ -0,0 +1,146 @@ +/* + * LEGO Racers ALP (.tun & .pcm) demuxer + * + * Copyright (C) 2020 Zane van Iperen (zane@zanevaniperen.com) + * + * 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 "avformat.h" +#include "internal.h" +#include "libavutil/intreadwrite.h" +#include "libavutil/internal.h" + +#define ALP_TAG MKTAG('A', 'L', 'P', ' ') +#define ALP_MAX_READ_SIZE 4096 + +typedef struct ALPHeader { + uint32_t magic; /*< Magic Number, {'A', 'L', 'P', ' '} */ + uint32_t header_size; /*< Header size (after this). */ + char adpcm[6]; /*< "ADPCM" */ + uint8_t unk1; /*< Unknown */ + uint8_t num_channels; /*< Channel Count. */ + uint32_t sample_rate; /*< Sample rate, only if header_size >= 12. */ +} ALPHeader; + +static int alp_probe(const AVProbeData *p) +{ + uint32_t i; + + if (AV_RL32(p->buf) != ALP_TAG) + return 0; + + /* Only allowed header sizes are 8 and 12. */ + i = AV_RL32(p->buf + 4); + if (i != 8 && i != 12) + return 0; + + if (strncmp("ADPCM", p->buf + 8, 6) != 0) + return 0; + + return AVPROBE_SCORE_EXTENSION + 1; +} + +static int alp_read_header(AVFormatContext *s) +{ + int ret; + AVStream *st; + ALPHeader hdr; + AVCodecParameters *par; + + if ((hdr.magic = avio_rl32(s->pb)) != ALP_TAG) + return AVERROR_INVALIDDATA; + + hdr.header_size = avio_rl32(s->pb); + + if (hdr.header_size != 8 && hdr.header_size != 12) { + return AVERROR_INVALIDDATA; + } + + if ((ret = avio_read(s->pb, hdr.adpcm, sizeof(hdr.adpcm))) < 0) + return ret; + else if (ret != sizeof(hdr.adpcm)) + return AVERROR(EIO); + + if (strncmp("ADPCM", hdr.adpcm, sizeof(hdr.adpcm)) != 0) + return AVERROR_INVALIDDATA; + + hdr.unk1 = avio_r8(s->pb); + hdr.num_channels = avio_r8(s->pb); + + if (hdr.header_size == 8) { + /* .TUN music file */ + hdr.sample_rate = 11025 * hdr.num_channels; + } else { + /* .PCM sound file */ + hdr.sample_rate = avio_rl32(s->pb); + } + + if (hdr.sample_rate > 44100) { + avpriv_request_sample(s, "Sample Rate > 44100"); + return AVERROR_PATCHWELCOME; + } + + if (!(st = avformat_new_stream(s, NULL))) + return AVERROR(ENOMEM); + + par = st->codecpar; + par->codec_type = AVMEDIA_TYPE_AUDIO; + par->codec_id = AV_CODEC_ID_ADPCM_IMA_ALP; + par->format = AV_SAMPLE_FMT_S16; + par->sample_rate = hdr.sample_rate; + par->channels = hdr.num_channels; + + if (hdr.num_channels == 1) + par->channel_layout = AV_CH_LAYOUT_MONO; + else if (hdr.num_channels == 2) + par->channel_layout = AV_CH_LAYOUT_STEREO; + else + return AVERROR_INVALIDDATA; + + par->bits_per_coded_sample = 4; + par->bits_per_raw_sample = 16; + par->block_align = 1; + par->bit_rate = par->channels * + par->sample_rate * + par->bits_per_coded_sample; + + avpriv_set_pts_info(st, 64, 1, par->sample_rate); + return 0; +} + +static int alp_read_packet(AVFormatContext *s, AVPacket *pkt) +{ + int ret; + AVCodecParameters *par = s->streams[0]->codecpar; + + if ((ret = av_get_packet(s->pb, pkt, ALP_MAX_READ_SIZE)) < 0) + return ret; + + pkt->flags &= ~AV_PKT_FLAG_CORRUPT; + pkt->stream_index = 0; + pkt->duration = ret * 2 / par->channels; + + return 0; +} + +AVInputFormat ff_alp_demuxer = { + .name = "alp", + .long_name = NULL_IF_CONFIG_SMALL("LEGO Racers ALP"), + .read_probe = alp_probe, + .read_header = alp_read_header, + .read_packet = alp_read_packet +}; diff --git a/libavformat/version.h b/libavformat/version.h index 4724269b3c..a233b67351 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -32,8 +32,8 @@ // Major bumping may affect Ticket5467, 5421, 5451(compatibility with Chromium) // Also please add any ticket numbers that you believe might be affected here #define LIBAVFORMAT_VERSION_MAJOR 58 -#define LIBAVFORMAT_VERSION_MINOR 39 -#define LIBAVFORMAT_VERSION_MICRO 101 +#define LIBAVFORMAT_VERSION_MINOR 40 +#define LIBAVFORMAT_VERSION_MICRO 100 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ LIBAVFORMAT_VERSION_MINOR, \ From patchwork Sat Mar 7 14:15: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: 18080 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 84F0144A12F for ; Sat, 7 Mar 2020 16:16:12 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6C4B668AEB6; Sat, 7 Mar 2020 16:16:12 +0200 (EET) 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 B424C6898A1 for ; Sat, 7 Mar 2020 16:16:05 +0200 (EET) Date: Sat, 07 Mar 2020 14:15:55 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zanevaniperen.com; s=protonmail; t=1583590565; bh=0nDxsuOcuz2dSUgVc8n2zVH7FxztcDuM35/OKCr32Cg=; h=Date:To:From:Cc:Reply-To:Subject:In-Reply-To:References: Feedback-ID:From; b=HbecrmkYIMzbaQSAX7xb2SHxzmREYDqB3hmxI5T5TZSRKebENKm0VLgp+Z5Ct5Jq9 dvmyGzGy1I3dU9xzBmluPZXW6WOSVRZVlXiqF3hB3XD/j1Eq7Va+D2tGKksNSxldT1 MhU/eLtLS1kABhrFDLrkY5tfsAcqtVrM/OGDw2TM= To: ffmpeg-devel@ffmpeg.org From: Zane van Iperen Message-ID: <20200307141326.24374-4-zane@zanevaniperen.com> In-Reply-To: <20200307141326.24374-1-zane@zanevaniperen.com> References: <20200307141326.24374-1-zane@zanevaniperen.com> Feedback-ID: xylLYHwBzJW7F28tHN-oL9EBm6h5yqtCqG6YwPpJ2oMwBYJT6-HxTnFTF6p18axLiSywX61iUfj4CElBGg8-GA==:Ext:ProtonMail 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 v2 3/4] changelog: add adpcm_ima_alp decoder and alp 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 Cc: Zane van Iperen Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Zane van Iperen --- Changelog | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Changelog b/Changelog index cb310a3abc..0503069daa 100644 --- a/Changelog +++ b/Changelog @@ -43,7 +43,8 @@ version : - Rayman 2 ADPCM decoder - Rayman 2 APM demuxer - cas video filter - +- High Voltage Software ADPCM decoder +- LEGO Racers ALP (.tun & .pcm) demuxer version 4.2: - tpad filter From patchwork Sat Mar 7 14:16:00 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: 18081 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 4FF4144A12F for ; Sat, 7 Mar 2020 16:16:18 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3B37968B022; Sat, 7 Mar 2020 16:16:18 +0200 (EET) 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 58EEB68B029 for ; Sat, 7 Mar 2020 16:16:11 +0200 (EET) Date: Sat, 07 Mar 2020 14:16:00 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zanevaniperen.com; s=protonmail; t=1583590570; bh=RupfTPR50O61h6Bj/+gMsZzUqxfXVbcIx7Z/5gEuWUA=; h=Date:To:From:Cc:Reply-To:Subject:Feedback-ID:From; b=emcZJDnvb4BRtj4cFErsPM20FwzDzmGr9a2Aht6qkhX057oRGoQ5/2CvkImND7CUG 9LibOHEV0PYcj0C2iyAh99jQbERtduAxMh0S0aJpQSiMwis+gwY1kvcCZB/oO4zlQ0 74YaIgFSszTWQoBs+CLWZeIBxcSoibk3l/l974aw= To: ffmpeg-devel@ffmpeg.org From: Zane van Iperen Message-ID: <20200307141326.24374-5-zane@zanevaniperen.com> Feedback-ID: xylLYHwBzJW7F28tHN-oL9EBm6h5yqtCqG6YwPpJ2oMwBYJT6-HxTnFTF6p18axLiSywX61iUfj4CElBGg8-GA==:Ext:ProtonMail 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 v2 4/4] doc: add adpcm_ima_alp 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 | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/general.texi b/doc/general.texi index dbdc348598..87eaad7791 100644 --- a/doc/general.texi +++ b/doc/general.texi @@ -1100,6 +1100,7 @@ following image formats are supported: @item ADPCM IMA Electronic Arts EACS @tab @tab X @item ADPCM IMA Electronic Arts SEAD @tab @tab X @item ADPCM IMA Funcom @tab @tab X +@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 @tab X @item ADPCM IMA Ubisoft APM @tab @tab X