From patchwork Fri Jun 12 11:46:08 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: 20305 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 C817144AEBB for ; Fri, 12 Jun 2020 14:46:26 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A458468B636; Fri, 12 Jun 2020 14:46:26 +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 A0B2F68B636 for ; Fri, 12 Jun 2020 14:46:20 +0300 (EEST) Date: Fri, 12 Jun 2020 11:46:08 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zanevaniperen.com; s=protonmail; t=1591962379; bh=GQJoCnEc1AqEQ200DvQ7jSIbj1HAPCt8bOLbNDzwL9A=; h=Date:To:From:Cc:Reply-To:Subject:From; b=ta4DGQuw/l+i1q8ujC+kGIa9gfQ02I2VyRjUcFk1kkj1MPgcIWFViGS8pHwIaXXqq ury22gkPJb8JklMWdb9SXBv70WiJXcHpDS/CwpDqOkL9KjlwWzYPbHM3T3W2PszWnB wJDgudDCWDVyu0qVKW0r22ohlSGu5yzbEJQ+pj+0= To: ffmpeg-devel@ffmpeg.org From: Zane van Iperen Message-ID: <20200612114603.1157417-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 v3 0/7] adpcm_ima_apm encoder + 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" Add support for encoding adpcm_ima_apm and muxing to apm. If possible, I would like to get this functionality into the 4.3 release. v3: [4][5][6] * Support both extradata formats - fixes FATE failure + preserves compatibility * EINVAL->ERANGE v2: [1][2][3] * fix mixed declarations and code * remove unused variable * fix array initialisation * LOG_WARNING->LOG_ERROR * reorder "name and probe fix" [1] https://ffmpeg.org/pipermail/ffmpeg-devel/2020-June/264310.html [2] https://ffmpeg.org/pipermail/ffmpeg-devel/2020-June/264309.html [3] https://ffmpeg.org/pipermail/ffmpeg-devel/2020-June/264308.html [4] https://ffmpeg.org/pipermail/ffmpeg-devel/2020-June/264328.html [5] https://ffmpeg.org/pipermail/ffmpeg-devel/2020-June/264329.html [6] https://ffmpeg.org/pipermail/ffmpeg-devel/2020-June/264326.html Zane van Iperen (7): avformat/apm: check codec tag in probe and add constant avcodec/adpcm_ima_apm: support new extradata format avcodec: add adpcm_ima_apm encoder avformat/apm: use new extradata format avformat: add apm muxer fate: add adpcm_ima_apm encoding test avcodec/adpcmenc: cleanup trellis checks Changelog | 1 + doc/general.texi | 2 +- libavcodec/Makefile | 1 + libavcodec/adpcm.c | 17 ++- libavcodec/adpcmenc.c | 63 ++++++--- libavcodec/allcodecs.c | 1 + libavcodec/utils.c | 1 + libavcodec/version.h | 2 +- libavformat/Makefile | 3 +- libavformat/allformats.c | 1 + libavformat/apm.c | 244 ++++++++++++++++++++++++--------- libavformat/version.h | 2 +- tests/fate/acodec.mak | 2 + tests/ref/acodec/adpcm-ima_apm | 4 + 14 files changed, 256 insertions(+), 88 deletions(-) create mode 100644 tests/ref/acodec/adpcm-ima_apm