From patchwork Sun Jan 19 08:33:34 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: 17417 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 63B7444A76F for ; Sun, 19 Jan 2020 10:33:48 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 508CC68B09D; Sun, 19 Jan 2020 10:33:48 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail2.protonmail.ch (mail2.protonmail.ch [185.70.40.22]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 50E9D68B04D for ; Sun, 19 Jan 2020 10:33:41 +0200 (EET) Date: Sun, 19 Jan 2020 08:33:34 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zanevaniperen.com; s=protonmail; t=1579422820; bh=KuJN85+m/iyqv5PEGQYeSpCcft7eVmis2DoAfcqUiFE=; h=Date:To:From:Cc:Reply-To:Subject:Feedback-ID:From; b=WPH4VyKxMVWkInUFTXra5Hi4HurxqdbKFLr6xumPRPtWtZzBs/39K/ab//fv6ugE6 xNttMmrtsysnJvOK9J9+MGmsE8G+M+KJhPi2iNBuwjuyYZnyYvaDBiRMcQk4RAIWUn hiH+exQPzHppOAYI32aeIpjcogeHYgZi3icdeQPw= To: ffmpeg-devel@ffmpeg.org From: Zane van Iperen Message-ID: <20200119083325.3377-1-zane@zanevaniperen.com> Feedback-ID: xylLYHwBzJW7F28tHN-oL9EBm6h5yqtCqG6YwPpJ2oMwBYJT6-HxTnFTF6p18axLiSywX61iUfj4CElBGg8-GA==:Ext:ProtonMail MIME-Version: 1.0 X-Spam-Status: No, score=0.3 required=7.0 tests=ALL_TRUSTED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,URIBL_RHS_DOB shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mail.protonmail.ch Subject: [FFmpeg-devel] [PATCH v2 0/2] Argonaut Games ASF and ADPCM decoding support 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" This patchset adds support for the ASF container and ADPCM variant used by some Argonaut Software games such as 'Croc! Legend of the Gobbos' and 'Croc 2'. Version 2 has fixes suggested in [1]. It has been tested against: - ANISOUND/*.ASF from Croc 1 - music/*.asf from Croc 2 - FIGHT/SOUND/*.ASF from https://samples.ffmpeg.org/game-formats/brender/part2.zip [1]: https://ffmpeg.org/pipermail/ffmpeg-devel/2020-January/255986.html Zane Zane van Iperen (2): avcodec: add decoder for argonaut games' adpcm codec avformat: add demuxer for argonaut games' ASF format Changelog | 3 +- doc/general.texi | 1 + libavcodec/Makefile | 1 + libavcodec/adpcm_argo.c | 264 +++++++++++++++++++++++++++++++++++++++ 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/argo_asf.c | 260 ++++++++++++++++++++++++++++++++++++++ libavformat/version.h | 4 +- 12 files changed, 542 insertions(+), 4 deletions(-) create mode 100644 libavcodec/adpcm_argo.c create mode 100644 libavformat/argo_asf.c