From patchwork Mon Mar 16 16:19:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: numberwolf X-Patchwork-Id: 18247 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 341A044A923 for ; Mon, 16 Mar 2020 18:21:38 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 10B3C68B501; Mon, 16 Mar 2020 18:21:38 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from qq.com (unknown [203.205.251.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 142F868B4A2 for ; Mon, 16 Mar 2020 18:21:29 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qq.com; s=s201512; t=1584375676; bh=mN88yZsFD+AgxRnzRwSaLzCc2a3dFQYGKtTWDnlBgyQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:In-Reply-To: References; b=a4+GqnV3BWsMRlu0Qqfsp75Ol2F7HVHq400blyW8TM/4FLGVdHBBmnJVpDpc3Pu0a 2k1QmVaCx5WcP007RKu2k4md6b5xi35diE3onq05iIavNkl15JX3qUpbQr9d6IIjGi VvoztlvyxW0c/Ugb5D/8Zl0RA5teRChV9k3ztkAY= Received: from localhost.localdomain ([123.126.85.189]) by newxmesmtplogicsvrszb2.qq.com (NewEsmtp) with SMTP id 54D9ECDB; Tue, 17 Mar 2020 00:21:13 +0800 X-QQ-mid: xmsmtpt1584375673t33zagwe3 X-QQ-XMAILINFO: OMulYwelSWur69JIgEVPwHQxBY33lVjwKD+zIQC3CB7HOw/Fzwe8EgXLLBG0vu LUMY1nCycwRlFn8hX0AAOdr0hmo7i+EESqwzrZVyFHD/Q+/vo8FhnrH/Uuw5J+WHPs+q8kW9wnWl TUG3IpTiJ3dgfQ3yhcuoDe4P0NYgEbNKH3i65TPsbpjo96QQewA0W+xoH7Xrqoqeb9BaSfqj9RAg MkRF53a1Gc6pH2HdGOzZHzyjKYVqHTkJK9TR99ksmUE0gx89zXRFawAf/KKgviOlPIk5NOOlaMPQ 750VeFRRl8a23CWyuTXdUpUNXCt8xvXJhnMNRrAl0SNFCDGiz26ysKXPHNsmeIt/dY2lfm0ZAUCB /kvRnoIlji7qMyPs0l64xPtnoC5E6W76ATBlWD4RsrjjkyVNNX3woz1GLelirOpP1fB3uDB7j6f+ 5xWNQ4ozatNR+GBPR/nFZvcOJBd3f1CxdDp04mOGMAGOHaoGGEZvTNwXSUqLEGUoc4wqcKMecomc +/B17l19BfOocK85XZpl2+qHus4i7+NqqOOdsV/ZYbLvE0nFvLGN3AfQ2NHP7+cTHhFD3kcLwDGC GHDNm+AHEhDi6KiOuBlLvVLh0uQD0K4bHkjf20RQKQgWA9mQ+hy9uRu6diolkOzc0b+oY= From: numberwolf To: ffmpeg-devel@ffmpeg.org Date: Tue, 17 Mar 2020 00:19:43 +0800 Message-Id: <6c53e23f3062492e477061303bd0ce35c46556ed.1584374867.git.porschegt23@foxmail.com> X-Mailer: git-send-email 2.17.2 (Apple Git-113) In-Reply-To: <158435317864.17802.4486268080106652702@lain.red.khirnov.net> References: <158435317864.17802.4486268080106652702@lain.red.khirnov.net> In-Reply-To: <158435317864.17802.4486268080106652702@lain.red.khirnov.net> References: <158435317864.17802.4486268080106652702@lain.red.khirnov.net> Subject: [FFmpeg-devel] [PATCH v2] Encapsulation macro to get width and height of macroblock 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: numberwolf MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" modify: using the IS_* macros most of mb's checked oper are defined in mpegutils' marcos, so mb's checked oper about width/height should be put it together with others Signed-off-by: numberwolf --- libavcodec/mpegutils.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/mpegutils.h b/libavcodec/mpegutils.h index ed59716..bcf604f 100644 --- a/libavcodec/mpegutils.h +++ b/libavcodec/mpegutils.h @@ -95,8 +95,8 @@ #define IS_QUANT(a) ((a) & MB_TYPE_QUANT) #define IS_DIR(a, part, list) ((a) & (MB_TYPE_P0L0 << ((part) + 2 * (list)))) -#define MB_SIZE_WIDTH(a) (((a) & MB_TYPE_8x8) || ((a) & MB_TYPE_8x16)) ? 8 : 16 -#define MB_SIZE_HEIGHT(a) (((a) & MB_TYPE_8x8) || ((a) & MB_TYPE_16x8)) ? 8 : 16 +#define MB_SIZE_WIDTH(a) (IS_8X8(a) || IS_8X16(a)) ? 8 : 16 +#define MB_SIZE_HEIGHT(a) (IS_8X8(a) || IS_16X8(a)) ? 8 : 16 // does this mb use listX, note does not work if subMBs #define USES_LIST(a, list) ((a) & ((MB_TYPE_P0L0 | MB_TYPE_P1L0) << (2 * (list))))