From patchwork Mon Oct 19 22:44: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: 23094 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 D784244A381 for ; Tue, 20 Oct 2020 01:44:28 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BE53F68B674; Tue, 20 Oct 2020 01:44:28 +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 2E32868B66F for ; Tue, 20 Oct 2020 01:44:22 +0300 (EEST) Date: Mon, 19 Oct 2020 22:44:10 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zanevaniperen.com; s=protonmail2; t=1603147461; bh=KnM3OTPrHj/ChAxWztcm8t80NEF0I7mQCf8/kJo4s9E=; h=Date:To:From:Cc:Reply-To:Subject:In-Reply-To:References:From; b=Q12Cxei9eTREKlMcAxlNb1RYUzkJegxTVw/rKRVi2SyFcGBRnlSv1J36RvXeTQjlJ wN7cbloTfW4HO1g2RQKS+vaC+P3o2BxqscwqG4KkgXKXSC1A9tt7iMnsogn4vaQNbf 2+TqOmkGF8RuJet7k9A//470ZHmP0B+TtLIMHHx5Z92IB84HU8Kh3b1xMUPab02Grp ciQ8Tpa75NA5ye4Nw3Jk8fo6qQkxQjbW1VazqkYOU0Ye1dBljE4NM31E9S+prdJhqF po7IX51r0etvhmwZrwLEGewpExS77u5ysJmxJwe9UAyUglp9I519isxrMwDHxVyxx9 LdjJ8hZA/aEMg== To: ffmpeg-devel@ffmpeg.org From: Zane van Iperen Message-ID: <20201019224335.11874-2-zane@zanevaniperen.com> In-Reply-To: <20201019224335.11874-1-zane@zanevaniperen.com> References: <20201019224335.11874-1-zane@zanevaniperen.com> MIME-Version: 1.0 X-Spam-Status: No, score=-1.2 required=10.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 mailout.protonmail.ch Subject: [FFmpeg-devel] [PATCH v2 1/6] avformat/riff: prevent muxing adpcm_swf with a variable block size 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" Prefer to error than to create a broken file. Closes ticket #5829. Effectively disables remuxing adpcm_swf from flv -> wav. Signed-off-by: Zane van Iperen --- libavformat/riffenc.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libavformat/riffenc.c b/libavformat/riffenc.c index 04a21fcffa..33e0b6fc0a 100644 --- a/libavformat/riffenc.c +++ b/libavformat/riffenc.c @@ -65,6 +65,12 @@ int ff_put_wav_header(AVFormatContext *s, AVIOContext *pb, if (!par->codec_tag || par->codec_tag > 0xffff) return -1; + if (par->codec_id == AV_CODEC_ID_ADPCM_SWF && par->block_align == 0) { + av_log(s, AV_LOG_ERROR, "%s can only be written to WAVE with a constant frame size\n", + avcodec_get_name(s->streams[0]->codecpar->codec_id)); + return AVERROR(EINVAL); + } + /* We use the known constant frame size for the codec if known, otherwise * fall back on using AVCodecContext.frame_size, which is not as reliable * for indicating packet duration. */ From patchwork Mon Oct 19 22:44:20 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: 23095 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 3D94944A381 for ; Tue, 20 Oct 2020 01:44:39 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1F27A68B6F8; Tue, 20 Oct 2020 01:44:39 +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 7B1B468B6D0 for ; Tue, 20 Oct 2020 01:44:33 +0300 (EEST) Date: Mon, 19 Oct 2020 22:44:20 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zanevaniperen.com; s=protonmail2; t=1603147472; bh=cWizECEinNbSqn4TsxyZdmWoDJ5gzABzlBivSyFzHS4=; h=Date:To:From:Cc:Reply-To:Subject:In-Reply-To:References:From; b=dCUR6qq43mLvkKHDOE9qfZOeUbO0mQFoN/7F5rJMT+ZwGrAknW06/0Enixamn6f2R a9ICDbtxo3XXYMzsGZRHM8WyUJmxR0eX3GNpNDww8nz4Ljo895MQV11lqCfOeQOxIW lQXjww9zyBP5WryAMYQPbOCRNnGqJkE8N1BWv5bpaTGRba2P44uuaeP9rEJZxqxsDV oiix+KvWPBeoFKFyU/JqU1sSdfHktUirUo+PfU6AWyy9W54JVTvunVnlLQuKbSHJZM BFnKIhYFHZiQiasMkqUiFCWnEypJbIrdWw/R7U8tXK+vDStu69WIsACXds9xbeVKwC xSGtLmoWjd3DQ== To: ffmpeg-devel@ffmpeg.org From: Zane van Iperen Message-ID: <20201019224335.11874-3-zane@zanevaniperen.com> In-Reply-To: <20201019224335.11874-1-zane@zanevaniperen.com> References: <20201019224335.11874-1-zane@zanevaniperen.com> MIME-Version: 1.0 X-Spam-Status: No, score=-1.2 required=10.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 mailout.protonmail.ch Subject: [FFmpeg-devel] [PATCH v2 2/6] avcodec/adpcm_swf: support decoding multiple fixed-sized blocks at once 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" For incoming packets from WAV. Signed-off-by: Zane van Iperen --- libavcodec/adpcm.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c index f7da3dcf89..fef1e6714c 100644 --- a/libavcodec/adpcm.c +++ b/libavcodec/adpcm.c @@ -880,7 +880,7 @@ static int get_nb_samples(AVCodecContext *avctx, GetByteContext *gb, } case AV_CODEC_ID_ADPCM_SWF: { - int buf_bits = buf_size * 8 - 2; + int buf_bits = (avctx->block_align ? avctx->block_align : buf_size) * 8 - 2; int nbits = (bytestream2_get_byte(gb) >> 6) + 2; int block_hdr_size = 22 * ch; int block_size = block_hdr_size + nbits * ch * 4095; @@ -889,6 +889,9 @@ static int get_nb_samples(AVCodecContext *avctx, GetByteContext *gb, nb_samples = nblocks * 4096; if (bits_left >= block_hdr_size) nb_samples += 1 + (bits_left - block_hdr_size) / (nbits * ch); + + if (avctx->block_align) + nb_samples *= buf_size / avctx->block_align; break; } case AV_CODEC_ID_ADPCM_THP: @@ -1767,9 +1770,17 @@ static int adpcm_decode_frame(AVCodecContext *avctx, void *data, } break; case AV_CODEC_ID_ADPCM_SWF: - adpcm_swf_decode(avctx, buf, buf_size, samples); + { + const int nb_blocks = avctx->block_align ? avpkt->size / avctx->block_align : 1; + const int block_size = avctx->block_align ? avctx->block_align : avpkt->size; + + for (int block = 0; block < nb_blocks; block++) { + adpcm_swf_decode(avctx, buf + block * block_size, block_size, samples); + samples += nb_samples / nb_blocks; + } bytestream2_seek(&gb, 0, SEEK_END); break; + } case AV_CODEC_ID_ADPCM_YAMAHA: for (n = nb_samples >> (1 - st); n > 0; n--) { int v = bytestream2_get_byteu(&gb); From patchwork Mon Oct 19 22:44:39 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: 23096 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 BB20444A381 for ; Tue, 20 Oct 2020 01:45:00 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A575168B603; Tue, 20 Oct 2020 01:45:00 +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 D2E0768B603 for ; Tue, 20 Oct 2020 01:44:52 +0300 (EEST) Date: Mon, 19 Oct 2020 22:44:39 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zanevaniperen.com; s=protonmail2; t=1603147492; bh=Cc6brOBYCVmadrormjgzPWIPV2MF+YlP+7yc885vEnI=; h=Date:To:From:Cc:Reply-To:Subject:From; b=wtDmeAa4JbX1EpANczam0QqBX2hl2BxSC6DPdI6ub3QvgLczI0L5DT9qU6NrgIb0M LB+/EGZ0qPhSb1AwzGNPQ2sAR/nh19xAT9pWkt4tB8XmmSis1DOwqopjaMVbc+Evms B0EZGrxcNVi2F3tLsT2ri4WBHE3WYcKiIR/XvQG4uJW56fMxSVawZetm8pQPaJUv/r VG+TJ/88nwtPgSg1oAhmdCBVz3Rdb68ImgSBh/pZNtTETQD45YJrjKzc+F81bptDWx De1R86XF6pDV44M/iqo58PM8jNpH5HppgPmxAXt1JnKxFi/mTeZb4sCMTPxkcFkBM4 AoH80O6E/ofzA== To: ffmpeg-devel@ffmpeg.org From: Zane van Iperen Message-ID: <20201019224335.11874-4-zane@zanevaniperen.com> MIME-Version: 1.0 X-Spam-Status: No, score=-1.2 required=10.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 mailout.protonmail.ch Subject: [FFmpeg-devel] [PATCH v2 3/6] avcodec/adpcm_swf: set block_align when encoding 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" Allows it to be muxed to WAVs. Signed-off-by: Zane van Iperen --- libavcodec/adpcmenc.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/libavcodec/adpcmenc.c b/libavcodec/adpcmenc.c index b2be83b84e..5b485e7d26 100644 --- a/libavcodec/adpcmenc.c +++ b/libavcodec/adpcmenc.c @@ -154,6 +154,7 @@ static av_cold int adpcm_encode_init(AVCodecContext *avctx) return AVERROR(EINVAL); } avctx->frame_size = 512 * (avctx->sample_rate / 11025); + avctx->block_align = (2 + avctx->channels * (22 + 4 * (avctx->frame_size - 1)) + 7) / 8; break; case AV_CODEC_ID_ADPCM_IMA_SSI: avctx->frame_size = s->block_size * 2 / avctx->channels; @@ -550,9 +551,7 @@ static int adpcm_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, samples_p = (int16_t **)frame->extended_data; st = avctx->channels == 2; - 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 || + 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 From patchwork Mon Oct 19 22:44:49 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: 23098 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 679F144A381 for ; Tue, 20 Oct 2020 01:45:03 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4B9DF68B649; Tue, 20 Oct 2020 01:45:03 +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 7EE4068B703 for ; Tue, 20 Oct 2020 01:45:01 +0300 (EEST) Date: Mon, 19 Oct 2020 22:44:49 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zanevaniperen.com; s=protonmail2; t=1603147500; bh=puJ0pSzwpeAA1sdubJVdFr7qzT0932NCCrTNw/DLYt4=; h=Date:To:From:Cc:Reply-To:Subject:From; b=iutwg+B13kctNdQTRw61IrHoDfyzCVEdoU2pyQKHKOiGV5UICDUi4TLFRiBmara6p e53/0JB1uwV8Uw0oHcHaJB80SVYRgEaCVINJhHRcqLXppdyuZcvXNhQyA01t9o7UjM nuAdq/QB/tRouWfuZ5bIAxZuLJlxK6G3HSPPzMVcOiDZvazAurn7aMMc1hVfx/edgD Fc8qx5T5B0/wkDrsikNH+BCx1HZvtuY84ia6BR/89+S6dSqkZkQQZi9rebFh/Om9Dw 2iuPbDxw/gBaf1Jy/owdopm1lK5FUYuPLIrK+j2uyahXzTvfCr2Wr3GRzXo5k2DRrs kYyp6CQXtm73A== To: ffmpeg-devel@ffmpeg.org From: Zane van Iperen Message-ID: <20201019224335.11874-5-zane@zanevaniperen.com> MIME-Version: 1.0 X-Spam-Status: No, score=-1.2 required=10.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 mailout.protonmail.ch Subject: [FFmpeg-devel] [PATCH v2 4/6] avcodec/adpcm_swf: support custom block size for encoding 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/adpcmenc.c b/libavcodec/adpcmenc.c index 5b485e7d26..42b83c2b48 100644 --- a/libavcodec/adpcmenc.c +++ b/libavcodec/adpcmenc.c @@ -153,7 +153,7 @@ static av_cold int adpcm_encode_init(AVCodecContext *avctx) "22050 or 44100\n"); return AVERROR(EINVAL); } - avctx->frame_size = 512 * (avctx->sample_rate / 11025); + avctx->frame_size = (s->block_size / 2) * (avctx->sample_rate / 11025); avctx->block_align = (2 + avctx->channels * (22 + 4 * (avctx->frame_size - 1)) + 7) / 8; break; case AV_CODEC_ID_ADPCM_IMA_SSI: From patchwork Mon Oct 19 22:45:01 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: 23099 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 B005C44AF10 for ; Tue, 20 Oct 2020 01:45:19 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 994F668B698; Tue, 20 Oct 2020 01:45:19 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-40136.protonmail.ch (mail-40136.protonmail.ch [185.70.40.136]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 67B8768AE41 for ; Tue, 20 Oct 2020 01:45:12 +0300 (EEST) Date: Mon, 19 Oct 2020 22:45:01 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zanevaniperen.com; s=protonmail2; t=1603147511; bh=qs8wx177x00UV18pWUFVyzc/wQjl/Nil+tKBRV7aHHU=; h=Date:To:From:Cc:Reply-To:Subject:From; b=4wfojyj+3X1KzA2CR2n8eRO4L/+RiuLgzFpT2oWLXoYy1RnBRNFicFquK2SnqTqWQ ybUPkQxuwq7ouYnh7KuZIOvII4eHleuNQnlMq1G7GO2h9NzRRE9sJcjVairhmEJIa6 +Fel4k0mmpaxrocVKyGZa3QRBhceawZHV9vBHmpZi7LVPSA0WkOFsoufdIAcIQoiGa P1/jsFXxgZFaMkMMl1Ka2ypFtZ4z/EmFADsHHdrprAWTuyqvYZplFUu0Olsls9J2HY ng7r4K/4p+PmKj3bqGllMZS8zszWteTuJf+6aCodUNiqD6YBnwgeh9SjeHOW9xErlI N2edbwN98kxRQ== To: ffmpeg-devel@ffmpeg.org From: Zane van Iperen Message-ID: <20201019224335.11874-6-zane@zanevaniperen.com> MIME-Version: 1.0 X-Spam-Status: No, score=-1.2 required=10.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 mailout.protonmail.ch Subject: [FFmpeg-devel] [PATCH v2 5/6] avcodec/adpcmenc: cosmetics 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/adpcmenc.c b/libavcodec/adpcmenc.c index 42b83c2b48..6ecdab96d6 100644 --- a/libavcodec/adpcmenc.c +++ b/libavcodec/adpcmenc.c @@ -552,7 +552,7 @@ static int adpcm_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, st = avctx->channels == 2; if (avctx->codec_id == AV_CODEC_ID_ADPCM_IMA_SSI || - avctx->codec_id == AV_CODEC_ID_ADPCM_IMA_APM) + avctx->codec_id == AV_CODEC_ID_ADPCM_IMA_APM) pkt_size = (frame->nb_samples * avctx->channels) / 2; else pkt_size = avctx->block_align; From patchwork Mon Oct 19 22:45:11 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: 23100 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 C0CBA44AF10 for ; Tue, 20 Oct 2020 01:45:25 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A904B68B6F8; Tue, 20 Oct 2020 01:45:25 +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 0B37068AE41 for ; Tue, 20 Oct 2020 01:45:23 +0300 (EEST) Date: Mon, 19 Oct 2020 22:45:11 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zanevaniperen.com; s=protonmail2; t=1603147523; bh=0UlqrzvFZ0T2olae6XV/wNCcWPvmGlO1oowMdWik9G4=; h=Date:To:From:Cc:Reply-To:Subject:From; b=mlJhxfOdXFs8SrTuTLKoaJiX07fmCbnkvjikLGd5Rq8K5n9zO1VT0hKrZXUlf6sOd p6mTJmv0AZJ7cNRCmN5SNI51qJxWo1BN7QRgsDzQcUARaoMYm/ZE4aNz6Hic4orbhf CghTUOzmKO7xwjddi27X+TzHS0qbxvdo4cwhBJD7Qkr3lUtUXsnVxQiYdOSLhlrY+E nL6oxiVLsq+IwRDZZwNsT8k/iqP5RFFjz4gxpBXJYbC95UjRzsJw5Ar7ZNNmXjZGHt MqhVmbloQ7VoUrxQca3Sj20829+AyvztsGKamjo80zecIlW47KKF3qCd/qHHbLruXt Td/lGXRFjQcjw== To: ffmpeg-devel@ffmpeg.org From: Zane van Iperen Message-ID: <20201019224335.11874-7-zane@zanevaniperen.com> MIME-Version: 1.0 X-Spam-Status: No, score=-1.2 required=10.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 mailout.protonmail.ch Subject: [FFmpeg-devel] [PATCH v2 6/6] fate: add test for adpcm_swf in wav 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 --- tests/fate/acodec.mak | 4 ++++ tests/ref/acodec/adpcm-swf-wav | 4 ++++ 2 files changed, 8 insertions(+) create mode 100644 tests/ref/acodec/adpcm-swf-wav diff --git a/tests/fate/acodec.mak b/tests/fate/acodec.mak index 50932095dc..8ac71b1b27 100644 --- a/tests/fate/acodec.mak +++ b/tests/fate/acodec.mak @@ -52,6 +52,7 @@ FATE_ACODEC_ADPCM-$(call ENCDEC, ADPCM_IMA_SSI, KVAG) += ima_ssi FATE_ACODEC_ADPCM-$(call ENCDEC, ADPCM_IMA_WAV, WAV) += ima_wav FATE_ACODEC_ADPCM-$(call ENCDEC, ADPCM_MS, WAV) += ms FATE_ACODEC_ADPCM-$(call ENCDEC, ADPCM_SWF, FLV) += swf +FATE_ACODEC_ADPCM-$(call ENCDEC, ADPCM_SWF, WAV) += swf-wav FATE_ACODEC_ADPCM-$(call ENCDEC, ADPCM_YAMAHA, WAV) += yamaha FATE_ACODEC_ADPCM := $(FATE_ACODEC_ADPCM-yes:%=fate-acodec-adpcm-%) @@ -70,6 +71,9 @@ fate-acodec-adpcm-ms: FMT = wav fate-acodec-adpcm-swf: FMT = flv fate-acodec-adpcm-yamaha: FMT = wav +fate-acodec-adpcm-swf-wav: FMT = wav +fate-acodec-adpcm-swf-wav: CODEC = adpcm_swf + FATE_ACODEC_ADPCM_TRELLIS-$(call ENCDEC, ADPCM_ADX, ADX) += adx FATE_ACODEC_ADPCM_TRELLIS-$(call ENCDEC, ADPCM_IMA_QT, AIFF) += ima_qt FATE_ACODEC_ADPCM_TRELLIS-$(call ENCDEC, ADPCM_IMA_WAV, WAV) += ima_wav diff --git a/tests/ref/acodec/adpcm-swf-wav b/tests/ref/acodec/adpcm-swf-wav new file mode 100644 index 0000000000..553e0bac54 --- /dev/null +++ b/tests/ref/acodec/adpcm-swf-wav @@ -0,0 +1,4 @@ +af5ffee897bad0174f4c7fc16c54aa5d *tests/data/fate/acodec-adpcm-swf-wav.wav +266948 tests/data/fate/acodec-adpcm-swf-wav.wav +628089745a7059ae4055c2515b6d668b *tests/data/fate/acodec-adpcm-swf-wav.out.wav +stddev: 933.58 PSNR: 36.93 MAXDIFF:51119 bytes: 1058400/ 1064960