From patchwork Tue Jan 3 12:59:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wang, Fei W" X-Patchwork-Id: 39844 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:bc95:b0:ad:ade2:bfd2 with SMTP id fx21csp8049599pzb; Tue, 3 Jan 2023 05:01:33 -0800 (PST) X-Google-Smtp-Source: AMrXdXvoGr84mHEaYzQVa7/EOZNSxjURZm2DxaoThZ0zPTPrI2CDdqdLuXFA0Cfk1rLygwm6nY8X X-Received: by 2002:a17:906:354c:b0:7c0:e988:4157 with SMTP id s12-20020a170906354c00b007c0e9884157mr37973810eja.40.1672750892577; Tue, 03 Jan 2023 05:01:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672750892; cv=none; d=google.com; s=arc-20160816; b=h+4yLkFF/F1heEuQ2mU4jSezxhLcxumPoWgdmMLh7+wDdPJAKJvZ5+P7xgUnZhQvmi orYWnmErR4ede/8atprjy/jskFEnqsbAwnattbWxfVQNeVZwM5E/+5GIX9uJKQtgIFu9 Fd/N3b17TJNiZZ6ILV7LhVO9/cabD08KZg+tEgV1h708SygaKe2BaWZ00TRkUptQ4+fW LfwfnlnHBhGaLxEMwDhEm7YoF5rdO3P+jehcxf4AgKyviNfYgGaEDgCYgQF0JHKzFZ1o g83C7hYXEpfLQxmnFGkjC+OnEIgR0WWPud4aoMtVGd7ue01daIFSGL5L1hkl+oRi2MHc fPww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc: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=0jUeFCJaBCEWh23PCD+yPno7w0i7CgZp/aJzbAhvMIA=; b=TFQlR0wb0OGCJDcc6l7Gbkt9J/hUduq3/B1crHwicG8TQuUTMS7DlhCFNC36a2BWTU BRB7gCz6kmCiVKYyFVGyw+TQ/cGNO97FZc8JAvwxChAoQfqgTr9BKcfgdxG8Jjs9XSGF dLGZUdq9R61WSgiDi3YRK1TCp7wAmbQmDMSExAIXzDT8zz+3VDyjZTQGR8k1mU7xkMDD eUNMrpQ9gNqjGk0GjosXROS1DJ7OARbnrMUqFQleFn7U5iW6LwYGWPxNVF1yEhbwH8q6 m62s8eP1Hs1TdLTYoMTUlc33ES7c69XcyxLVBIpdySUSfVPVXO3CPI4bvRI3QyxEhcwh k0kA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=Fxxv3yh2; 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 hp25-20020a1709073e1900b007c164256d90si29146020ejc.638.2023.01.03.05.01.31; Tue, 03 Jan 2023 05:01:32 -0800 (PST) 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=Fxxv3yh2; 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 B319168BD53; Tue, 3 Jan 2023 15:00:49 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9ADDF68BD42 for ; Tue, 3 Jan 2023 15:00:42 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1672750847; x=1704286847; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=L0fAowE8Rj3D3/ekpvujoRAjdJaOCWU8raZDLJN3GcM=; b=Fxxv3yh2yZ7tnsSeekM/cgFF4tjVFIQ7sYIqLLKP8UpZ3SwzW2cLqjCm HDHPGFBv7C0d6PFvn2iiVM0BdVHa7cFuNFlThw7KJiRDLRCa4XhIEa/dH ADsST2Ab95YZqUR9sGqxfEIpr8ZJYG850yGz0CVgAuTWzEhltiFgVyyGm VIkSYjH2UQX0/338fCIpG/uvnX6TdNVcuJyFxPvklOKvKyS9R8BBB0gFz KPwtiPu+6p0zo3sTrJ+93nQO3XDOeINUbwDEoqX/dKOg+ov1E+jerU4uF A9FJZQWmOOhmFDgaS/zpPk+dr5Ppvb1gBobx8Xi7cE4ECshunZCgtceKD A==; X-IronPort-AV: E=McAfee;i="6500,9779,10579"; a="302026277" X-IronPort-AV: E=Sophos;i="5.96,297,1665471600"; d="scan'208";a="302026277" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Jan 2023 05:00:37 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10578"; a="718091825" X-IronPort-AV: E=Sophos;i="5.96,297,1665471600"; d="scan'208";a="718091825" Received: from t.sh.intel.com ([10.239.159.159]) by fmsmga008.fm.intel.com with ESMTP; 03 Jan 2023 05:00:36 -0800 From: Fei Wang To: ffmpeg-devel@ffmpeg.org Date: Tue, 3 Jan 2023 20:59:46 +0800 Message-Id: <20230103125952.2707824-5-fei.w.wang@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230103125952.2707824-1-fei.w.wang@intel.com> References: <20230103125952.2707824-1-fei.w.wang@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 05/11] lavc/hevcdec: Fix the parsing for use_integer_mv_flag 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 Cc: Linjie Fu , Fei Wang , Linjie Fu Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: WsNjM7MHplB3 From: Linjie Fu According to 7.3.6.1, use_integer_mv_flag should be parsed if motion_vector_resolution_control_idc equals to 2. If not present, it equals to motion_vector_resolution_control_idc. Signed-off-by: Linjie Fu Signed-off-by: Fei Wang --- libavcodec/hevcdec.c | 8 ++++++++ libavcodec/hevcdec.h | 1 + 2 files changed, 9 insertions(+) diff --git a/libavcodec/hevcdec.c b/libavcodec/hevcdec.c index f9a97ac7f5..52fa627133 100644 --- a/libavcodec/hevcdec.c +++ b/libavcodec/hevcdec.c @@ -839,6 +839,14 @@ static int hls_slice_header(HEVCContext *s) sh->max_num_merge_cand); return AVERROR_INVALIDDATA; } + + // Syntax in 7.3.6.1 + if (s->ps.sps->motion_vector_resolution_control_idc == 2) + sh->use_integer_mv_flag = get_bits1(gb); + else + // Inferred to be equal to motion_vector_resolution_control_idc if not present + sh->use_integer_mv_flag = s->ps.sps->motion_vector_resolution_control_idc; + } sh->slice_qp_delta = get_se_golomb(gb); diff --git a/libavcodec/hevcdec.h b/libavcodec/hevcdec.h index 7841ba8565..a7fc669bcb 100644 --- a/libavcodec/hevcdec.h +++ b/libavcodec/hevcdec.h @@ -305,6 +305,7 @@ typedef struct SliceHeader { int tc_offset; ///< tc_offset_div2 * 2 unsigned int max_num_merge_cand; ///< 5 - 5_minus_max_num_merge_cand + uint8_t use_integer_mv_flag; unsigned *entry_point_offset; int * offset;