From patchwork Fri Dec 28 19:26:58 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 11570 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 8688D44DE04 for ; Fri, 28 Dec 2018 21:28:11 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3B18A68A6DD; Fri, 28 Dec 2018 21:28:08 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-qmta-pe01-2.mx.upcmail.net (vie01a-qmta-pe01-2.mx.upcmail.net [62.179.121.179]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DE97B68A1F0 for ; Fri, 28 Dec 2018 21:28:01 +0200 (EET) Received: from [172.31.218.48] (helo=vie01a-dmta-pe06-3.mx.upcmail.net) by vie01a-pqmta-pe01.mx.upcmail.net with esmtp (Exim 4.88) (envelope-from ) id 1gcxnj-0001c4-MC for ffmpeg-devel@ffmpeg.org; Fri, 28 Dec 2018 20:28:07 +0100 Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe06.mx.upcmail.net with esmtp (Exim 4.88) (envelope-from ) id 1gcxne-0006lt-0X for ffmpeg-devel@ffmpeg.org; Fri, 28 Dec 2018 20:28:02 +0100 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id cxmfgLaIB2WSscxmfgcbPc; Fri, 28 Dec 2018 20:27:01 +0100 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=E7kcWpVl 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=uEEAyvP0t0x3FmynDowA:9 a=pHzHmUro8NiASowvMSCR:22 a=nt3jZW36AmriUCFCBwmW:22 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Fri, 28 Dec 2018 20:26:58 +0100 Message-Id: <20181228192658.16628-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20181228192658.16628-1-michael@niedermayer.cc> References: <20181228192658.16628-1-michael@niedermayer.cc> MIME-Version: 1.0 X-CMAE-Envelope: MS4wfL19/M+S/JkEnZq/pEIG2NXF+nyGOqabOnEeb2TYshbt9djzyzQaCKpEuWIm5FqGIuSUhIShIiTBS7DdoAv1PyfLMrXAhSv8iyRe8+DkwH7A9Ragjt9L anvtzcGurfpku1g0woaiDbsZmCADYOqOlBbIKpvm9S7zLo2l43bGrQ1G Subject: [FFmpeg-devel] [PATCH 2/2] avutil/imgutils: Optimize writing 4 bytes in memset_bytes() 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" Fixes: Timeout Fixes: 11502/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_WCMV_fuzzer-5664893810769920 Before: Executed clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_WCMV_fuzzer-5664893810769920 in 11294 ms After : Executed clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_WCMV_fuzzer-5664893810769920 in 4249 ms Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer --- libavutil/imgutils.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libavutil/imgutils.c b/libavutil/imgutils.c index 229c289c11..2d23079578 100644 --- a/libavutil/imgutils.c +++ b/libavutil/imgutils.c @@ -525,6 +525,12 @@ void av_memset_bytes(uint8_t *dst, size_t dst_size, uint8_t *clear, } } else if (clear_size == 4) { uint32_t val = AV_RN32(clear); + uint64_t val8 = val * 0x100000001ULL; + for (; dst_size >= 32; dst_size -= 32) { + AV_WN64(dst , val8); AV_WN64(dst+ 8, val8); + AV_WN64(dst+16, val8); AV_WN64(dst+24, val8); + dst += 32; + } for (; dst_size >= 4; dst_size -= 4) { AV_WN32(dst, val); dst += 4;