From patchwork Sat Jul 27 22:31:21 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 14101 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 DEE1F448462 for ; Sun, 28 Jul 2019 01:32:55 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CCB33689D06; Sun, 28 Jul 2019 01:32:55 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe08-3.mx.upcmail.net (vie01a-dmta-pe08-3.mx.upcmail.net [84.116.36.22]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 01497680911 for ; Sun, 28 Jul 2019 01:32:48 +0300 (EEST) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe08.mx.upcmail.net with esmtp (Exim 4.92) (envelope-from ) id 1hrVFA-00050m-29 for ffmpeg-devel@ffmpeg.org; Sun, 28 Jul 2019 00:32:48 +0200 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id rVEBhlZE05D5NrVEBhsB77; Sun, 28 Jul 2019 00:31:48 +0200 X-Env-Mailfrom: michael@niedermayer.cc X-Env-Rcptto: ffmpeg-devel@ffmpeg.org X-SourceIP: 213.47.41.20 X-CNFS-Analysis: v=2.3 cv=bu8y+3Si c=1 sm=1 tr=0 a=I1eytVlZLDX1BM2VTtTtSw==:117 a=I1eytVlZLDX1BM2VTtTtSw==:17 a=MKtGQD3n3ToA:10 a=1oJP67jkp3AA:10 a=GEAsPZ9sns4A:10 a=ZZnuYtJkoWoA:10 a=nZOtpAppAAAA:20 a=QLgi9T1yVYsjhyYeDNUA:9 a=1fhp2MxaeJtTNGEnv6mo:22 a=Z5ABNNGmrOfJ6cZ5bIyy:22 a=jd6J4Gguk5HxikPWLKER:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 28 Jul 2019 00:31:21 +0200 Message-Id: <20190727223122.28243-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.22.0 MIME-Version: 1.0 X-CMAE-Envelope: MS4wfC0S+/XiJklEhOV0bEVp3e0Az+3ZFQmSP305shO4XPiLTqpgLtvlJjwvfagCMgM8kdUFiIESyj872jvmWe8uSifpHjUkMfvn/2qgmpjE9C3AyKWFo5Kt o/N59go+gep1E3jBQkWQcwSuI3XSvuYCYQe4I2/Z20OtyUEPISI9kfr5 Subject: [FFmpeg-devel] [PATCH 1/2] avcodec/lcldec: Optimize YUV422 case 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" This merges several byte operations and avoids some shifts inside the loop Improves: Timeout (330sec -> 134sec) Improves: 15599/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_MSZH_fuzzer-5658127116009472 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavcodec/lcldec.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libavcodec/lcldec.c b/libavcodec/lcldec.c index 104defa5f5..c3787b3cbe 100644 --- a/libavcodec/lcldec.c +++ b/libavcodec/lcldec.c @@ -391,13 +391,13 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, AVPac break; case IMGTYPE_YUV422: for (row = 0; row < height; row++) { - for (col = 0; col < width - 3; col += 4) { + for (col = 0; col < (width - 2)>>1; col += 2) { memcpy(y_out + col, encoded, 4); encoded += 4; - u_out[ col >> 1 ] = *encoded++ + 128; - u_out[(col >> 1) + 1] = *encoded++ + 128; - v_out[ col >> 1 ] = *encoded++ + 128; - v_out[(col >> 1) + 1] = *encoded++ + 128; + AV_WN16(u_out + col, AV_RN16(encoded) ^ 0x8080); + encoded += 2; + AV_WN16(v_out + col, AV_RN16(encoded) ^ 0x8080); + encoded += 2; } y_out -= frame->linesize[0]; u_out -= frame->linesize[1];