From patchwork Fri Sep 11 11:29:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 22287 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 B283944A0A0 for ; Fri, 11 Sep 2020 14:29:54 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8B6B868BA61; Fri, 11 Sep 2020 14:29:54 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f47.google.com (mail-ej1-f47.google.com [209.85.218.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AF53A68B973 for ; Fri, 11 Sep 2020 14:29:47 +0300 (EEST) Received: by mail-ej1-f47.google.com with SMTP id nw23so13334337ejb.4 for ; Fri, 11 Sep 2020 04:29:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=8d2rN9uJlo78Jw7qrCaYazHhEFmHcttakOF+w0eSIaQ=; b=taKLEqq3ULH9rQw37MwTTdb90iHbLSBh2CDoMyqvOfARpOAXfPlHrc3YxoPlDO/rI4 UAywPmXCkjTisy3PgCbviBNmG/iwgXuA4bcbk9j9Px28yyuDrgGbqvXGRqpN2ri+dSMP b9PkNh9wHMM2vNW7hSB9r28PE++Bg34K+GTQLB1AxwwHJDJ9oDOJbK6CS3ZyXL/bFBvZ p6582aP0hMD0Rc5IwhEQUNGVD8Cvi8eX8DrL2JGRqhkvD+V8EZjbAZ6tTCfXcm88luxC yMfT8kiSIaMfwHjb5/uD/rhOhvaY9l0D5iIJcCeMWIb8WmASIc1xCCCCmpeTMh8VYT5f 7cCw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=8d2rN9uJlo78Jw7qrCaYazHhEFmHcttakOF+w0eSIaQ=; b=hB/TrzM5c1Z7RJAng6bNX2uR6TM2VmJC4MJ9asjRoi8BBxUIizcRK+NAcDWqyv7b3d anwOuT70xjCU2K4L2MSMqEyPJdKDVTdblgey+r/nl6/VbYM5ZWf8sDifJQYFALS8Ptp+ xvr9o7qA6vjrAWIJIncaTf2ra9EIsXmpp3X38xX+1q2WnsZ+COR4ANzQr2zI2GCo9/6I K4njFf2Vvnlx5MIYzzR8jl17KDXmXxLbdHIRlPaakISoclw3ignHBcS/uoZhyWgYyLls GvRzaAIwUClwaN6/aYaplUsztZFsG5Y29Tub3BwKhUGZMnym8y3J+xl8sdgjb/LUp3EK qMdA== X-Gm-Message-State: AOAM5320sqpUEezy8aPV00b5Jrqd8sP8HKaJrVwnMhxY8Hux5xg9abws pPmtttC3bSzU7PPRy51oAkqnGpXKzs+lBA== X-Google-Smtp-Source: ABdhPJxQrwaodAULiflWCbTV6KFTE8pOl0bSlzdrf0zmiKim7PZZwpFLgKuFCtA6U95739ECFVJ+sw== X-Received: by 2002:a17:906:b43:: with SMTP id v3mr1524295ejg.383.1599823786651; Fri, 11 Sep 2020 04:29:46 -0700 (PDT) Received: from localhost.localdomain ([94.250.162.52]) by smtp.gmail.com with ESMTPSA id ce14sm1447605edb.25.2020.09.11.04.29.45 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Sep 2020 04:29:46 -0700 (PDT) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Fri, 11 Sep 2020 13:29:39 +0200 Message-Id: <20200911112939.13950-1-onemda@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH] avcodec/adpcm: take into account block_align when decoding ADPCM_PSX 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Should reduce decoding overhead. Signed-off-by: Paul B Mahol --- libavcodec/adpcm.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c index 71e37efde7..e409a3aa6a 100644 --- a/libavcodec/adpcm.c +++ b/libavcodec/adpcm.c @@ -1966,11 +1966,13 @@ static int adpcm_decode_frame(AVCodecContext *avctx, void *data, } break; case AV_CODEC_ID_ADPCM_PSX: + for (int block = 0; block < avpkt->size / FFMAX(avctx->block_align, 16 * avctx->channels); block++) { + int nb_samples_per_block = 28 * FFMAX(avctx->block_align, 16 * avctx->channels) / (16 * avctx->channels); for (channel = 0; channel < avctx->channels; channel++) { - samples = samples_p[channel]; + samples = samples_p[channel] + block * nb_samples_per_block; /* Read in every sample for this channel. */ - for (i = 0; i < nb_samples / 28; i++) { + for (i = 0; i < nb_samples_per_block / 28; i++) { int filter, shift, flag, byte; filter = bytestream2_get_byteu(&gb); @@ -2001,6 +2003,7 @@ static int adpcm_decode_frame(AVCodecContext *avctx, void *data, } } } + } break; case AV_CODEC_ID_ADPCM_ARGO: /*