From patchwork Fri Mar 18 02:13:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 34830 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:3486:0:0:0:0 with SMTP id ek6csp1433942nkb; Thu, 17 Mar 2022 19:13:35 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzw5XMraM3wycer7o1wLd73uBCE3UPEsxRwuzA5Xb5yVk5Z+zgiPduzIaSbaIgp6AzEoxtx X-Received: by 2002:a17:907:1c98:b0:6db:b42:7f81 with SMTP id nb24-20020a1709071c9800b006db0b427f81mr6990880ejc.258.1647569615114; Thu, 17 Mar 2022 19:13:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1647569615; cv=none; d=google.com; s=arc-20160816; b=gUEyRmn+dB3sMMPdwjCbew/MjY+xQg6npLtXOSVkWIcuumNlHsAETxv1obLmuQ/tl2 gwighHl03Y3+2c0TlJur0hlD3n5ZccOBHTIt7fBo3ENDuUbanL8iFAo9vyT/n4CufNFR tRBN2TtY516NzJiKzLjNd3fWzgSMmVFEcuHc5juoOAT5/uyss4Q3MJ9LbbVQAXDQ50Uu sA9qeaPAWXb0wP1Q5bxcHwyoAU8ZnF42BmbcnCmHq6+JgqjX8WX+HRXofhCC26iStTQ2 n7UvD35BrLlOonxsipEpeMfhvQhUlGJl4F3T5yFDUnborg4eSGELSALtjlJZ2QrGANLp cYiQ== 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=hNdQqyJDymY4J/nhTvxvcc1HMuBjqjkEmoRqQlq659U=; b=umq+XpPqF1ZB2PyIW8fQvltWYEaPqd0hcdCiHtH3kHgjcElzWB4URjT6sdGAUV51Xd 4EnHD0AOLbYtDmuDrjWeRKgYAfut7XEycuMWFcrM2VzSTronl/ZyczVkLGzbgzL88hWQ at683M52wrR+Jfn7ktLeYZbyv5/jEZtFtraEpPjJv1tMX/DQNgP0rUVBGcECQCpVd1vz H0Pf5twtVrr7JV120q8/9WcBRpQ2dcwIkZqVtXLVqHkWbLQWSKZPjcbyUhH5HsXXElAD b3jAL9J940FQu5/fRtR9Ls0clPpVdPDGH+ZM0VwSx/H8BdrxGV13z+gsv7/uw/oEwLl8 ldZQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=W0HP4PcN; 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=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id kx21-20020a170907775500b006df76385f38si499543ejc.984.2022.03.17.19.13.34; Thu, 17 Mar 2022 19:13:35 -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=@gmail.com header.s=20210112 header.b=W0HP4PcN; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7FCAC68B0C3; Fri, 18 Mar 2022 04:13:30 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oo1-f43.google.com (mail-oo1-f43.google.com [209.85.161.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 34E1268AB71 for ; Fri, 18 Mar 2022 04:13:24 +0200 (EET) Received: by mail-oo1-f43.google.com with SMTP id g5-20020a4ae885000000b003240bc9b2afso8676784ooe.10 for ; Thu, 17 Mar 2022 19:13:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=V0xqpymLCN38pU/noeFBmi4owbmnukrhNIKXdzvAgdk=; b=W0HP4PcNWl/wUrBGcBpj+fAxt4otevOH09VXof+wZaEGjSZGBTzqsGWMfhmlSf2v5U 9T53hbwNjbuW0sBfLTtrC1vAZqrOC3zLSaFXj+H8wWiQ7UmQWvObIBpfZSHOAbwzwZGf 0TDg1JM9QCJDiWWVKHEBokZY+AZSMlkMp2tqS0oIrOg0pV5/xGFKDRomqzTkssu13SKD IMFYTo8T3bChNo9wDLzsofz9xYXcCCFN0A6Ctq2voJjHp9+W21tgsbqsQVqwQKnw3ppZ CQw+KRcP1I1g1WHRNdtQd7wdqmOL4vRTbCUCrKrurbUwh1KEWRTF2zOVsOEl45FZ21Y6 +ByQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=V0xqpymLCN38pU/noeFBmi4owbmnukrhNIKXdzvAgdk=; b=A7ugRxMElllK2riV8miGe+uBsa1U6kxHShlML34LUExH7vxXAGP/rMvktslYIu1fDs 97fhfwy/HxXZDbNzfIsUWF3a5L6AWc2LucAtMnG1FCr4G7QoTexIJcol02BUVw7170yI Wjitiw9URjiVZ7pJD85vq0Zy5MqtHheaOBVpKoo6/rFpMnNn+NkUXDMvwy9M7xcHmMm9 ZRJ/UVcR/9xg9qteraXvAxEBbgjgAjSZGHlJOnujMZk4WaeeNgmaTbjXTu3VIIXDceD/ edlMz3CkWYtwPnlaLRZn4V2wLIo9Dby+bR4DouoaR9rE0j4BKapvLKG6bLcexwJ2O851 kjRg== X-Gm-Message-State: AOAM532kq2ltmw8gwkDtwF5MJq7DQUeSIbRQsosncj4OYpUo44RQ8EMf J9h9aohU53ZfM+WmMB+zE1MLyHfEguQ2mA== X-Received: by 2002:a05:6870:7393:b0:dd:9a31:96d1 with SMTP id z19-20020a056870739300b000dd9a3196d1mr5428753oam.98.1647569602277; Thu, 17 Mar 2022 19:13:22 -0700 (PDT) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id o10-20020aca410a000000b002ecf2a4fda5sm3286133oia.10.2022.03.17.19.13.20 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Mar 2022 19:13:21 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Thu, 17 Mar 2022 23:13:09 -0300 Message-Id: <20220318021309.12878-1-jamrial@gmail.com> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/dfa: don't check for the bitstream version on every copied line 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: +eBPAL2al/4i And use av_image_copy_plane() while at it to simplify things for version != 0x100. Signed-off-by: James Almer --- libavcodec/dfa.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/libavcodec/dfa.c b/libavcodec/dfa.c index ab78d66763..c29eb76de5 100644 --- a/libavcodec/dfa.c +++ b/libavcodec/dfa.c @@ -385,8 +385,8 @@ static int dfa_decode_frame(AVCodecContext *avctx, buf = s->frame_buf; dst = frame->data[0]; - for (i = 0; i < avctx->height; i++) { - if(version == 0x100) { + if (version == 0x100) { + for (i = 0; i < avctx->height; i++) { int j; const uint8_t *buf1 = buf + (i&3)*(avctx->width/4) + (i/4)*avctx->width; int stride = (avctx->height/4)*avctx->width; @@ -400,12 +400,12 @@ static int dfa_decode_frame(AVCodecContext *avctx, for(; j < avctx->width; j++) { dst[j] = buf1[(j/4) + (j&3)*stride]; } - } else { - memcpy(dst, buf, avctx->width); - buf += avctx->width; + dst += frame->linesize[0]; } - dst += frame->linesize[0]; - } + } else + av_image_copy_plane(dst, frame->linesize[0], buf, avctx->width, + avctx->width, avctx->height); + memcpy(frame->data[1], s->pal, sizeof(s->pal)); *got_frame = 1;