From patchwork Thu Dec 1 08:14:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wang, Fei W" X-Patchwork-Id: 39553 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp196158pzb; Thu, 1 Dec 2022 00:15:32 -0800 (PST) X-Google-Smtp-Source: AA0mqf7cSckeQjbG/khcwl+PRjwI0PmFAmvm/CBN/XBCwDhxCqIAwIjU28WIyMr3cO/NjXtBSbPQ X-Received: by 2002:a17:906:1748:b0:7b2:7fa8:3d84 with SMTP id d8-20020a170906174800b007b27fa83d84mr13006535eje.650.1669882532276; Thu, 01 Dec 2022 00:15:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669882532; cv=none; d=google.com; s=arc-20160816; b=qL9ohEN3S3Mn4dHAwJNlNKc8KpJSKYjshPP5tousLSS4+BzLFIpq8pC3tPmEdOw4+5 Hl+phQbR3neg2xQi2slfbcxPF6Zsi2pvL4Wvj6/MIz4QjIjK1wBvpI9LU8WDVEG+XpzS JQR4wMXN7sqEjDBFvpJAdXnQ5HhbAIBEIguR0QQQwpHeKChwSLgmcl7grntXBYWJFLTe 9grw/7xi89pikOQCWXXIXz77uXsevcxys2B1fzASsm+PaPdFEf2BzQ1gzX9DXc9PySCV Vo5tTwp0Wk23i06wpp3kRt5i6fHjxiGRV+PzRCLtqNOVl9g1GlGVhSNJAP+o7LuBvfe3 PH1w== 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=Fm5eYqA3f6yv9Bng+7FcvnKxAvVa4dv5i7YXidpgcJI=; b=K5Kufes2jrWl4VJabUphYkPnqWa7f5y53q1BShXLJO8L2sPxohbxDZMBS4FvzH10VR zCpVDXATcKQkz7PuYHOnDlqO5MT8adru04lQ0RmfVA0EDBGIGb2BgRHpaCo0O7Gy21wl 3Snmg/IhL4p3RzWERuJXBtRglam29fPAvpywuX98bmmWFzjlvBQFZaJlgb9/tkwvFoLO 6O904sYPE//k+WuRv7h8AEW4s7f0jrxxO+rgMOggZpM2MrrIOFdF0SQf4pchVX6lw5Jx Qo8/bNzPMmyBQ8IBE+uL20HDCq1dXt8DYeXTH4VfTGw7xb7xWPeHgeud5JDBIUnY/DqI cYRA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=km41VSp9; 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 r13-20020a05640251cd00b0046bc9cbd8f0si2603781edd.504.2022.12.01.00.15.31; Thu, 01 Dec 2022 00:15: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=km41VSp9; 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 38A8368B99F; Thu, 1 Dec 2022 10:14:57 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EB1F268B91B for ; Thu, 1 Dec 2022 10:14:49 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1669882495; x=1701418495; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=lG4KkFKx6Z7LUXmYOa4gde41HIhoYgBQCyJQ8B0eOmg=; b=km41VSp9fI2V6Bi6ZcMKIdrk5g99AfdNRSqeVpABxEaoDNm/sInnsYaK G/x+m/Dr6OO15XD17It9Vw12BBRYJU9cjGrpftFJe8imu64xB3Q4h+IOg c+UoUhk7fiKhVY2zLixk5RnKaPt1AX+egwA2iZ9W3e2+XBwX52zoVKdA/ 4C4e7hhi5Bai43VlL9d+qK4Ljpno4F4VfX8iLJmkU37/CiehfjR5sdU3r Ck51qT7/KaQbZ/J9+ju3pU4MwLsM5AJnsQFKIwqqEHBCCdWfmfPHIkJJO Kiu4tmG+RARqmFzgmk1zZJgeX7tFisDxXzQwJA7nIO+ARLVLik4z6jvXI A==; X-IronPort-AV: E=McAfee;i="6500,9779,10547"; a="298989828" X-IronPort-AV: E=Sophos;i="5.96,207,1665471600"; d="scan'208";a="298989828" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Dec 2022 00:14:47 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10547"; a="675341744" X-IronPort-AV: E=Sophos;i="5.96,207,1665471600"; d="scan'208";a="675341744" Received: from t.sh.intel.com ([10.239.159.159]) by orsmga008.jf.intel.com with ESMTP; 01 Dec 2022 00:14:45 -0800 From: Fei Wang To: ffmpeg-devel@ffmpeg.org Date: Thu, 1 Dec 2022 16:14:00 +0800 Message-Id: <20221201081408.2194579-5-fei.w.wang@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221201081408.2194579-1-fei.w.wang@intel.com> References: <20221201081408.2194579-1-fei.w.wang@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v1 05/13] 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: L+LMqzmtRDwq 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 edf3a2b134..50e7fd4465 100644 --- a/libavcodec/hevcdec.c +++ b/libavcodec/hevcdec.c @@ -840,6 +840,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;