From patchwork Wed Jul 8 12:54:46 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: 20874 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 7F07744BC45 for ; Wed, 8 Jul 2020 15:55:02 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5A57168AA24; Wed, 8 Jul 2020 15:55:02 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail1.protonmail.ch (mail1.protonmail.ch [185.70.40.18]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6AC4E6882EA for ; Wed, 8 Jul 2020 15:54:55 +0300 (EEST) Date: Wed, 08 Jul 2020 12:54:46 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zanevaniperen.com; s=protonmail; t=1594212894; bh=InK/kds29WnGueEgccJilhVZwgeg2/E2ZwsR0/uko4o=; h=Date:To:From:Cc:Reply-To:Subject:From; b=xW4UFd95e6YSflUC9vPadWe/xdcffMtRLyGC9GWn77U49BbX4F0tOkpK1xkezxjSH PsA2JIB1D1DziDDqJTss13ktBDdWEF1q0VoWKH5WrFYa6HHPX4ptg3uU15aCrNYXLB zx9s8u0R61ITsuOGhjPAJERvWw/4IFcyqj8rpsd0= To: ffmpeg-devel@ffmpeg.org From: Zane van Iperen Message-ID: <20200708125433.238118-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 v6 0/7] Add support for encoding adpcm_ima_apm and muxing to apm. 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" v6: [8] * split out header and extradata fixes * add more-descriptive commit messages * fix bit_rate overflow v5: [7] * split out cosmetic changes into their own patch 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 [7] https://ffmpeg.org/pipermail/ffmpeg-devel/2020-June/265218.html [8] https://ffmpeg.org/pipermail/ffmpeg-devel/2020-July/265840.html Zane van Iperen (7): avformat/apm: read header correctly avformat/apm: use the entire APMState structure as extradata avformat/apm: fix variable/structure names and cosmetics avcodec: add adpcm_ima_apm encoder avformat: add apm muxer fate: add adpcm_ima_apm encoding test avcodec/adpcmenc: cleanup trellis checks Changelog | 2 + doc/general.texi | 2 +- libavcodec/Makefile | 1 + 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 | 240 ++++++++++++++++++++++++--------- libavformat/version.h | 2 +- tests/fate/acodec.mak | 2 + tests/ref/acodec/adpcm-ima_apm | 4 + 13 files changed, 244 insertions(+), 80 deletions(-) create mode 100644 tests/ref/acodec/adpcm-ima_apm