From patchwork Mon Aug 10 09:34:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xu, Guangxin" X-Patchwork-Id: 21577 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 F2E2E448038 for ; Mon, 10 Aug 2020 12:34:48 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D71DC68A0FA; Mon, 10 Aug 2020 12:34:48 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E5F7968AE44 for ; Mon, 10 Aug 2020 12:34:40 +0300 (EEST) IronPort-SDR: 9RiMjrxBjABKICv/VGLW451H38HeI9dqXWpIbhUc8wy+Zlyr1NEdL+zCUhYrOTyKpez9akrqMT n+KMhShDQH4g== X-IronPort-AV: E=McAfee;i="6000,8403,9708"; a="238332090" X-IronPort-AV: E=Sophos;i="5.75,457,1589266800"; d="scan'208";a="238332090" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Aug 2020 02:34:37 -0700 IronPort-SDR: uO5X68ElLCoEL/3/wbiBeDgSSylQwD+YQyu2De1oUrY2Fa0rAhAMEyEjIZsTI2wYmchR7ANbi6 /xbbk3qfvl+w== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.75,457,1589266800"; d="scan'208";a="468979623" Received: from skl-e5-server.sh.intel.com ([10.239.43.170]) by orsmga005.jf.intel.com with ESMTP; 10 Aug 2020 02:34:36 -0700 From: Xu Guangxin To: ffmpeg-devel@ffmpeg.org, jamrial@gmail.com Date: Mon, 10 Aug 2020 17:34:30 +0800 Message-Id: <20200810093432.24454-2-guangxin.xu@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200810093432.24454-1-guangxin.xu@intel.com> References: <20200810093432.24454-1-guangxin.xu@intel.com> Subject: [FFmpeg-devel] [PATCH V2 1/3] av1_parse: refact, use macro for MAX_OBU_HEADER_SIZE 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: Xu Guangxin MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- libavcodec/av1_parse.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavcodec/av1_parse.h b/libavcodec/av1_parse.h index 01bcd646c2..ae0ebb5a18 100644 --- a/libavcodec/av1_parse.h +++ b/libavcodec/av1_parse.h @@ -27,6 +27,9 @@ #include "avcodec.h" #include "get_bits.h" +// OBU header fields + max leb128 length +#define MAX_OBU_HEADER_SIZE (2 + 8) + typedef struct AV1OBU { /** Size of payload */ int size; @@ -105,7 +108,7 @@ static inline int parse_obu_header(const uint8_t *buf, int buf_size, int ret, extension_flag, has_size_flag; int64_t size; - ret = init_get_bits8(&gb, buf, FFMIN(buf_size, 2 + 8)); // OBU header fields + max leb128 length + ret = init_get_bits8(&gb, buf, FFMIN(buf_size, MAX_OBU_HEADER_SIZE)); if (ret < 0) return ret;