From patchwork Wed Sep 30 08:30:22 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: 22670 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 AF16544BC32 for ; Wed, 30 Sep 2020 11:30:39 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 84DF468A760; Wed, 30 Sep 2020 11:30:39 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3E71D688083 for ; Wed, 30 Sep 2020 11:30:33 +0300 (EEST) Received: by mail-wr1-f66.google.com with SMTP id z4so770583wrr.4 for ; Wed, 30 Sep 2020 01:30:33 -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=4ZwtOgkdLjXrLYzBf8mijtOOtt13W4NAua1B1cMTY/A=; b=H6VAcRKEqVdslo31Z61nNFkh8qzNu0tMKvRqBvEqn6gY5TA7lUDrhoZCV5lRvm310Z c1luPQqanjvV/pLcQRGV/UFQGqWkXBIsETcd4FU6YANXeMEeG74Pc8QxKjEa/ONbFDsw XHpoYSk6BaaOSNAmJWIeZF7RiaaG2rlO+VqRgZh/55kUfv/lrgMhWdtGlOeFgYhQ8A0z re1vAoAT71ibyhQ9ptlXGooRksAa7QZokF0Am7/VwzVbh4e1C7HcS2a689GnsmxGWgkn RUUjiZoUiObndXldWbX+AQqT1SuZCFKmeOCL32SsUVQaqFoFeEDHjlfoDoQmzSxsHWdP D0Kg== 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=4ZwtOgkdLjXrLYzBf8mijtOOtt13W4NAua1B1cMTY/A=; b=omQ8TeKWX0uxpqR9sk5XQeSnzJYcJHHAR7IweoEQvtPy4FIjfOe1SVyWPjzqTpGHrF IABUNLjG542AQchrTn8crIKeroVgfWoM4n6V9Mg94f2dPPHpjqXkRpPFdyI3WlakymF1 cbS6AJVkAqnqmgdUXcrsADBkAu5hcYwurnLCSftbwlf+rWlQdWF4oUwbOr8rej3zy708 heWmcZEQTR1qjY6eJV2tM1WX/r5EYlrpLGyAN/KAcd8muyMNmfjYOJiX/wVhWdiljAQT ZRsbFcaj0Ay1zBBx6r1IqAd3oOtBgELhhbMaD1X6Vd4jjlqr9YmoXx8hIqTLFbd6UAT8 Fddw== X-Gm-Message-State: AOAM5338euSR/nL8ZYZJkpPNy7Pq8e1r2tiP9lczNHq3POXQ/RtDvDUE zhTkQKT/YyI9ndkRi5/Ky0u8VnVVgUJqSg== X-Google-Smtp-Source: ABdhPJxwmVMniztkDMqC/dz5BaIKLiNo2n+FPNZLGtlKWHmefthCj4FwHLWieVTPSd2cD4y8mWCH2Q== X-Received: by 2002:a5d:6283:: with SMTP id k3mr1845080wru.191.1601454632391; Wed, 30 Sep 2020 01:30:32 -0700 (PDT) Received: from localhost.localdomain ([94.250.162.52]) by smtp.gmail.com with ESMTPSA id q13sm1490042wra.93.2020.09.30.01.30.31 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Sep 2020 01:30:31 -0700 (PDT) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Wed, 30 Sep 2020 10:30:22 +0200 Message-Id: <20200930083022.12835-1-onemda@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH] avformat/adxdec: demux multiple blocks at once 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" Improves decoding speed by 24x Signed-off-by: Paul B Mahol --- libavformat/adxdec.c | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/libavformat/adxdec.c b/libavformat/adxdec.c index ccd5049acd..a265c87dea 100644 --- a/libavformat/adxdec.c +++ b/libavformat/adxdec.c @@ -53,6 +53,9 @@ static int adx_read_packet(AVFormatContext *s, AVPacket *pkt) AVCodecParameters *par = s->streams[0]->codecpar; int ret, size; + if (avio_feof(s->pb)) + return AVERROR_EOF; + if (par->channels <= 0) { av_log(s, AV_LOG_ERROR, "invalid number of channels %d\n", par->channels); return AVERROR_INVALIDDATA; @@ -63,16 +66,21 @@ static int adx_read_packet(AVFormatContext *s, AVPacket *pkt) pkt->pos = avio_tell(s->pb); pkt->stream_index = 0; - ret = av_get_packet(s->pb, pkt, size); - if (ret != size) { - return ret < 0 ? ret : AVERROR(EIO); - } - if (AV_RB16(pkt->data) & 0x8000) { - return AVERROR_EOF; + ret = av_get_packet(s->pb, pkt, size * 128); + if (ret < 0) + return ret; + if ((ret % size) && ret >= size) { + size = ret - (ret % size); + av_shrink_packet(pkt, size); + pkt->flags &= ~AV_PKT_FLAG_CORRUPT; + } else if (ret < size) { + return AVERROR(EIO); + } else { + size = ret; } - pkt->size = size; - pkt->duration = 1; - pkt->pts = (pkt->pos - c->header_size) / size; + + pkt->duration = size / (BLOCK_SIZE * par->channels); + pkt->pts = (pkt->pos - c->header_size) / (BLOCK_SIZE * par->channels); return 0; }