From patchwork Thu Feb 20 11:31:41 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: 17851 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 B734A449AF4 for ; Thu, 20 Feb 2020 13:31:54 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 92D8668AFF4; Thu, 20 Feb 2020 13:31:54 +0200 (EET) 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 893BC68AFA8 for ; Thu, 20 Feb 2020 13:31:48 +0200 (EET) Date: Thu, 20 Feb 2020 11:31:41 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zanevaniperen.com; s=protonmail; t=1582198307; bh=aiAT+6v3cKvecOUlO75ryeyWhneGnbjFJmnTkAOIphg=; h=Date:To:From:Cc:Reply-To:Subject:Feedback-ID:From; b=hxOBsJd4ItX0aQRqoFCgjFncGI+l4TfyNHbVqSCG2ByLZgFk5YR9jSgkiSfC6wnh8 dRP2WT6dkZ5BXTGPUgq9mZ3gxrxBeiwmOALFsWJdIw0qlrb1uJZ6QIMj3PPXJ/PfJT 2YKM+//q2z8ptV/cMsFZJNCV4jV9UGShEJNqnLzw= To: ffmpeg-devel@ffmpeg.org From: Zane van Iperen Message-ID: <20200220113124.8083-1-zane@zanevaniperen.com> Feedback-ID: xylLYHwBzJW7F28tHN-oL9EBm6h5yqtCqG6YwPpJ2oMwBYJT6-HxTnFTF6p18axLiSywX61iUfj4CElBGg8-GA==:Ext:ProtonMail 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/2] Ubisoft Rayman 2 APM demuxer + decoder. 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" Hi all, This patchset adds support for the APM files used by Rayman 2. It has been tested against all *.apm files in the game folder. v3: - simplify the decoder v2: - Change extradata to use AV_{W,R}L32 instead of AV_{W,R}N32 - fix version - add probe function - removed an unnecessary `n = 0` Zane Zane van Iperen (2): avcodec: add decoder for Rayman 2's ADPCM variant avformat: add demuxer for Rayman 2's APM format libavcodec/Makefile | 1 + libavcodec/adpcm.c | 21 +++++ libavcodec/allcodecs.c | 1 + libavcodec/avcodec.h | 1 + libavcodec/codec_desc.c | 7 ++ libavcodec/version.h | 2 +- libavformat/Makefile | 1 + libavformat/allformats.c | 1 + libavformat/apm.c | 188 +++++++++++++++++++++++++++++++++++++++ libavformat/version.h | 4 +- 10 files changed, 224 insertions(+), 3 deletions(-) create mode 100644 libavformat/apm.c