From patchwork Sat Jun 20 10:59:09 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: 20520 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 3F83844A9FF for ; Sat, 20 Jun 2020 13:59:21 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1731368B6BC; Sat, 20 Jun 2020 13:59:21 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-40133.protonmail.ch (mail-40133.protonmail.ch [185.70.40.133]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 922B368B0F1 for ; Sat, 20 Jun 2020 13:59:15 +0300 (EEST) Date: Sat, 20 Jun 2020 10:59:09 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zanevaniperen.com; s=protonmail; t=1592650754; bh=eZq02x8wRf2VCDpSKKBFgFRSYnndhcgj71Vp2Wn5SGI=; h=Date:To:From:Cc:Reply-To:Subject:From; b=vvBO7vuhOcIuugNfoQ1mrw1XfqIh/xGmWQMZaV/AAhJS0O37QIUjI+PlM3uequu0F rcBQJdknp+WzE4FtaC76Adj6KMUxV2/waBaZ+MVjLnl8En8KwmvWJjzwWGp2oA3WRJ WvypnvdV68FmzGeOFBKNAxJkwa90Adj7pgOC3Rwk= To: ffmpeg-devel@ffmpeg.org From: Zane van Iperen Message-ID: <20200620105857.25674-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 v4 0/6] 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. v4: - fix rebase issues 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 (6): avcodec/adpcm_ima_apm: support new extradata format avformat/apm: use new extradata format avcodec: add adpcm_ima_apm encoder 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 + libavformat/Makefile | 3 +- libavformat/allformats.c | 1 + libavformat/apm.c | 240 ++++++++++++++++++++++++--------- tests/fate/acodec.mak | 2 + tests/ref/acodec/adpcm-ima_apm | 4 + 12 files changed, 250 insertions(+), 86 deletions(-) create mode 100644 tests/ref/acodec/adpcm-ima_apm