From patchwork Mon Feb 6 05:44:52 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: 40292 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:5494:b0:bf:7b3a:fd32 with SMTP id i20csp3089838pzk; Sun, 5 Feb 2023 21:46:42 -0800 (PST) X-Google-Smtp-Source: AK7set8OgZerueuFeY9+14ICwVVUQHFo47joq3uv8RUhY4O6x+DLnOHRYRQ0qBjO7zZ4+eSD3TVp X-Received: by 2002:a17:907:3e82:b0:84d:47e3:fe49 with SMTP id hs2-20020a1709073e8200b0084d47e3fe49mr25801556ejc.39.1675662401973; Sun, 05 Feb 2023 21:46:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675662401; cv=none; d=google.com; s=arc-20160816; b=MVQaKv9nUW9SneIHmhqBaLsnTXVgjXbF1KpSQyhK3eInUgFWMdZzhL3EJT04iUZ6KH e+iZ8X08FRTbRu8GHH+nrDgfJJra6hZWQYDI9M49SwdhFPOaAB0EodVRHjLskmw6Ijdg CKqNT0E1S0/kYF6p2lzwQSAANO+PyZvA0mSDiBmqT9G0ysn/nf7MeCRI+As65ASk9LUN 0Ivl/HyFLAhtUpPXtN1oqS2kdip7YvFEuIrC2/CdTtRNzmJU2MUgN4Vl5CG5w18Sy5kL j+fpnblL4MWfaDU2YnWiRysHAug28wPd+zsQLAYDJKJqBdhZEeMrkH431kVfTW7elaLV /5sw== 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=0jUeFCJaBCEWh23PCD+yPno7w0i7CgZp/aJzbAhvMIA=; b=cIbRH/7kEXVZyTJGHb92SE/M210OZenDxahN2KKHRi4BMvCu53yJTnW+T4l7XkmZfX HdEPbbDAkOcguXiMEZE1xJvvPtNArzM4r0hdrgt8eV027ZCe/jD0oxhpCSGHekKTeEED 0O43vRZ866YE3e3SrnL8RnzV2Lm+lXPL7mwz0i1LxlUMXAb8mUj+7kpxLFYDu+Tgs6/7 Uni99KYi5u6b8VX9lIP3++xPDiHIa8uG+9l+vPTQFlcZ/8vJjm9UoIpRzmqF01bCBoKf y8MDMgSeyWx0n/X7ysOFCg8Cv/tJUBNWN+xzFUgpbJHS1/kiRe7nqGU0IiFJKAXPefeU fe1g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=MvOvOVGa; 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 fd10-20020a1709072a0a00b00894817b761bsi6230760ejc.69.2023.02.05.21.46.41; Sun, 05 Feb 2023 21:46:41 -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=MvOvOVGa; 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 3967B68BE62; Mon, 6 Feb 2023 07:46:17 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BCC2968BC4A for ; Mon, 6 Feb 2023 07:46:09 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1675662375; x=1707198375; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=L0fAowE8Rj3D3/ekpvujoRAjdJaOCWU8raZDLJN3GcM=; b=MvOvOVGaNubM4E8HGFdzEyw98IoGc5RFJCWRBxft5+ukaryrHibr9RrU 9kRBDBKw5q1Qn2fqswbCgjuIHlUoKxFjcZGUCIrC5NSb83HfX1D9x9YVj veQkPnj7B2SBYqq26+3aCpmu+uQR8/VWQHkvfC4pTPlRNp7I8OLu0ODqe +5APoOq/MQF5lAu3kjE4jVlqUhWxUot2I2UW4gNEPq9tZs3WFp5dJ5Jd6 01dysQguTW9eo0VRFWyj40azSEBk92etxaGOZCoG4NvWplo8sNXO0B3bT oLJDPZdoqBb+Lyo7GupWB8UOlFz6QzQy42J18zpP+bQI84BIejzhdjySu Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10612"; a="317144201" X-IronPort-AV: E=Sophos;i="5.97,276,1669104000"; d="scan'208";a="317144201" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Feb 2023 21:46:03 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10612"; a="698737410" X-IronPort-AV: E=Sophos;i="5.97,276,1669104000"; d="scan'208";a="698737410" Received: from t.sh.intel.com ([10.239.159.159]) by orsmga001.jf.intel.com with ESMTP; 05 Feb 2023 21:46:03 -0800 From: Fei Wang To: ffmpeg-devel@ffmpeg.org Date: Mon, 6 Feb 2023 13:44:52 +0800 Message-Id: <20230206054458.907060-4-fei.w.wang@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230206054458.907060-1-fei.w.wang@intel.com> References: <20230206054458.907060-1-fei.w.wang@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v5 04/10] 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: F7TUy/QQ1kkP 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;