From patchwork Fri Dec 28 21:22:55 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 11573 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 3655A44874B for ; Fri, 28 Dec 2018 23:24:06 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id EAD9E68A742; Fri, 28 Dec 2018 23:24:02 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe07-3.mx.upcmail.net (vie01a-dmta-pe07-3.mx.upcmail.net [84.116.36.19]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E306168A66B for ; Fri, 28 Dec 2018 23:23:54 +0200 (EET) Received: from [172.31.216.235] (helo=vie01a-pemc-psmtp-pe12.mail.upcmail.net) by vie01a-dmta-pe07.mx.upcmail.net with esmtp (Exim 4.88) (envelope-from ) id 1gczbt-0004gv-0b for ffmpeg-devel@ffmpeg.org; Fri, 28 Dec 2018 22:24:01 +0100 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe12.mail.upcmail.net with ESMTP id czavgNs0H2WSsczavgdE00; Fri, 28 Dec 2018 22:23: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 22:22:55 +0100 Message-Id: <20181228212257.32672-4-michael@niedermayer.cc> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20181228212257.32672-1-michael@niedermayer.cc> References: <20181228212257.32672-1-michael@niedermayer.cc> MIME-Version: 1.0 X-CMAE-Envelope: MS4wfFvWXVc72k5FTl2gdhbB9jUTj4aW0mf2OzNFzA2N25nlLnz5jearnmu6yZLsdFA1RvAFR2gevQJN4ya+KNEEWvEX2qR9z3rpRD87o1xRpAUKamodcRAB q7qDWIv5FnNESNhGZRM4XU9oFW/x8ym3N5oPI/jXTdKTDDUVJqPP9axC Subject: [FFmpeg-devel] [PATCH 4/6] 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 | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/libavutil/imgutils.c b/libavutil/imgutils.c index 4938a7ef67..6c0d3950de 100644 --- a/libavutil/imgutils.c +++ b/libavutil/imgutils.c @@ -529,6 +529,14 @@ static void memset_bytes(uint8_t *dst, size_t dst_size, uint8_t *clear, } } else if (clear_size == 4) { uint32_t val = AV_RN32(clear); +#if HAVE_FAST_64BIT + 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; + } +#endif for (; dst_size >= 4; dst_size -= 4) { AV_WN32(dst, val); dst += 4;