From patchwork Fri Mar 11 20:20:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 34714 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:3486:0:0:0:0 with SMTP id ek6csp94147nkb; Fri, 11 Mar 2022 12:21:19 -0800 (PST) X-Google-Smtp-Source: ABdhPJy10aD4zByolUHx5W1hEq8bvEaQRfxZRZiKgSJ5ov+8i896g87RHWFSafQniLQzFDJorBHh X-Received: by 2002:a17:906:3a83:b0:6d6:e54d:3264 with SMTP id y3-20020a1709063a8300b006d6e54d3264mr10219600ejd.96.1647030079334; Fri, 11 Mar 2022 12:21:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1647030079; cv=none; d=google.com; s=arc-20160816; b=pFXZQs7cMpPRbNEgss9oUBE5pBP/myxBPqzSLMnIBd8BkYEecJh4dcHtUdHeaK7YZk 0RPNspXGZoKKGWeO8VszSXumswcwCdgIVAy8Fbk915NF4crf0gCLUpq+nctPPduKd/D9 jZG2VKvMyvPD777mgbJBbuZ57Cew1qEJmMLzU6jgeCeIK2Jar3bbS3y+aoKNGlTd+B9A Kd+0zVbxwGT+3E8sDA10agtsJL/aWcssdTO16Jhohb/UjrOXjKOChcnSl6IX/dNxJZly FfwbrZGOOuflNX70zGKHvdB9V+WT3Oboa33BTVibK2ZEQqxNzcoT/ECYN4qqICaT5+AQ 4Fmw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:delivered-to; bh=EEFfQ6GbSElAPK6V9ZCk9AFFcxW2Pv2HVYLqDI4Zk9E=; b=u474MKGugy1lMnsQjUm83rXBNpMW3kbpbqk1p8rpy7TC+2lmrF/JXbUxSb+PmeYBY3 JI44vswwaDuFDP18ji/ua6F2GJpo4A6WdNAT/HxCo6Kku+O3ih1DIwW+wFZUHj0YtYVf 0IHnCzkE/0TBbmUmvWT91xePi9kyDySn/V2dvBggwegQvdrpLqfwtQNZYBojlOYt74uw Rui1dK1Yj4JSHuzC+VYtG29LE2SImPShwLXQ5+bLeSl5fBVPyUWSUl31JwajemgetgHc +XKKL2aCy/PVCvRzFUe207+jjw9ACV/vpQJmM1dR6VeMFUzjKcatwGAIA4u25spO1jhr 41sg== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id sc31-20020a1709078a1f00b006da7ac2043fsi5889809ejc.224.2022.03.11.12.21.18; Fri, 11 Mar 2022 12:21:19 -0800 (PST) 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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 102B068B1A3; Fri, 11 Mar 2022 22:20:54 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-at03-2.mx.upcmail.net (vie01a-dmta-at03-2.mx.upcmail.net [62.179.121.152]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E41C468B143 for ; Fri, 11 Mar 2022 22:20:44 +0200 (EET) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-at03.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1nSlkh-0002le-6s for ffmpeg-devel@ffmpeg.org; Fri, 11 Mar 2022 21:20:43 +0100 Received: from ren-mail-psmtp-mg02. ([80.109.253.241]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id Slj7nmp4hSgGFSlkhn1Hy8; Fri, 11 Mar 2022 21:20:43 +0100 Received: from localhost ([213.47.68.29]) by ren-mail-psmtp-mg02. with ESMTP id SlkSnpPGHfYHNSlkSnA8YI; Fri, 11 Mar 2022 21:20:28 +0100 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 213.47.68.29 X-CNFS-Analysis: v=2.4 cv=MrIxV0We c=1 sm=1 tr=0 ts=622baf1a a=2hcxjKEKjp0CzLx6oWAm4g==:117 a=2hcxjKEKjp0CzLx6oWAm4g==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=Og64oq-A3Fj4ZA4HCoYA:9 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Fri, 11 Mar 2022 21:20:25 +0100 Message-Id: <20220311202025.28139-3-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220311202025.28139-1-michael@niedermayer.cc> References: <20220311202025.28139-1-michael@niedermayer.cc> X-CMAE-Envelope: MS4wfNOEveajwU6B/tC4kYSpS4k9g9wv6WcsJFwDaQ6Je9UL/iDXfBcohbkFdffEwvJMm0tKF8TGsNic5XOWxkI0DTox7cnc8A1gyIcXTwZbCxjSYdNVb1A+ NovQ84tYHzD58pYxIL6k3geBkJJFwneuS7ApZa7YpUwTSFZcxytQnn3ewde07elVbVGjKg0WcJ3rNw== Subject: [FFmpeg-devel] [PATCH 3/3] avcodec/dfa: Optimize output reshuffle loop 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 4tysjR0pTtai 18035 -> 4018 dezicycles (Tested with LOGOS.DFA, gcc 7, 3950X) Signed-off-by: Michael Niedermayer --- libavcodec/dfa.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/libavcodec/dfa.c b/libavcodec/dfa.c index 0cf3641a38..ab78d66763 100644 --- a/libavcodec/dfa.c +++ b/libavcodec/dfa.c @@ -388,9 +388,17 @@ static int dfa_decode_frame(AVCodecContext *avctx, for (i = 0; i < avctx->height; i++) { if(version == 0x100) { int j; - for(j = 0; j < avctx->width; j++) { - dst[j] = buf[ (i&3)*(avctx->width /4) + (j/4) + - ((j&3)*(avctx->height/4) + (i/4))*avctx->width]; + const uint8_t *buf1 = buf + (i&3)*(avctx->width/4) + (i/4)*avctx->width; + int stride = (avctx->height/4)*avctx->width; + for(j = 0; j < avctx->width/4; j++) { + dst[4*j+0] = buf1[j + 0*stride]; + dst[4*j+1] = buf1[j + 1*stride]; + dst[4*j+2] = buf1[j + 2*stride]; + dst[4*j+3] = buf1[j + 3*stride]; + } + j *= 4; + for(; j < avctx->width; j++) { + dst[j] = buf1[(j/4) + (j&3)*stride]; } } else { memcpy(dst, buf, avctx->width);