From patchwork Mon Jul 4 03:17:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Chen, Wenbin" X-Patchwork-Id: 36639 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:8b27:b0:88:1bbf:7fd2 with SMTP id l39csp2560729pzh; Sun, 3 Jul 2022 20:22:29 -0700 (PDT) X-Google-Smtp-Source: AGRyM1u6GmWW9ALOReRWoA5rRkasygKelFTPo3/7NpB8ZRy2aR1nVjKehnYqQP3TrZaqRvw3cdga X-Received: by 2002:aa7:c9cf:0:b0:435:de3b:c499 with SMTP id i15-20020aa7c9cf000000b00435de3bc499mr35259060edt.321.1656904949604; Sun, 03 Jul 2022 20:22:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1656904949; cv=none; d=google.com; s=arc-20160816; b=OnnYI0WafUlWJ/in4dmnPVJzD6W4eyTD9M8mP02vyjsRCDj2Q17zbb2IgR8v2BoAxy DmUmvEkeltJ5VQerSjm82HQuIaj61x1PYWA7u7J+8mAbu0cWMXeqE7Fp4CWVaU4MQ2Xb ln9zYmMdGP6u6hIAqQyjgtmBRFqIhHaJ5zVvTH9WSSMUzQBuU7N4EKjQHOWlejrPxJYP x27Dmk/Se7N56Tztc3ejpjmy9YtJRRJXUMDS596wP1nR4QhcwFbWwUAXyfrr1FAzxmFN jtiDHTJNCKTQwwocXz0S8LB54NwclFc+I1x0QvtzCWX/REaeziYv+87WmKDqZ03G7XOw F9Ew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=W7eS75GlT1k9JZQuLV56mYMLddyS9lU1EUWnt1vQ2IE=; b=TwqHaM90UNAn8jtKrpsYC1HSYV1vsM1i0AWRQc72m54v3aUt4oEAvEo2NzIuSGsFdB XdDSjQeM19SI621YHJ3HKzaqUK1si0MiGN8MlbvTGa8HwDFMvJBxIfGykhuEKdELoXNp twznlhxB+QMBQjpxyuuSpj2GW1XY2MtQK7ChxQJf6jByLEMurVco32AVHi8S4gsZN9wZ F1MBghti4S/8ssmT2KEGsMskW6UqCqSdYtqTvovUXszDk/h7Ox6DUAEK2h7cIRL7YrKH SrG+LSuhuXsetrf4ALwLBfi7bHEYOB5Fxs7L1DcNLKYypNRIx8yu81yp8WuYzYwj8npp vThA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b="F/aJkIH+"; 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 i21-20020a1709064fd500b00704c106f27csi18417772ejw.714.2022.07.03.20.22.29; Sun, 03 Jul 2022 20:22:29 -0700 (PDT) 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; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b="F/aJkIH+"; 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 8D5D168B9AE; Mon, 4 Jul 2022 06:22:20 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 17B3368B942 for ; Mon, 4 Jul 2022 06:22:12 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1656904938; x=1688440938; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=Zk3n7CGGfOKUwlw07n6L+P/nC2rPb3ABKCBO9k350nM=; b=F/aJkIH+MWv8EENaxUVdHXmGohZi6gzit0NdeYOb0r9qMY+SJKoTE1fr NwDsOahFTwq3DYMVX1SrFHAER5tL1fUF6oQGZrLwVhc+RNjtAs7Caipd/ 77y1g5+5WrZUFoMoxjBHZs5kWSmCYEyc2WJsUmWYVViZxVJsbh0Iem5a6 MM1Hct9cYhE6BKRiEFLmu8BzYsa0sKT+pu4VZPG9aS32Si1F7OX+onYAU 9flVCEP9Ze/ojXzOhoOGteDUXeD/oW0jv9zVm4I/8fMHmX0+f9xlSZERV KGKb414vWRqirKzLK44TNNqYf3zToo1cAyMBvMGuuSeiaYPva5htvB1BY A==; X-IronPort-AV: E=McAfee;i="6400,9594,10397"; a="283051051" X-IronPort-AV: E=Sophos;i="5.92,243,1650956400"; d="scan'208";a="283051051" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Jul 2022 20:22:04 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.92,243,1650956400"; d="scan'208";a="695179994" Received: from wenbin-z390-aorus-ultra.sh.intel.com ([10.239.35.4]) by fmsmga002.fm.intel.com with ESMTP; 03 Jul 2022 20:22:04 -0700 From: Wenbin Chen To: ffmpeg-devel@ffmpeg.org Date: Mon, 4 Jul 2022 11:17:35 +0800 Message-Id: <20220704031735.2371948-2-wenbin.chen@intel.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220704031735.2371948-1-wenbin.chen@intel.com> References: <20220704031735.2371948-1-wenbin.chen@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 2/2] libavcodec/mpegvideo_enc: Unify the code style 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 2dF3saUZ7hPW Change whitespace and add newline to unify the code style. Signed-off-by: Wenbin Chen --- libavcodec/mpegvideo_enc.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 970f71fe37..c9d9e2a764 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -2566,23 +2566,26 @@ static int sse_mb(MpegEncContext *s){ if(w==16 && h==16) if(s->avctx->mb_cmp == FF_CMP_NSSE){ - return s->mecc.nsse[0](s, s->new_picture->data[0] + s->mb_x * 16 + s->mb_y * s->linesize * 16, s->dest[0], s->linesize, 16) + + return s->mecc.nsse[0](s, s->new_picture->data[0] + s->mb_x * 16 + s->mb_y * s->linesize * 16, + s->dest[0], s->linesize, 16) + s->mecc.nsse[1](s, s->new_picture->data[1] + s->mb_x * chroma_mb_w + s->mb_y * s->uvlinesize * chroma_mb_h, s->dest[1], s->uvlinesize, chroma_mb_h) + s->mecc.nsse[1](s, s->new_picture->data[2] + s->mb_x * chroma_mb_w + s->mb_y * s->uvlinesize * chroma_mb_h, s->dest[2], s->uvlinesize, chroma_mb_h); }else{ - return s->mecc.sse[0](NULL, s->new_picture->data[0] + s->mb_x * 16 + s->mb_y * s->linesize * 16, s->dest[0], s->linesize, 16) + + return s->mecc.sse[0](NULL, s->new_picture->data[0] + s->mb_x * 16 + s->mb_y * s->linesize * 16, + s->dest[0], s->linesize, 16) + s->mecc.sse[1](NULL, s->new_picture->data[1] + s->mb_x * chroma_mb_w + s->mb_y * s->uvlinesize * chroma_mb_h, s->dest[1], s->uvlinesize, chroma_mb_h) + s->mecc.sse[1](NULL, s->new_picture->data[2] + s->mb_x * chroma_mb_w + s->mb_y * s->uvlinesize * chroma_mb_h, s->dest[2], s->uvlinesize, chroma_mb_h); } else - return sse(s, s->new_picture->data[0] + s->mb_x*16 + s->mb_y*s->linesize*16, s->dest[0], w, h, s->linesize) - +sse(s, s->new_picture->data[1] + s->mb_x * chroma_mb_w + s->mb_y * s->uvlinesize * chroma_mb_h, - s->dest[1], w >> s->chroma_x_shift, h >> s->chroma_y_shift, s->uvlinesize) - +sse(s, s->new_picture->data[2] + s->mb_x * chroma_mb_w + s->mb_y * s->uvlinesize * chroma_mb_h, + return sse(s, s->new_picture->data[0] + s->mb_x * 16 + s->mb_y * s->linesize * 16, + s->dest[0], w, h, s->linesize) + + sse(s, s->new_picture->data[1] + s->mb_x * chroma_mb_w + s->mb_y * s->uvlinesize * chroma_mb_h, + s->dest[1], w >> s->chroma_x_shift, h >> s->chroma_y_shift, s->uvlinesize) + + sse(s, s->new_picture->data[2] + s->mb_x * chroma_mb_w + s->mb_y * s->uvlinesize * chroma_mb_h, s->dest[2], w >> s->chroma_x_shift, h >> s->chroma_y_shift, s->uvlinesize); }