From patchwork Mon May 3 11:31:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zane van Iperen X-Patchwork-Id: 27567 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a10:399:0:0:0:0 with SMTP id 25csp158572pxh; Mon, 3 May 2021 04:32:17 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzu8hF9OMPKKpk/Cy+fLc113gjMSemhTOd+EopVHYJtrVaJ+7KRaiCiz0fgaD7JrYGTYq2K X-Received: by 2002:a17:907:6ee:: with SMTP id yh14mr16015134ejb.375.1620041537450; Mon, 03 May 2021 04:32:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620041537; cv=none; d=google.com; s=arc-20160816; b=QK2ASCyZSXfwIiwTAd1cVwlAYGe+fq05O1VraFBg4pmS84sUiKkdEiDYLZ8qYszGO+ T5tK7hYkCFwhcjXiNHGWpMj9TskN+EWjdkRhAqeX1lw3cXwkvOapmJtjYvg2BFMBYRKw EWF1D2Ij+BUX3Gw1/n5RT2wlPyHMp/FSlkvVYrWRaCPW50d7VKzLWzw7I1XkaQcQEYpw 2eRD8+SpbELrDmfHzwKMXLRIb40lPDY4FND7Ic3USZ11q08KznkPTPRwjz1QQmQvRoie HK7ZwbGUNsBtyPsYOe0IHvW9VWGzdBSTQiWeg+A4uhk9i9LiFfQERJQHzOKMox9kVCEd adbw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=Ael6zqTd2YMmOeP3pJPX1fmxRzHgyaw8899nvJRxHW0=; b=AyW+/y6JkpEBVkNiZ69rHUZU+OPVlvpS9kjKIz0bIUtNtRZszQEDDmaU4dDC8w5Xw2 zyZBYvGC/HOjt/J20IyiO9Gc9Yol/I9DU1Aga8EYHtVn+6+yQmOAw39J6NY5Iujt3qgC Njvza5v9RTonFLmh7pjO6Gj5ErWwkyACNYlpLIiZf+L0iVDeL74NAQ+CEvtcNyWKlvp/ AucxPjuqOEX2E46h9T0NCrtk3y/Vj2pE28260m+R+tNM0slzYZItU6lGPnOkEpH0mmNq jzoc1+cl4ysdmCVCOnHRdvzL96gPsALE0AhTjLNRbvyB050rQIonA/906Ecu7h6FhCHW bqnw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@zanevaniperen.com header.s=key1 header.b=GStnkzKG; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=zanevaniperen.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id bq19si242615edb.311.2021.05.03.04.32.16; Mon, 03 May 2021 04:32:17 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@zanevaniperen.com header.s=key1 header.b=GStnkzKG; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=zanevaniperen.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 704F4687F64; Mon, 3 May 2021 14:32:12 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out1.migadu.com (out1.migadu.com [91.121.223.63]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 96F9F680CEA for ; Mon, 3 May 2021 14:32:06 +0300 (EEST) X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zanevaniperen.com; s=key1; t=1620041525; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=mSrSceqYIaRJrY/z77AF5uPJDxAoSnoBuOMKEI+rWog=; b=GStnkzKGwuH6O52vKqAdy+F3bsb6OZ/Zb7hoCRFUljVExNLgTrFfeDEfm9dEfgclY4VrO1 j/uPlJjYD9tPCJnkI5N5dS7NQfUCemqGuiWoDRw3c/pyV31AV0vtbP26lGa8REncvpQm1O Cmkl0paqqjeYlri8tFPaTO0Z7g4n+5ZHR8FyxtgZmbUejPCEo1xCmiSKzF8v2NSlvm+oo6 yboj+4t/99uOwwmPm0UUrezDSQ9PZ9q3L/lAkgRGk0pWLE7tdKMeeSbfQd0p5e3MAjSxBR oM7kAGZB57FZIAe5es2xsbKfKuNC+hXeKDE+STUxmSNEX19Vuacs7b3Xh6o6bw== From: Zane van Iperen To: ffmpeg-devel@ffmpeg.org Date: Mon, 3 May 2021 21:31:54 +1000 Message-Id: <20210503113157.2215-1-zane@zanevaniperen.com> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: git-morningstar@zanevaniperen.com Subject: [FFmpeg-devel] [PATCH 1/4] avcodec/adpcm_psx: always fetch next byte irregardless of flag X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: R4iCo9e1FwTS Even though all samples are meant to be zero (if flag == 0x07), doesn't mean that they aren't there. See No$PSX docs [1]. [1]: https://problemkaputt.de/psx-spx.htm#spuadpcmsamples Signed-off-by: Zane van Iperen --- libavcodec/adpcm.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c index 3da6b734cf..8c07f3673d 100644 --- a/libavcodec/adpcm.c +++ b/libavcodec/adpcm.c @@ -1990,14 +1990,14 @@ static int adpcm_decode_frame(AVCodecContext *avctx, void *data, for (n = 0; n < 28; n++) { int sample = 0, scale; - if (flag < 0x07) { - if (n & 1) { - scale = sign_extend(byte >> 4, 4); - } else { - byte = bytestream2_get_byteu(&gb); - scale = sign_extend(byte, 4); - } + if (n & 1) { + scale = sign_extend(byte >> 4, 4); + } else { + byte = bytestream2_get_byteu(&gb); + scale = sign_extend(byte, 4); + } + if (flag < 0x07) { scale = scale * (1 << 12); sample = (int)((scale >> shift) + (c->status[channel].sample1 * xa_adpcm_table[filter][0] + c->status[channel].sample2 * xa_adpcm_table[filter][1]) / 64); } From patchwork Mon May 3 11:31:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zane van Iperen X-Patchwork-Id: 27566 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a10:399:0:0:0:0 with SMTP id 25csp158727pxh; Mon, 3 May 2021 04:32:28 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxMGU/L5tss6clR2ieKCea1AKzx9EtYeUkzT1yZopCylqrYmDzlfJe909HLFZTyhGnS226F X-Received: by 2002:a17:906:79a:: with SMTP id l26mr16004224ejc.268.1620041547872; Mon, 03 May 2021 04:32:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620041547; cv=none; d=google.com; s=arc-20160816; b=psqOl5dSbSCi7Ukic2jHQfnlMtITiQd0Vy3DcXZzJZXgU4kPTKUjblzBTrTVK2S6IW 6XmEAtcTDBRL50Sk4pGUcUJlUEwhH8YZWPLgg3PYVj1DCS7gYlyKayl3k5MPwgp9U8V8 q7sFp2CPKoj7JDgwvJ9BUj0XNCGjtlWcAotJLgHyiKKEyHUNJ4pAxTMHhJUrnFoqMbY6 tn8KOpJSggB+dW0fMT20VnkOcgF7ViqEUzR5GTFLMPslEPiPp4kTjYJBD4BxSsgbn9Np B8B2FZFtWwsF0bBFQT9cOSPKg+IvjOGgrvcOSFKGOnfXYncEm7YZQCzUgLyI3RH/wRqY a3BQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=cfxzE2LBdKauKRZa3H4TzQq2UDNO4wUQFfw/Za4sXkI=; b=nlC2dT9dQMAP4FbIgP7+/AWODjYNYc+lQAL3Ix67we2GbAWk3BvweCxyT+K+xgHSfG IlNSje5txHcCe5A+v6QbssGLterd0OWtKsr9MFV28G6uR05mQaMlHDsy0U3u5J0NTAxO 704+z8XQ5Al/9F4PICSFld3dPTgTmcrF5PyotMCLCWbAMqmhUa/CquImzvMqIxDulsGY hh8AGuvDmwItWJ9YBFUjS+OM3dCnSmVfqZDUlka2+CsEdMdxt1OdXCTjvbJNfZ2qcprW dxXsfAtRDjy/S4wcJgLEN/g0BW1Y9nHEJUblWFG19TDkI38uA8LnFYiPsZgLWUPNwWF5 Zozw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@zanevaniperen.com header.s=key1 header.b=B3ey8MzO; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=zanevaniperen.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id g8si11925461ejm.240.2021.05.03.04.32.27; Mon, 03 May 2021 04:32:27 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@zanevaniperen.com header.s=key1 header.b=B3ey8MzO; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=zanevaniperen.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 93C54687FDE; Mon, 3 May 2021 14:32:13 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out1.migadu.com (out1.migadu.com [91.121.223.63]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C8575687FA3 for ; Mon, 3 May 2021 14:32:07 +0300 (EEST) X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zanevaniperen.com; s=key1; t=1620041527; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=II+8IzrbLZFmp8CgaoDLNBFoVN1mcNpwh8i/+1VJmlw=; b=B3ey8MzOBj4GCqB7AWg4bpXqmgQKrynXy17ArgGu6ATX+SxHeYElKigU6QmeXcCdaHkqW/ zOKNx8dH2gS7h1SKedXPYja+tLJPAb/po43fRD1J5W8UXacdmPYM3R4gwkD9BlTCMM12vP gw7yO9RYUMokhUo6/V3ecTy7hXnTxtVu1vstnBUwiik8Kr6f8IkrMyJC/JsrzUbXoYkr7q zyCmXj7oLT/cn+LVWgRPmEfp/bCx7z52gKrLBnCioWwsdeKeF0Z+ORKP27v0/imEk/3cD6 y1eexESGKeTGo41+YOrUZ8/tV/JmChWOmQcylDSYOTbKaMlxSbOM1uaSWUxj+w== From: Zane van Iperen To: ffmpeg-devel@ffmpeg.org Date: Mon, 3 May 2021 21:31:55 +1000 Message-Id: <20210503113157.2215-2-zane@zanevaniperen.com> In-Reply-To: <20210503113157.2215-1-zane@zanevaniperen.com> References: <20210503113157.2215-1-zane@zanevaniperen.com> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: git-morningstar@zanevaniperen.com Subject: [FFmpeg-devel] [PATCH 2/4] avcodec/adpcm_psx: ignore unknown flag bits X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: haojX3ub0flz As per documentation. Signed-off-by: Zane van Iperen --- libavcodec/adpcm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c index 8c07f3673d..89f3102716 100644 --- a/libavcodec/adpcm.c +++ b/libavcodec/adpcm.c @@ -1984,7 +1984,7 @@ static int adpcm_decode_frame(AVCodecContext *avctx, void *data, filter = filter >> 4; if (filter >= FF_ARRAY_ELEMS(xa_adpcm_table)) return AVERROR_INVALIDDATA; - flag = bytestream2_get_byteu(&gb); + flag = bytestream2_get_byteu(&gb) & 0x7; /* Decode 28 samples. */ for (n = 0; n < 28; n++) { From patchwork Mon May 3 11:31:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zane van Iperen X-Patchwork-Id: 27568 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a10:399:0:0:0:0 with SMTP id 25csp158848pxh; Mon, 3 May 2021 04:32:37 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxQY6LnPl6m1VZVsT1z81U1XOG7iiKRCnWi9GLfJPf9mi5xg+hUOW+XebmUPkFyugh2qcFA X-Received: by 2002:a17:906:eda3:: with SMTP id sa3mr16586181ejb.415.1620041556932; Mon, 03 May 2021 04:32:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620041556; cv=none; d=google.com; s=arc-20160816; b=rf1lixIh4zIQ3zDYFhCg/OL5CmREJdAK5o7uZbew7+lu0zJeLu7Kry+G88OD3bU8Yr UfgDkod98IAbBEBr3EcWvFfsUScz+iJBGPovt+NNYUUQq5/ZnaXxKr/TnAbopNvjSUUA C2PxWRRgI/tNswR+/mKh9xCRcbACRaJrD3Av8AtkrwlJqHQ3G0QBE5yGjth1CN9W12RQ bENYAuAPgdQY2sjjPrz97wxi1lbHqld+OuLl2JHFgINRwhUwR2Vq/m4i5FiTyhObXJWq oWdCwzBO4dm6r+Wd8XWjD4ym5uo9ff5cW4IL6fQLWcx3UQTvdh10TU0ehQguaQL8vN17 yQ3A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=k3YkQBWJMI8d5EV0a0OXeqnDD0OXnDEG/po6dPJavA4=; b=mDmU2wxPxZGpyEPXb9szePBgIscobW2wH0rlYo2G5IRZiM29heaG3Uji5n9Qysh/hG H6WSWYlRUToQOUywk7OieF1XkkJzoguk3QaUoaR34bAgX9giPyS6Xj8FhTlNA9AcNG8m 2rDt87Wh3ipMxdFxPkXnBhE4M4oGur/Q8lhcR8kD3fUFZha9TV8yoLcmIA3r3SG3dOfq D4DX9rypZcu5YnRiXEQO5uYrOMejrNp/hAiKaqaVIjzjupzhcnJzURMj/13lAzrZj85E Qwb6WRx5rUTlVtusHvIHH+07zGqFnnp/KngMo5dVbD5af93FPHuLyT+55gi7oBbETI6Q xm8g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@zanevaniperen.com header.s=key1 header.b=it2Hbtbb; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=zanevaniperen.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id r1si8271466edp.303.2021.05.03.04.32.36; Mon, 03 May 2021 04:32:36 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@zanevaniperen.com header.s=key1 header.b=it2Hbtbb; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=zanevaniperen.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id ABDC8680273; Mon, 3 May 2021 14:32:15 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out1.migadu.com (out1.migadu.com [91.121.223.63]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6E240687FB2 for ; Mon, 3 May 2021 14:32:09 +0300 (EEST) X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zanevaniperen.com; s=key1; t=1620041529; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=aN5ErOngP9hIUm4RTCHNv2AJ6Uk4zqlxjoX+4rvVWRc=; b=it2HbtbbCbSa6h73+hNTtbiM71ro9I2t8KThAIOCcG6AUUiKkmZ0ItWLMm7L3ItSfXAQ0R W849xqFFhZg6BgNzuaX3AIdAdIwXNZKuJNNfOl9OgdI+BvUIY530JjCHnD7Ty4LzijueHI GJWPyguj7YPXdLFI/Go45mG/J0i92fuX2qC1Tjl6Gp2lzXJpmpG9xKlfqPiEMRGRhUzl8q XoH1mGNZEqjFSWfd4djVl64zFAqanTr7abzT2HREz0CdBwwjuPFp9eyA209lygpO7M1G2v jMCzJK6ga2A+uoc4azohlJaG8fxP6JdRD6ZkcqT6CMTuX56bxah8ObW8bNUuuA== From: Zane van Iperen To: ffmpeg-devel@ffmpeg.org Date: Mon, 3 May 2021 21:31:56 +1000 Message-Id: <20210503113157.2215-3-zane@zanevaniperen.com> In-Reply-To: <20210503113157.2215-1-zane@zanevaniperen.com> References: <20210503113157.2215-1-zane@zanevaniperen.com> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: git-morningstar@zanevaniperen.com Subject: [FFmpeg-devel] [PATCH 3/4] avformat: add Argonaut Games CVG demuxer X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: TSx8blYzJNeF Signed-off-by: Zane van Iperen --- Changelog | 1 + MAINTAINERS | 1 + libavformat/Makefile | 1 + libavformat/allformats.c | 1 + libavformat/argo_cvg.c | 245 +++++++++++++++++++++++++++++++++++++++ libavformat/version.h | 2 +- 6 files changed, 250 insertions(+), 1 deletion(-) create mode 100644 libavformat/argo_cvg.c diff --git a/Changelog b/Changelog index ad950354d0..9567009d63 100644 --- a/Changelog +++ b/Changelog @@ -4,6 +4,7 @@ releases are sorted from youngest to oldest. version : - ADPCM IMA Westwood encoder - Westwood AUD muxer +- Argonaut Games CVG demuxer version 4.4: diff --git a/MAINTAINERS b/MAINTAINERS index ed8eddb317..dcac46003e 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -399,6 +399,7 @@ Muxers/Demuxers: apngdec.c Benoit Fouet argo_asf.c Zane van Iperen argo_brp.c Zane van Iperen + argo_cvg.c Zane van Iperen ass* Aurelien Jacobs astdec.c Paul B Mahol astenc.c James Almer diff --git a/libavformat/Makefile b/libavformat/Makefile index 85b5d8e7eb..0dca1ffd77 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -107,6 +107,7 @@ OBJS-$(CONFIG_AQTITLE_DEMUXER) += aqtitledec.o subtitles.o OBJS-$(CONFIG_ARGO_ASF_DEMUXER) += argo_asf.o OBJS-$(CONFIG_ARGO_ASF_MUXER) += argo_asf.o OBJS-$(CONFIG_ARGO_BRP_DEMUXER) += argo_brp.o argo_asf.o +OBJS-$(CONFIG_ARGO_CVG_DEMUXER) += argo_cvg.o OBJS-$(CONFIG_ASF_DEMUXER) += asfdec_f.o asf.o asfcrypt.o \ avlanguage.o OBJS-$(CONFIG_ASF_O_DEMUXER) += asfdec_o.o asf.o asfcrypt.o \ diff --git a/libavformat/allformats.c b/libavformat/allformats.c index 0c672ad8c8..923af3f649 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -66,6 +66,7 @@ extern const AVInputFormat ff_aqtitle_demuxer; extern const AVInputFormat ff_argo_asf_demuxer; extern const AVOutputFormat ff_argo_asf_muxer; extern const AVInputFormat ff_argo_brp_demuxer; +extern const AVInputFormat ff_argo_cvg_demuxer; extern const AVInputFormat ff_asf_demuxer; extern const AVOutputFormat ff_asf_muxer; extern const AVInputFormat ff_asf_o_demuxer; diff --git a/libavformat/argo_cvg.c b/libavformat/argo_cvg.c new file mode 100644 index 0000000000..2851c1649f --- /dev/null +++ b/libavformat/argo_cvg.c @@ -0,0 +1,245 @@ +/* + * Argonaut Games CVG demuxer + * + * Copyright (C) 2021 Zane van Iperen (zane@zanevaniperen.com) + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ +#include "avformat.h" +#include "internal.h" +#include "libavutil/intreadwrite.h" + +/* + * .CVG files are essentially PSX ADPCM wrapped with a size and checksum. + * Found in the PSX versions of the game. + */ + +#define ARGO_CVG_HEADER_SIZE 12 +#define ARGO_CVG_BLOCK_ALIGN 0x10 +#define ARGO_CVG_NB_BLOCKS 32 +#define ARGO_CVG_SAMPLES_PER_BLOCK 28 + +typedef struct ArgoCVGHeader { + uint32_t size; /*< File size -8 (this + trailing checksum) */ + uint32_t unk1; /*< Unknown. Always seems to be 0 or 1. */ + uint32_t unk2; /*< Unknown. Always seems to be 0 or 1. */ +} ArgoCVGHeader; + +typedef struct ArgoCVGOverride { + const char *name; + ArgoCVGHeader header; + uint32_t checksum; + int sample_rate; +} ArgoCVGOverride; + +typedef struct ArgoCVGDemuxContext { + ArgoCVGHeader header; + uint32_t checksum; + uint32_t num_blocks; + uint32_t blocks_read; +} ArgoCVGDemuxContext; + +/* "Special" files that are played at a different rate. */ +static ArgoCVGOverride overrides[] = { + { "CRYS.CVG", { 23592, 0, 1 }, 2495499, 88200 }, /* Beta */ + { "REDCRY88.CVG", { 38280, 0, 1 }, 4134848, 88200 }, /* Beta */ + { "DANLOOP1.CVG", { 54744, 1, 0 }, 5684641, 37800 }, /* Beta */ + { "PICKUP88.CVG", { 12904, 0, 1 }, 1348091, 48000 }, /* Beta */ + { "SELECT1.CVG", { 5080, 0, 1 }, 549987, 44100 }, /* Beta */ +}; + +static int argo_cvg_probe(const AVProbeData *p) +{ + ArgoCVGHeader cvg; + + /* + * It's almost impossible to detect these files based + * on the header alone. File extension is (unfortunately) + * the best way forward. + */ + if (!av_match_ext(p->filename, "cvg")) + return 0; + + if (p->buf_size < ARGO_CVG_HEADER_SIZE) + return 0; + + cvg.size = AV_RL32(p->buf + 0); + cvg.unk1 = AV_RL32(p->buf + 4); + cvg.unk2 = AV_RL32(p->buf + 8); + + if (cvg.size < 8) + return 0; + + if (cvg.unk1 != 0 && cvg.unk1 != 1) + return 0; + + if (cvg.unk2 != 0 && cvg.unk2 != 1) + return 0; + + return AVPROBE_SCORE_MAX / 4 + 1; +} + +static int argo_cvg_read_checksum(AVIOContext *pb, const ArgoCVGHeader *cvg, uint32_t *checksum) +{ + int ret; + uint8_t buf[4]; + + if (!(pb->seekable & AVIO_SEEKABLE_NORMAL)) { + *checksum = 0; + return 0; + } + + if ((ret = avio_seek(pb, cvg->size + 4, SEEK_SET)) < 0) + return ret; + + /* NB: Not using avio_rl32() because no error checking. */ + if ((ret = avio_read(pb, buf, sizeof(buf))) < 0) + return ret; + else if (ret != sizeof(buf)) + return AVERROR(EIO); + + if ((ret = avio_seek(pb, ARGO_CVG_HEADER_SIZE, SEEK_SET)) < 0) + return ret; + + *checksum = AV_RL32(buf); + return 0; +} + +static int argo_cvg_read_header(AVFormatContext *s) +{ + int ret; + AVStream *st; + AVCodecParameters *par; + uint8_t buf[ARGO_CVG_HEADER_SIZE]; + const char *filename = av_basename(s->url); + ArgoCVGDemuxContext *ctx = s->priv_data; + + if (!(st = avformat_new_stream(s, NULL))) + return AVERROR(ENOMEM); + + if ((ret = avio_read(s->pb, buf, ARGO_CVG_HEADER_SIZE)) < 0) + return ret; + else if (ret != ARGO_CVG_HEADER_SIZE) + return AVERROR(EIO); + + ctx->header.size = AV_RL32(buf + 0); + ctx->header.unk1 = AV_RL32(buf + 4); + ctx->header.unk2 = AV_RL32(buf + 8); + + if (ctx->header.size < 8) + return AVERROR_INVALIDDATA; + + av_log(s, AV_LOG_TRACE, "size = %u\n", ctx->header.size); + av_log(s, AV_LOG_TRACE, "unk = %u, %u\n", ctx->header.unk1, ctx->header.unk2); + + if ((ret = argo_cvg_read_checksum(s->pb, &ctx->header, &ctx->checksum)) < 0) + return ret; + + av_log(s, AV_LOG_TRACE, "checksum = %u\n", ctx->checksum); + + par = st->codecpar; + par->codec_type = AVMEDIA_TYPE_AUDIO; + par->codec_id = AV_CODEC_ID_ADPCM_PSX; + par->sample_rate = 22050; + + for (size_t i = 0; i < FF_ARRAY_ELEMS(overrides); i++) { + const ArgoCVGOverride *ovr = overrides + i; + if (ovr->header.size != ctx->header.size || + ovr->header.unk1 != ctx->header.unk1 || + ovr->header.unk2 != ctx->header.unk2 || + ovr->checksum != ctx->checksum || + av_strcasecmp(filename, ovr->name) != 0) + continue; + + av_log(s, AV_LOG_TRACE, "found override, name = %s\n", ovr->name); + par->sample_rate = ovr->sample_rate; + break; + } + + par->channels = 1; + par->channel_layout = AV_CH_LAYOUT_MONO; + + par->bits_per_coded_sample = 4; + par->bits_per_raw_sample = 16; + par->block_align = ARGO_CVG_BLOCK_ALIGN; + par->bit_rate = par->sample_rate * par->bits_per_coded_sample; + + ctx->num_blocks = (ctx->header.size - 8) / ARGO_CVG_BLOCK_ALIGN; + + av_log(s, AV_LOG_TRACE, "num blocks = %u\n", ctx->num_blocks); + + avpriv_set_pts_info(st, 64, 1, par->sample_rate); + + st->start_time = 0; + st->duration = ctx->num_blocks * ARGO_CVG_SAMPLES_PER_BLOCK; + st->nb_frames = ctx->num_blocks; + return 0; +} + +static int argo_cvg_read_packet(AVFormatContext *s, AVPacket *pkt) +{ + int ret; + AVStream *st = s->streams[0]; + ArgoCVGDemuxContext *ctx = s->priv_data; + + if (ctx->blocks_read >= ctx->num_blocks) + return AVERROR_EOF; + + ret = av_get_packet(s->pb, pkt, st->codecpar->block_align * + FFMIN(ARGO_CVG_NB_BLOCKS, ctx->num_blocks - ctx->blocks_read)); + + if (ret < 0) + return ret; + + if (ret % st->codecpar->block_align != 0) + return AVERROR_INVALIDDATA; + + pkt->stream_index = 0; + pkt->duration = ARGO_CVG_SAMPLES_PER_BLOCK * (ret / st->codecpar->block_align); + pkt->pts = ctx->blocks_read * ARGO_CVG_SAMPLES_PER_BLOCK; + pkt->flags &= ~AV_PKT_FLAG_CORRUPT; + + ctx->blocks_read += ret / st->codecpar->block_align; + + return 0; +} + +static int argo_cvg_seek(AVFormatContext *s, int stream_index, + int64_t pts, int flags) +{ + int64_t ret; + ArgoCVGDemuxContext *ctx = s->priv_data; + + if (pts != 0 || stream_index != 0) + return AVERROR(EINVAL); + + if ((ret = avio_seek(s->pb, ARGO_CVG_HEADER_SIZE, SEEK_SET)) < 0) + return ret; + + ctx->blocks_read = 0; + return 0; +} + +const AVInputFormat ff_argo_cvg_demuxer = { + .name = "argo_cvg", + .long_name = NULL_IF_CONFIG_SMALL("Argonaut Games CVG"), + .priv_data_size = sizeof(ArgoCVGDemuxContext), + .read_probe = argo_cvg_probe, + .read_header = argo_cvg_read_header, + .read_packet = argo_cvg_read_packet, + .read_seek = argo_cvg_seek, +}; diff --git a/libavformat/version.h b/libavformat/version.h index 987a38dbb4..53273334e2 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -32,7 +32,7 @@ // Major bumping may affect Ticket5467, 5421, 5451(compatibility with Chromium) // Also please add any ticket numbers that you believe might be affected here #define LIBAVFORMAT_VERSION_MAJOR 59 -#define LIBAVFORMAT_VERSION_MINOR 0 +#define LIBAVFORMAT_VERSION_MINOR 1 #define LIBAVFORMAT_VERSION_MICRO 100 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ From patchwork Mon May 3 11:31:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zane van Iperen X-Patchwork-Id: 27565 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a10:399:0:0:0:0 with SMTP id 25csp158996pxh; Mon, 3 May 2021 04:32:46 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz0Wez9Wg3t8Qq7kwY/mffJVhprDBMMhNbLDbJf9+1an77nQyrEfgy9V6omRNUo+6OOE6uL X-Received: by 2002:a05:6402:4383:: with SMTP id o3mr11260475edc.333.1620041566761; Mon, 03 May 2021 04:32:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620041566; cv=none; d=google.com; s=arc-20160816; b=GuNIU/V7CYhN3Fctwh15GpN8PW7cZtN4/yOl+Miepqn2lY4gdMwmX6XHhPUmKmtGqY e0+CaPY7aOEuHeJVaM7TlQSvevr88QRQGmGUKtuAWH2m4b8x3RfTaUpOBvZfwcQME5N9 1ghPgR4jZWqqCFkVOl5CCn4C5J13/OJ8ofQrSM9OiSIWI05U54YX17F6jYlaj5LZwv5D tTp3fEh3xovjF7BZYR8oNUzPrmz5ND4JPQ/zUgJLVQVIJAYvN4CKG3+5yUJef+rOIbgk Pz8OD5B521KsEu2USxoZ89mAgLoiM48eNAXnH9eUHVpmOQ4xGsZj95HKfIm2FPoJM9+y pc5A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=0PKy7MCs1ZxwsTU3dhjoGIX9M2ixl/p4rAN0C+R3bLo=; b=f0i71LGVWpYQEgzC82ZuBCOCYDzAaZUeiTSbbwHqbFjxoqr61ZvFKUMl0CFPfJ0HfJ 6ORUMBwYb4hdnaWNJqX7WG7+D9sw+F4K7AMkegEmccj7Cxh/vKAWQrh0uE14odXvo7MI 1EHUJqMF4BTv+Rh6qBxrQSAQCXdLJHqb2ysfFC786Q+hFuvtyfFp7K4gKixc7OdrNGJz Yw7cnRBs2/T0jckG4FpkIzxcFWwGXWFrC9mbSFYhihw9y3RO1tb4sA1DbgnMmE04j+CO RSIAUimoMFhoq01K2LxF60/1YRCvShjoXD77g+0Yp44bl3uIVYQYTDX59/3yx0c2ANMn VJMw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@zanevaniperen.com header.s=key1 header.b=AWtF+c3+; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=zanevaniperen.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id b13si9879979ede.27.2021.05.03.04.32.46; Mon, 03 May 2021 04:32:46 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@zanevaniperen.com header.s=key1 header.b=AWtF+c3+; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=zanevaniperen.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E53FA68814B; Mon, 3 May 2021 14:32:17 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out1.migadu.com (out1.migadu.com [91.121.223.63]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1148C688081 for ; Mon, 3 May 2021 14:32:11 +0300 (EEST) X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zanevaniperen.com; s=key1; t=1620041530; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=U3g1Sw5vQCQpoXFE9JdNm+gXZHvdKrqotgtkHEPv0Lc=; b=AWtF+c3+v4fnsYbvZMdYo6ukcPfBRkp8mgRBdS1IdGEcsl01KmDbN4IGjMR1agCMN481Tm n7nozJy4ZF9sYVWrZOZu4ju7rI9f+iI0yWpwvp0eOrOTebZK4VANFMnbNGKJZLdUcPAIOG RMbt/GoSawZ+vUvgctZIeJZyiQh7CH7LkqcCye2dej9GjAY3exhfCPSf4yA/kWlIyIirG6 BnZsyH8FozXnEBEsdR2y6wYbNViaVh7k5/Tv1frmYGI2BmkOSTSaYrf5i0Ix60BVQudRTI s2c4siocg7cQ1XmpuwqCgPexDfas9ASMiNqCx3y6rdpbTK16PjvHopGDLqu8Zw== From: Zane van Iperen To: ffmpeg-devel@ffmpeg.org Date: Mon, 3 May 2021 21:31:57 +1000 Message-Id: <20210503113157.2215-4-zane@zanevaniperen.com> In-Reply-To: <20210503113157.2215-1-zane@zanevaniperen.com> References: <20210503113157.2215-1-zane@zanevaniperen.com> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: git-morningstar@zanevaniperen.com Subject: [FFmpeg-devel] [PATCH 4/4] avformat: add Argonaut Games CVG muxer X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: octhIcVJf/Cr Signed-off-by: Zane van Iperen --- Changelog | 1 + libavformat/Makefile | 1 + libavformat/allformats.c | 1 + libavformat/argo_cvg.c | 149 ++++++++++++++++++++++++++++++++++++++- libavformat/version.h | 2 +- 5 files changed, 152 insertions(+), 2 deletions(-) diff --git a/Changelog b/Changelog index 9567009d63..41b1690dfd 100644 --- a/Changelog +++ b/Changelog @@ -5,6 +5,7 @@ version : - ADPCM IMA Westwood encoder - Westwood AUD muxer - Argonaut Games CVG demuxer +- Argonaut Games CVG muxer version 4.4: diff --git a/libavformat/Makefile b/libavformat/Makefile index 0dca1ffd77..c9ef564523 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -108,6 +108,7 @@ OBJS-$(CONFIG_ARGO_ASF_DEMUXER) += argo_asf.o OBJS-$(CONFIG_ARGO_ASF_MUXER) += argo_asf.o OBJS-$(CONFIG_ARGO_BRP_DEMUXER) += argo_brp.o argo_asf.o OBJS-$(CONFIG_ARGO_CVG_DEMUXER) += argo_cvg.o +OBJS-$(CONFIG_ARGO_CVG_MUXER) += argo_cvg.o OBJS-$(CONFIG_ASF_DEMUXER) += asfdec_f.o asf.o asfcrypt.o \ avlanguage.o OBJS-$(CONFIG_ASF_O_DEMUXER) += asfdec_o.o asf.o asfcrypt.o \ diff --git a/libavformat/allformats.c b/libavformat/allformats.c index 923af3f649..111ca3cbf0 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -67,6 +67,7 @@ extern const AVInputFormat ff_argo_asf_demuxer; extern const AVOutputFormat ff_argo_asf_muxer; extern const AVInputFormat ff_argo_brp_demuxer; extern const AVInputFormat ff_argo_cvg_demuxer; +extern const AVOutputFormat ff_argo_cvg_muxer; extern const AVInputFormat ff_asf_demuxer; extern const AVOutputFormat ff_asf_muxer; extern const AVInputFormat ff_asf_o_demuxer; diff --git a/libavformat/argo_cvg.c b/libavformat/argo_cvg.c index 2851c1649f..f0d9f3e076 100644 --- a/libavformat/argo_cvg.c +++ b/libavformat/argo_cvg.c @@ -1,5 +1,5 @@ /* - * Argonaut Games CVG demuxer + * Argonaut Games CVG (de)muxer * * Copyright (C) 2021 Zane van Iperen (zane@zanevaniperen.com) * @@ -21,6 +21,7 @@ */ #include "avformat.h" #include "internal.h" +#include "libavutil/opt.h" #include "libavutil/intreadwrite.h" /* @@ -53,6 +54,14 @@ typedef struct ArgoCVGDemuxContext { uint32_t blocks_read; } ArgoCVGDemuxContext; +typedef struct ArgoCVGMuxContext { + const AVClass *class; + int skip_rate_check; + uint32_t checksum; + size_t size; +} ArgoCVGMuxContext; + +#if CONFIG_ARGO_CVG_DEMUXER /* "Special" files that are played at a different rate. */ static ArgoCVGOverride overrides[] = { { "CRYS.CVG", { 23592, 0, 1 }, 2495499, 88200 }, /* Beta */ @@ -243,3 +252,141 @@ const AVInputFormat ff_argo_cvg_demuxer = { .read_packet = argo_cvg_read_packet, .read_seek = argo_cvg_seek, }; +#endif + +#if CONFIG_ARGO_CVG_MUXER +static int argo_cvg_write_init(AVFormatContext *s) +{ + ArgoCVGMuxContext *ctx = s->priv_data; + const AVCodecParameters *par; + + if (s->nb_streams != 1) { + av_log(s, AV_LOG_ERROR, "CVG files have exactly one stream\n"); + return AVERROR(EINVAL); + } + + par = s->streams[0]->codecpar; + + if (par->codec_id != AV_CODEC_ID_ADPCM_PSX) { + av_log(s, AV_LOG_ERROR, "%s codec not supported\n", + avcodec_get_name(par->codec_id)); + return AVERROR(EINVAL); + } + + if (par->channels != 1) { + av_log(s, AV_LOG_ERROR, "CVG files only support 1 channel\n"); + return AVERROR(EINVAL); + } + + if (par->block_align != ARGO_CVG_BLOCK_ALIGN) + return AVERROR(EINVAL); + + if (!ctx->skip_rate_check && par->sample_rate != 22050) { + av_log(s, AV_LOG_ERROR, "Sample rate must be 22050\n"); + return AVERROR(EINVAL); + } + + if (!(s->pb->seekable & AVIO_SEEKABLE_NORMAL)) { + av_log(s, AV_LOG_ERROR, "Stream not seekable, unable to write output file\n"); + return AVERROR(EINVAL); + } + + return 0; +} + +static int argo_cvg_write_header(AVFormatContext *s) +{ + ArgoCVGMuxContext *ctx = s->priv_data; + + avio_wl32(s->pb, 0); /* Size, fixed later. */ + avio_wl32(s->pb, 0); + avio_wl32(s->pb, 1); + + ctx->checksum = 1; + ctx->size = 8; + return 0; +} + +static int argo_cvg_write_packet(AVFormatContext *s, AVPacket *pkt) +{ + ArgoCVGMuxContext *ctx = s->priv_data; + AVCodecParameters *par = s->streams[0]->codecpar; + + if (pkt->size % par->block_align != 0) + return AVERROR_INVALIDDATA; + + avio_write(s->pb, pkt->data, pkt->size); + + ctx->size += pkt->size; + + if (ctx->size > UINT32_MAX) + return AVERROR_INVALIDDATA; + + for (int i = 0; i < pkt->size; i++) + ctx->checksum += pkt->data[i]; + + return 0; +} + +static int argo_cvg_write_trailer(AVFormatContext *s) +{ + ArgoCVGMuxContext *ctx = s->priv_data; + int64_t ret; + + av_log(s, AV_LOG_TRACE, "size = %zu\n", ctx->size); + av_log(s, AV_LOG_TRACE, "checksum = %u\n", ctx->checksum); + + /* + * NB: This is wrong. We're always slightly under the original. + * Verified by remuxing. For reference (orig - remuxed): + * - TCLD.CVG: 4706074 - 4705696 = 378 + * - DANLOOP1.CVG: 5684641 - 5684212 = 429 + * - CRYS.CVG: 2495499 - 2495367 = 132 + * - PICKUP88.CVG: 1348091 - 1347937 = 154 + * - SELECT1.CVG: 549987 - 549752 = 235 + * Also NB: it doesn't matter, the game doesn't check them. + */ + avio_wl32(s->pb, ctx->checksum); + + if ((ret = avio_seek(s->pb, 0, SEEK_SET) < 0)) + return ret; + + avio_wl32(s->pb, (uint32_t)ctx->size); + return 0; +} + +static const AVOption argo_cvg_options[] = { + { + .name = "skip_rate_check", + .help = "skip sample rate check", + .offset = offsetof(ArgoCVGMuxContext, skip_rate_check), + .type = AV_OPT_TYPE_BOOL, + .default_val = {.i64 = 0}, + .min = 0, + .max = 1, + .flags = AV_OPT_FLAG_ENCODING_PARAM + }, + { NULL } +}; + +static const AVClass argo_cvg_muxer_class = { + .class_name = "argo_cvg_muxer", + .item_name = av_default_item_name, + .option = argo_cvg_options, + .version = LIBAVUTIL_VERSION_INT +}; + +const AVOutputFormat ff_argo_cvg_muxer = { + .name = "argo_cvg", + .long_name = NULL_IF_CONFIG_SMALL("Argonaut Games CVG"), + .extensions = "cvg", + .audio_codec = AV_CODEC_ID_ADPCM_PSX, + .video_codec = AV_CODEC_ID_NONE, + .init = argo_cvg_write_init, + .write_header = argo_cvg_write_header, + .write_packet = argo_cvg_write_packet, + .write_trailer = argo_cvg_write_trailer, + .priv_class = &argo_cvg_muxer_class, + .priv_data_size = sizeof(ArgoCVGMuxContext) +}; +#endif diff --git a/libavformat/version.h b/libavformat/version.h index 53273334e2..cb9f5d33dc 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -32,7 +32,7 @@ // Major bumping may affect Ticket5467, 5421, 5451(compatibility with Chromium) // Also please add any ticket numbers that you believe might be affected here #define LIBAVFORMAT_VERSION_MAJOR 59 -#define LIBAVFORMAT_VERSION_MINOR 1 +#define LIBAVFORMAT_VERSION_MINOR 2 #define LIBAVFORMAT_VERSION_MICRO 100 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \