From patchwork Fri Dec 13 13:59:35 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 16771 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 2821644A40B for ; Fri, 13 Dec 2019 15:59:53 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 03A3C68ABA8; Fri, 13 Dec 2019 15:59:53 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from smtpbgau1.qq.com (smtpbgau1.qq.com [54.206.16.166]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E6EF6689FF9 for ; Fri, 13 Dec 2019 15:59:45 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1576245577; bh=TPA7mfl8x3BJV9itkoH0TsbXyaS+f3E5gwLYCyRvvH4=; h=From:To:Subject:Date:Message-Id:MIME-Version; b=A9+bDXBsEscK+NH+ndbCJCzOXSEuIP0LF3Ke4vk0eS4uRNKZblw7w+Iw+BfuRHJtp f3Zdk4+M36GhkTRdNcvr5SK47Wc1Kr6O6zr8h6TwqpQnFwi17ncc0FkuY5VXfDWBVs G2hQm3+7PnAnEfBMk+cTei1LuFtgqNo6wZ+7ZVvs= X-QQ-mid: esmtp7t1576245576t21nmidcl Received: from ZHILIZHAO-MB1.tencent.com (unknown [14.17.22.42]) by esmtp4.qq.com (ESMTP) with id ; Fri, 13 Dec 2019 21:59:35 +0800 (CST) X-QQ-SSF: 01000000000000N0VG3000000000002 X-QQ-FEAT: JgF+C7h8qBpRFwiUI8qa31Pou6gi0zdh4Wyx6F7G/vi2pFGcX4dlPEg8qTE6W Kr3OJC/qqy3aUIBk0l2Ux4SpTgU0dhFO9ILHPtBmnuFI3o0jKabyLUUk0fl2vBvA52PjJlY RZoST79f73C4KM8yGACDdR3rY21HGJ+nATNcMXwfyGxuTO1jNK+168+6C8uRNhyb1ZqU7/M 9xwJeI7Flgo0yClWpfbuCXMetQgOCc4Ni6N1Z455gan5EUPZMGypvnIcEfu0DMfAnj0eAWS QAarunpaiojBIvNJqkF6AK3qI= X-QQ-GoodBg: 0 From: quinkblack@foxmail.com To: ffmpeg-devel@ffmpeg.org Date: Fri, 13 Dec 2019 21:59:35 +0800 Message-Id: <20191213135936.87027-1-quinkblack@foxmail.com> X-Mailer: git-send-email 2.22.0 MIME-Version: 1.0 X-QQ-SENDSIZE: 520 Feedback-ID: esmtp:foxmail.com:bgforeign:bgforeign12 X-QQ-Bgrelay: 1 Subject: [FFmpeg-devel] [PATCH 1/2] avfilter/vf_histogram: clean up code 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 Cc: Zhao Zhili Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Zhao Zhili --- libavfilter/vf_histogram.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/libavfilter/vf_histogram.c b/libavfilter/vf_histogram.c index 5185992de6..0d2d087beb 100644 --- a/libavfilter/vf_histogram.c +++ b/libavfilter/vf_histogram.c @@ -266,20 +266,20 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) const int is_chroma = (k == 1 || k == 2); const int dst_h = AV_CEIL_RSHIFT(outlink->h, (is_chroma ? h->odesc->log2_chroma_h : 0)); const int dst_w = AV_CEIL_RSHIFT(outlink->w, (is_chroma ? h->odesc->log2_chroma_w : 0)); + const int plane = h->odesc->comp[k].plane; + uint8_t *const data = out->data[plane]; + const int linesize = out->linesize[plane]; if (h->histogram_size <= 256) { for (i = 0; i < dst_h ; i++) - memset(out->data[h->odesc->comp[k].plane] + - i * out->linesize[h->odesc->comp[k].plane], - h->bg_color[k], dst_w); + memset(data + i * linesize, h->bg_color[k], dst_w); } else { const int mult = h->mult; - for (i = 0; i < dst_h ; i++) - for (j = 0; j < dst_w; j++) - AV_WN16(out->data[h->odesc->comp[k].plane] + - i * out->linesize[h->odesc->comp[k].plane] + j * 2, - h->bg_color[k] * mult); + for (j = 0; j < dst_w; j++) + AV_WN16(data + j * 2, h->bg_color[k] * mult); + for (i = 1; i < dst_h; i++) + memcpy(data + i * linesize, data, dst_w * 2); } }