From patchwork Sat Mar 14 09:55:53 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: numberwolf X-Patchwork-Id: 18185 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 9FC5444BDCA for ; Sat, 14 Mar 2020 11:57:31 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7DECB68B119; Sat, 14 Mar 2020 11:57:31 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from qq.com (out203-205-251-60.mail.qq.com [203.205.251.60]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 351F268B119 for ; Sat, 14 Mar 2020 11:57:23 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qq.com; s=s201512; t=1584179837; bh=bKzrPD7+FNcvXIbjvxPW2BOWoEZdOLL97WIe2BFFsCE=; h=From:To:Cc:Subject:Date; b=vKRlwWN8KInUWKLnfmWUH5bxs7azSd+k+kBEkf2givMA8+FCQXiWp9beW5Z4mAYWI 5omlyyyEkYaKyaQcYScdVGlbllepzrLz+x1z82mV3m0ZpXdNKUCr6K+v3er5dRiyll Nwjbv+0foAosbaZthE1lA2mnqEjfNLHotK7b8L1Y= Received: from localhost.localdomain ([123.126.85.189]) by newxmesmtplogicsvrszb1.qq.com (NewEsmtp) with SMTP id E4D0D4F4; Sat, 14 Mar 2020 17:57:13 +0800 X-QQ-mid: xmsmtpt1584179833t872cus29 X-QQ-XMAILINFO: Ofsj13slC7RGDbkbMxb0UVYD83ivBrKGIl1Hno9spbCgb7Gle8BInafUAV2qYr BYB5hF5YteRq8G0GfiOauXmMtEby/6Rb22ST6feEnhrt9B3/jeEvZXhyqsahCdzUwBQxEN5Wqy8N SKQl7wIyyW9qPFL3oPKXodcehl/v4uEblc8E491bo2AhQoT9iOPkJTXT6gvhnTW8gztcsOYobLFI smSn1s4JM4YVpoWeDxCZT+G+cStCQQgDFfopVxUoBOBTZ0Kp3AImXpToCEuTemF1m1MW9/1UN5kk sywgpAwl/SRQpMqLZAbocr5LuTeOBwfwFrt/y3i4POAIGp6PzDG5CwD7D/JqSEE80KxCZ/J+PLEu XaTX2VNgRFrnaITusGTBlMbaMuo+kXlU2SaK6RandWci+Yq5pT37rdUDLUG4N9K6kPaQoHUfvsiV 5RDACRNqZKOlVp0I6CjGuXgn2mRvxvdPzlwrEdose8nYidXhMfLzqShK1/575mDZFnyR4lK+EjNL oAc9zZZ/CRVGo910AdwAd8L2ABNYSqZ+RBynexkXfQFIh8EvcyNok1GMJ/y+uB9i/7u9t1L4MAIt epdXt05iFFpxMcO+4Flo2hUH/wnvxnj3xNt6k6CCNgF0hCyQ== From: numberwolf To: ffmpeg-devel@ffmpeg.org Date: Sat, 14 Mar 2020 17:55:53 +0800 Message-Id: <20200314095553.9504-1-porschegt23@foxmail.com> X-Mailer: git-send-email 2.17.2 (Apple Git-113) Subject: [FFmpeg-devel] [ffmpeg-devel][PATCH] Encapsulation func to get width and height 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: porschegt23@foxmail.com MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- libavcodec/mpegutils.c | 4 ++-- libavcodec/mpegutils.h | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/libavcodec/mpegutils.c b/libavcodec/mpegutils.c index c0ee3aa..819293c 100644 --- a/libavcodec/mpegutils.c +++ b/libavcodec/mpegutils.c @@ -34,8 +34,8 @@ static int add_mb(AVMotionVector *mb, uint32_t mb_type, int motion_x, int motion_y, int motion_scale, int direction) { - mb->w = IS_8X8(mb_type) || IS_8X16(mb_type) ? 8 : 16; - mb->h = IS_8X8(mb_type) || IS_16X8(mb_type) ? 8 : 16; + mb->w = MB_SIZE_WIDTH(mb_type); + mb->h = MB_SIZE_HEIGHT(mb_type); mb->motion_x = motion_x; mb->motion_y = motion_y; mb->motion_scale = motion_scale; diff --git a/libavcodec/mpegutils.h b/libavcodec/mpegutils.h index 1ed21c1..ed59716 100644 --- a/libavcodec/mpegutils.h +++ b/libavcodec/mpegutils.h @@ -95,6 +95,9 @@ #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 + // 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))))