From patchwork Mon Dec 5 06:09:21 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: 39601 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp3010305pzb; Sun, 4 Dec 2022 22:10:34 -0800 (PST) X-Google-Smtp-Source: AA0mqf7UsOrMCDnq6u+NfXncbjH3o69yAf+0Qwc+lo8Ikn98JZvXA0eDBOf6wID6PENOk053m/2m X-Received: by 2002:a17:906:6b86:b0:7c0:eeae:10c8 with SMTP id l6-20020a1709066b8600b007c0eeae10c8mr3888509ejr.68.1670220634754; Sun, 04 Dec 2022 22:10:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670220634; cv=none; d=google.com; s=arc-20160816; b=xz/zPqAM6Exnj/p3TBYtlxIenI1xeCtTv1G0FYFhFmyJnb+PFicSzuqYSSpDx2R+QJ OY9LdWWiQwE8GxC/Vyj7wJJ6Mr1kd9xjru1Hc0JulXKjPze2MzhdfXiMuRcHHJCZo5M1 cFKkV4H/eDR7mcFRGP4h1en4OM3iMRRRRBfyHnotzy3gMZ9tXNbbBhpsj7BDRcvLZ/rB BcvnWxQELjZCntBpmWre57tNsut1/q6NyWnBTqEDnWcOT/21hV0ebYSYgjJOrWegB/a3 ayx2IrXSThJ1tFywfvX5DmeKZ6BvKZCDEQkDBTAAvYK5XHw+moa7uztNPMA9rZrH1xsh FVOA== 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=ixkBbY6J6tnzgT+3U78A3Z8LEP5SJshJGXcgE1XiLLWtopVBdKZiM+7xPnzh9V9ChW JJbwXjWqvpGvUbYj8Xz1uTdlRx6JbH7/k//k9AWygxfzgVe8mehHRNN233I0vcaDQ9Pw xQ+lLYXE8y8LJfMoXWqat/cKvY+A4hFo1vPHANCHEovqkch0vWn6K8YVudrp5uAiiRV5 03wJsFOIqm/CqWdFEoQBxyTZYOB1J68zTz2Wu8XPpMJ8XBjlp4fqbJ7DUdugWKDVdGBy 3y8M1tFaeVFdB5NZg8kGNLsUZOQFxq/preZQNjlGOk+sN388V+yK7mO8uhAUYhL2Y4ZT baxw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=XfBen0oM; 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 t14-20020a056402524e00b0046cb371ebd9si2139357edd.213.2022.12.04.22.10.34; Sun, 04 Dec 2022 22:10:34 -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=XfBen0oM; 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 AE41868BC5F; Mon, 5 Dec 2022 08:10:04 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8A3E468BC42 for ; Mon, 5 Dec 2022 08:09:57 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1670220602; x=1701756602; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=L0fAowE8Rj3D3/ekpvujoRAjdJaOCWU8raZDLJN3GcM=; b=XfBen0oMybwVOGM6ps9EuTbST8/IvJB2cCKOICgbHO9WVpmlKEkeV+o/ ypSggRRMzk3ZI7y5xEGqwH0qY9pO3A5O78a8NzJXecQ9etFlwB3O4I5u/ Z6I5VJY6d4VKAcROOrTuhwhmTltq5Jq1zet19CGbapUM1DcnQBWkVHd3P mBMdI+jBBUIPp3fZRwTkIatPe52WFmykncLeUUhczcnYZyzh8ol3l2NBa n0CEHFhwPBT5OokditrT+IGjFnq3OXW53mkNO7AGG64NC2oeKlC6oK5Di UqmKP1hJAl9OWCgPNsZ2TF7DIk4EbVRNQ701yXcP4Vv4RZNRseKdpZDY/ A==; X-IronPort-AV: E=McAfee;i="6500,9779,10551"; a="295971365" X-IronPort-AV: E=Sophos;i="5.96,218,1665471600"; d="scan'208";a="295971365" Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Dec 2022 22:09:52 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10551"; a="645700077" X-IronPort-AV: E=Sophos;i="5.96,218,1665471600"; d="scan'208";a="645700077" Received: from t.sh.intel.com ([10.239.159.159]) by orsmga002.jf.intel.com with ESMTP; 04 Dec 2022 22:09:50 -0800 From: Fei Wang To: ffmpeg-devel@ffmpeg.org Date: Mon, 5 Dec 2022 14:09:21 +0800 Message-Id: <20221205060929.2511871-5-fei.w.wang@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221205060929.2511871-1-fei.w.wang@intel.com> References: <20221205060929.2511871-1-fei.w.wang@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 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: zUvnjn+xYwgA 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;