From patchwork Tue Feb 18 12:15:16 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: 17827 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 93BA644BB26 for ; Tue, 18 Feb 2020 14:15:25 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 70DCB6881A5; Tue, 18 Feb 2020 14:15:25 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-40131.protonmail.ch (mail-40131.protonmail.ch [185.70.40.131]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 00DC9688121 for ; Tue, 18 Feb 2020 14:15:18 +0200 (EET) Date: Tue, 18 Feb 2020 12:15:16 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zanevaniperen.com; s=protonmail; t=1582028118; bh=qlCnSi4A8I4LXYBxn2V9b4gqj0qEj5xov28xbk0fLV4=; h=Date:To:From:Cc:Reply-To:Subject:Feedback-ID:From; b=DpHavNCIjYxxSb0F13h7wAwWg58gBr5Sl9x4UVZ3tdIewAV0Ylk+pg8ouHM4O9K5R 1d+0eN7gQCReP5889gRqg604HlLKAlvFxDMUHyGY9No/FQtoo7NyHnWWBZ9IuPMC/p PDOXjGdEF2+fxXK3Zb5h6y8p8cpEGd0/qbsa9FCQ= To: ffmpeg-devel@ffmpeg.org From: Zane van Iperen Message-ID: <20200218121512.28323-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 v2 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. 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 | 24 +++++ 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, 227 insertions(+), 3 deletions(-) create mode 100644 libavformat/apm.c