From patchwork Sun Mar 15 10:37: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: 18197 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 1078A442B2C for ; Sun, 15 Mar 2020 12:38:07 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C4FA368B2E0; Sun, 15 Mar 2020 12:38:06 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1D5D768B0BD for ; Sun, 15 Mar 2020 12:38:00 +0200 (EET) Received: by mail-wr1-f46.google.com with SMTP id r15so17577170wrx.6 for ; Sun, 15 Mar 2020 03:38: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; bh=psY0TzfmpHl6xm2gXM+tKugjqosr4Spn/4OpOREtuYk=; b=df1yOgKdx7sVU23YLITYvA842aD+LPsdpb5iS2g440hO+DFwWHu4f0Ncthvzhpdyc8 MhISQskkI2DvILql6BE+O9T4/YjytIS6EVb7tWiBpy1sbaa6rDMptEXJCTr7PB+asp5Q 8dzHLcYvB5xHiYVd1kARuWYQ6ShHA57KkFf8PZBrY2sOPkXn2THfFTxxhhlbW9x1Vwbd nhQja2/EJ327v576P5s3iCyg1UjXls0ZKsDrUlWlLGrX/R2XzsTJaZgDKEepSfatdqsj ts6SRb3KQS2vX46XlLQ8od/PKGXd+kzE89yUtGd5rBDB5JlCFNgoCYUgN9BIiUcXoxxM U0eA== 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=YqjpBH2JlwbMn79dezKJxJsjsIcDV/xIOS+XQ1L18jC8EM1YyEi1zQ7EYsyP7s1AQ9 p4bkqPdlcaDzWeKI/+6SepUIxpWskL+/nOlyMwip9PzGDwliAYzOhJiAxlZKJhADrySs fuSOUAs19iRAHZ1Bn8NrYanLZkdY1E63GLZIOEwhBHfAJc8nmYkpP/FfKwjfjwKHXUQB RK1reEKiAtAMHxlddD7Ookjk4ZHQ/WJm2dqes98h7v7zNqAO9TYWwN4q6zYP62h/0ZCI K+Kj92FWql3BvYCadO+jBzqMprTCKlzw5m9rv+6ZoPyE8E2Re0/8fyNvGEBIxNjJ28zG OOKg== X-Gm-Message-State: ANhLgQ274E/gMl4E4dGWVpdclt0F8xsrLVnGeVRyJN5yslJBk/RB2oI1 twQgaYiRMUgbe32DGTiwfu0lnbJo X-Google-Smtp-Source: ADFU+vvbLs17pAVcjFmqRF/jJ++n39v7D7LAHHsoF0Ne/Hrq+g9yJBuWqLtbU8DblgcI+yyZ1pLVWw== X-Received: by 2002:adf:de8b:: with SMTP id w11mr24914454wrl.258.1584268679157; Sun, 15 Mar 2020 03:37:59 -0700 (PDT) Received: from localhost.localdomain ([37.244.240.19]) by smtp.gmail.com with ESMTPSA id x17sm24456209wmi.28.2020.03.15.03.37.57 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Mar 2020 03:37:58 -0700 (PDT) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Sun, 15 Mar 2020 11:37:44 +0100 Message-Id: <20200315103748.2849-1-onemda@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH 1/5] 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 Sun Mar 15 10:37: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: 18198 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 EF03B443112 for ; Sun, 15 Mar 2020 12:38:07 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CEF2568B314; Sun, 15 Mar 2020 12:38:07 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 71E4868B0BD for ; Sun, 15 Mar 2020 12:38:01 +0200 (EET) Received: by mail-wr1-f65.google.com with SMTP id f3so10564065wrw.7 for ; Sun, 15 Mar 2020 03:38: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=zf0SOEFT08l2beb8euvRRe85nee9eR0TSQ+Wx4EqHBQ=; b=MyJ4Y4OyBNBiid+tH+6iyDc4Zzp5Azz2bt7DMJdZx9uwiAFpXPBp0c90+6yiqXbSTn HQ6sZebAdIxFCJIvcmrgju8UO0RQFfNYID4HD3NUjv7slIO5yjaTuSNW2JTPuZVhaHp+ O5nccc3VBEfyhz8yTLTsFOhSOq9x/HXDq60Pd/uxpM3CBadKxz5mZFWN/YOSzjkKpQYy +XY6u0VSvUmgRuOY7J69evYvAqDewuvlsjPz2zO4w8ixyprNvDoY/nP15xoRHsl1PGlf oU1LZiwsbUA9NEuqQJEpzYrRynRtismHvvS15vp15KY0WXq9Ya3U9QlGC/GYiWf95nqm kHZw== 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=RJ2gT67IwLEa9EfKW6nvNEFGDydx2zhy3Dm+SejQMUbDPu3qW49AnyF+HZkCKcA8cG x0JFW2NpG/mgFYq6SEA7FBbrlTNgjhvqjcUwJ8ub6zR10i8L9YJP0WV//5e38d35PROu 835limiFNCcSDHJ7C0zqWy5R1dPdZLWH+cOwW49P1PKda5OW1uMHAk/v3EhH+4tUEQ3M n/Gnd1aEsGtrJmn60JDzGJnR7vqVlq+V/ENSTb51i3tcFUj+Ksey88pLZ7jhkWzLAPP4 XKKyA8s9pzgRiDdszuJbtN0eEL/wYOBkqqxujRQ2XTaCH2ThMhoJZZpD/44KjFGgzcVg 33CA== X-Gm-Message-State: ANhLgQ15S02THzP9I3RD+9tlC7wb37t/KhGi5nGVnBPvSUcgDLayI6d9 Sqke73Qd2MkIZlN94r2SAS8eC2/W X-Google-Smtp-Source: ADFU+vulTmCyvhBHZOj6uNDSlNoOjmjcJhxQEBkMmk/eo7nATjQTrssLOiOqr1GzXSIgqoZzezslww== X-Received: by 2002:a05:6000:1212:: with SMTP id e18mr12891133wrx.371.1584268680467; Sun, 15 Mar 2020 03:38:00 -0700 (PDT) Received: from localhost.localdomain ([37.244.240.19]) by smtp.gmail.com with ESMTPSA id x17sm24456209wmi.28.2020.03.15.03.37.59 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Mar 2020 03:37:59 -0700 (PDT) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Sun, 15 Mar 2020 11:37:45 +0100 Message-Id: <20200315103748.2849-2-onemda@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200315103748.2849-1-onemda@gmail.com> References: <20200315103748.2849-1-onemda@gmail.com> Subject: [FFmpeg-devel] [PATCH 2/5] 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 Sun Mar 15 10:37: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: 18199 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 AFB45447D4B for ; Sun, 15 Mar 2020 12:38:08 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9F77968B366; Sun, 15 Mar 2020 12:38:08 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BB18468B1E9 for ; Sun, 15 Mar 2020 12:38:02 +0200 (EET) Received: by mail-wr1-f41.google.com with SMTP id s5so17609666wrg.3 for ; Sun, 15 Mar 2020 03:38: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=r/U83AFPxH1brU0Y+iot7lPewroX4bDANvLTOiucj9o=; b=QrFQ+lv1SZbXvZwZFJZ9kQ7URposaQKPm5K373uQZichbhRc54NyF+AxPfRi6JgE8+ NizTuP3p7UlMeTLTB5vi/OhazmDnO4jlzf+BjR5/A7elFEPVSrUEIdzr3sEGTqr9SP/q kfaiGZOhloVS9R9HrllykmIu+sQRGqoeorqBl3GlE2PABBrfCKhZUIpDrKt0ggTJiJd0 XC0oZEM7GVTIqsq9pjTiiAZqtKaS+lzKlnbGyFVQEC2Dc/maOlGVV/lDiOzGR41Ze+Nf JY1bvA16F8E45Ktc8rkMOumrsZNGgLcSSHV/cYcivRIPkFU7F+GqkEQoWU4O5it+ABd9 e4qg== 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=GHcPRUhb9+ROIw33tAJtPXz+20hn8bK0Q9xVdfxO95swsnTOrHNCgtG6IQVrKOIBxA TJFQiS7eYd6U1lc31KtkbB2e5ogmHa6FfvCJBD2AQ48E/X2xouT+0ulHgENUI/MA5Rdy 6fymuqSqDlKVUzdDeB/vdoE9L8y48JlqI+IXm4V2duRTYEU/6YfknKIrRMQoh+/vXa3c QsrU6fy7TXFpZFfdxciupRAnXU8aOXtx10c4cptx6MjymR/n+233oVETjbAZKzU9NokC JvDpN4EsTEwz81hI+Fm1013zTCuS+v61EBXgfwnDuXizzU0f57lHu9rxGKtiyp+nJS3s dthQ== X-Gm-Message-State: ANhLgQ2S+eSktGaJPKfC0ghGATHn6yLmXBZjoBQIZjF45TCjK863e43p 0z6bHlTu9YY8A9mKPIReogC+gOND X-Google-Smtp-Source: ADFU+vsUn1yCOk7rMafvPJjTgYOdWeNO95Db/sxD7lf5D/jpDI+UdfRkzuwoZ3V6rNPDt0TM2pFRbg== X-Received: by 2002:adf:e60b:: with SMTP id p11mr21702726wrm.140.1584268681847; Sun, 15 Mar 2020 03:38:01 -0700 (PDT) Received: from localhost.localdomain ([37.244.240.19]) by smtp.gmail.com with ESMTPSA id x17sm24456209wmi.28.2020.03.15.03.38.00 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Mar 2020 03:38:01 -0700 (PDT) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Sun, 15 Mar 2020 11:37:46 +0100 Message-Id: <20200315103748.2849-3-onemda@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200315103748.2849-1-onemda@gmail.com> References: <20200315103748.2849-1-onemda@gmail.com> Subject: [FFmpeg-devel] [PATCH 3/5] 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 Sun Mar 15 10:37: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: 18200 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 AAABD44B0ED for ; Sun, 15 Mar 2020 12:38:10 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 96ABB68B386; Sun, 15 Mar 2020 12:38:10 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0849768B372 for ; Sun, 15 Mar 2020 12:38:04 +0200 (EET) Received: by mail-wr1-f65.google.com with SMTP id 6so17559324wre.4 for ; Sun, 15 Mar 2020 03:38:04 -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=e1h+HgXLsfwqwuoAjVaA9tPMkzAnXm5A13M+/VqJCu8719obAc47sDwxsoW55y2GTv JRtGsljUa+RIfuNaPqxjfb69557oqulzgfkX9HvSNQ3Juxsl99+ZzsxafGc5HiyDpmw4 fKOSX/ZJmpco1FFwI7nVzN9UVmv9d5DI4dYXRNz76nuIYoJloQ0M82wpsbnhlCeEDFBZ z9HCuW85WNQ/vtoCXW0oLbDApL+lQDUsZ+cdIm1uFXNmp806Q3+5sZdvL7aiB1Ou1+r9 RBZ3cGiIcDJYfK/ZNtt7dmV8J9W8Kk3Z4Mwx6vBvaa1oII26MAWUMAAx6DW8DWUif+ra wHOw== 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=PxZ3Dg+N/nQS4C/9seOc/3vfYqPiVLoDjSwAI0CBC+JBjhVSJwypkEOlXIg69pNjEb E2uJqMWBuEADEQG9726JGknAuNbZPtibxEzx7HDv00ve/cFTzW79I3Wu6+E4crtYB5UF 4AJqAtHmYNtwkf4wdKHcOStPC8kP9CYvLC+K2iPtSyPaUo8OSBgOfjOndvYH1VJOrULP TC9m+4xjhTewohy6r1VjbD7du4kic2J8Eknuqsxb7EEis+uKU9fkmwIIfHfdjql5bawo xv7iU1TVSHWxDenI+g0NpcXU4e9xkDV3RcR8G63eHstXfgdtFc9snpnykQ65U+2AMZ2T ERdw== X-Gm-Message-State: ANhLgQ0om6nbhUC3+1a3qQ7H1insU48sS/IEW3oe980xTXY1At7gsdVQ pG0aUbFurlIKRconbvj/V816gsq+ X-Google-Smtp-Source: ADFU+vtfOrwl8kZPBIhcq9Zv06MQ3s1IyIUJF2dE1clwGi0V+qWsmqJ04qsdGgRl2KEByxKS4f8nyg== X-Received: by 2002:adf:9307:: with SMTP id 7mr29068218wro.171.1584268683097; Sun, 15 Mar 2020 03:38:03 -0700 (PDT) Received: from localhost.localdomain ([37.244.240.19]) by smtp.gmail.com with ESMTPSA id x17sm24456209wmi.28.2020.03.15.03.38.01 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Mar 2020 03:38:02 -0700 (PDT) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Sun, 15 Mar 2020 11:37:47 +0100 Message-Id: <20200315103748.2849-4-onemda@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200315103748.2849-1-onemda@gmail.com> References: <20200315103748.2849-1-onemda@gmail.com> Subject: [FFmpeg-devel] [PATCH 4/5] 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 Sun Mar 15 10:37: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: 18201 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 7B02D44B0ED for ; Sun, 15 Mar 2020 12:38:11 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 633A668B3C2; Sun, 15 Mar 2020 12:38:11 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9AAA168B3A5 for ; Sun, 15 Mar 2020 12:38:05 +0200 (EET) Received: by mail-wr1-f65.google.com with SMTP id s5so17609755wrg.3 for ; Sun, 15 Mar 2020 03:38: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=mEcknqcLmGFt5RuJwuTHXDBg/6QkzpycFwH26IxS4bA=; b=lFzY2wuFMpXtVWoLM6xlrtfbJrgU18A6rlI8fmBfbRwOAlDBrrT9KUcbmSYrbcHspX TJCyki5XtVDq8hyb1VNy13pMp5fMKD/jz78nMBpvATj1rppEue/LC2LzVB3X/UlW0j94 ng574LolmZUgM+AmfhikFOxLSmn4W3f+u1vw601B91UUn3cjIm/3zTQ6q28QVGmiiHtR 0mT8eh/YY+vUjp163B4uSOfL7NiO9KzfIt/iW5cKbHzpBc38iASR+7mr92ZARBBFRBxk KGE8hZsHpX4kQAoX+TcxaiXGL0s2hiuKeY1s0PQTXQz34jMrkgY/0A6x1jDAGx0mWP12 GasA== 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=EclMAHOEnWZIKCM0v7cGgCZzL3GsV73h1PSB3N73Zype3yOKBfTeN44uqonTblrE1x 6VpI7ZPeO97vePIDTqYzbjM4xs+4MiYRSwEl0qScz7i9HbVu3Cjq+B6i7TCFMJ1iakva FoGPHjZrer/b7NC1fBcklicaykGrUig5oPFzQ/s9dVLC/VrzCA5nlfA0wvYG6V8WpLW5 YVeA4yNM7iixW7yn3E12zV4zjN9nDUWnVVoH11+kizeEMxEpC7Uc8IOuFMSSNt28CdrV nv8uVL0eGv9JQnz9yqcWtX0qsAua/EGAQBrglKy/41VS9PgnHCMO3CzsZ5p68ZMgiDY0 OiVw== X-Gm-Message-State: ANhLgQ19DQd+LTcmRVmGnl8DOtXcYyPIX5dUgUNUbCQkHQTWLKW+dAV9 54wik9WGOqru6Mk6ZMPoEi24Qlyu X-Google-Smtp-Source: ADFU+vtI85TiQ+xyg3hMczAXK5vJGekHUedEirlPrUTt7jzbnCQUGMNa1K8NxOOvkMMI2tQRLjN8UQ== X-Received: by 2002:adf:fa8d:: with SMTP id h13mr19922389wrr.155.1584268684951; Sun, 15 Mar 2020 03:38:04 -0700 (PDT) Received: from localhost.localdomain ([37.244.240.19]) by smtp.gmail.com with ESMTPSA id x17sm24456209wmi.28.2020.03.15.03.38.03 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Mar 2020 03:38:04 -0700 (PDT) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Sun, 15 Mar 2020 11:37:48 +0100 Message-Id: <20200315103748.2849-5-onemda@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200315103748.2849-1-onemda@gmail.com> References: <20200315103748.2849-1-onemda@gmail.com> Subject: [FFmpeg-devel] [PATCH 5/5] 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;