From patchwork Mon Oct 19 22:43:56 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: 23093 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 3BDCB44A381 for ; Tue, 20 Oct 2020 01:44:16 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 12DBE68AFD5; Tue, 20 Oct 2020 01:44:16 +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 0E7C168AA6F for ; Tue, 20 Oct 2020 01:44:10 +0300 (EEST) Date: Mon, 19 Oct 2020 22:43:56 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zanevaniperen.com; s=protonmail2; t=1603147447; bh=yMOrnIh05U0dCSZNMcMUfWrIh/QjpL9Mc6Agy7HoP/g=; h=Date:To:From:Cc:Reply-To:Subject:From; b=hu1ef0IdSaWV8mYWfrFPDiC1a6rGz9Kex98pZQ+Jhe7VHDyNa87eK8hImN/DBle+j n7fJNj1pzoQpfZWIWQSHvNoGDDxL8maUQs2plA2Nqez035LnLW9BBr5okuWjP2XtAB 8gY5m643IV9eQ9MYsv+BuuwsnFS5Uhpbx/j0G/tXa9YwlA6yeQbYMIu3amf4vulxmS 2jntxsIFS1RMsLDUePHdVyZ+LMDTRTD7ubUvjZL3sadHAhj0ShSPIcLSQD5jJuoXSc HjqWJRXnoIJzqFl4RDsO+9eb19QZzDS5RSVhsCuaGJhl8eo9+HlYdRCxWNNYKV+apz 38u1lmKNashJQ== To: ffmpeg-devel@ffmpeg.org From: Zane van Iperen Message-ID: <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 0/6] Fix adpcm_swf support 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" adpcm_swf support in WAV is completely broken. block_align isn't set correctly, so the demuxer gives incorrect packets to the decoder. The encoder doesn't provide a value for block_align, so it's set to 1. All of this has no bearing on (de)muxing to FLV. See https://trac.ffmpeg.org/ticket/5829. v2: [1] - Fix FATE failure - Move block_size check into ff_put_wav_header() - Allow a custom block size now that [2] is merged. [1]: https://ffmpeg.org/pipermail/ffmpeg-devel/2020-October/271262.html [2]: https://ffmpeg.org/pipermail/ffmpeg-devel/2020-October/271001.html Zane van Iperen (6): avformat/riff: prevent muxing adpcm_swf with a variable block size avcodec/adpcm_swf: support decoding multiple fixed-sized blocks at once avcodec/adpcm_swf: set block_align when encoding avcodec/adpcm_swf: support custom block size for encoding avcodec/adpcmenc: cosmetics fate: add test for adpcm_swf in wav libavcodec/adpcm.c | 15 +++++++++++++-- libavcodec/adpcmenc.c | 9 ++++----- libavformat/riffenc.c | 6 ++++++ tests/fate/acodec.mak | 4 ++++ tests/ref/acodec/adpcm-swf-wav | 4 ++++ 5 files changed, 31 insertions(+), 7 deletions(-) create mode 100644 tests/ref/acodec/adpcm-swf-wav