From patchwork Tue Jun 9 00:19:24 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: 20224 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 78F3644AA97 for ; Tue, 9 Jun 2020 03:19:35 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5493C68B2EB; Tue, 9 Jun 2020 03:19:35 +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 A345968AFD8 for ; Tue, 9 Jun 2020 03:19:29 +0300 (EEST) Date: Tue, 09 Jun 2020 00:19:24 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zanevaniperen.com; s=protonmail; t=1591661968; bh=GQYqc9YDfDWMQn0FaU35AZ8Hg4D8MvbW1cPN1c90LMY=; h=Date:To:From:Cc:Reply-To:Subject:From; b=wwxiyZiXGTyHmmzvgxvLjQI8BkUcTjYkdGApKEKxPyz/vvh1pPG5nfZUxAacC7sYa iJKjJsyPbi9IJLLGrb6fKJch69imYIhvDraLkW4HiG30/aTs/YbFOJ9EiSlQM9AvVa 9vAc+mEZgPueEALvlEPaqUUi/KEPTziNPZJTLVfc= To: ffmpeg-devel@ffmpeg.org From: Zane van Iperen Message-ID: <20200609001730.961175-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 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. I was hoping to get this into the 4.3 release. Zane van Iperen (7): avformat/apm: prepare extradata handling for muxer avcodec/adpcm_ima_apm: prepare extradata handling for encoder avcodec: add adpcm_ima_apm encoder avformat: add apm muxer fate: add adpcm_ima_apm encoding test avformat/apm: name and probe fix avcodec/adpcmenc: cleanup trellis checks Changelog | 1 + doc/general.texi | 2 +- libavcodec/Makefile | 1 + libavcodec/adpcm.c | 10 +- libavcodec/adpcmenc.c | 57 ++++++-- libavcodec/allcodecs.c | 1 + libavcodec/utils.c | 1 + libavformat/Makefile | 3 +- libavformat/allformats.c | 1 + libavformat/apm.c | 246 ++++++++++++++++++++++++--------- tests/fate/acodec.mak | 2 + tests/ref/acodec/adpcm-ima_apm | 4 + 12 files changed, 245 insertions(+), 84 deletions(-) create mode 100644 tests/ref/acodec/adpcm-ima_apm