From patchwork Fri Feb 3 02:09:18 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: 40227 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:5494:b0:bf:7b3a:fd32 with SMTP id i20csp835857pzk; Thu, 2 Feb 2023 18:11:07 -0800 (PST) X-Google-Smtp-Source: AK7set+aN7aZIeieijOHze0LoPSF4ASCSrCzoaLVsyI9+O1iVCZZFfG8dz6JaEGzV65ZS59x3/K1 X-Received: by 2002:aa7:d54c:0:b0:4a3:43c1:8441 with SMTP id u12-20020aa7d54c000000b004a343c18441mr3160541edr.21.1675390267424; Thu, 02 Feb 2023 18:11:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675390267; cv=none; d=google.com; s=arc-20160816; b=ZfjM4ASEtPy3smgn1aiHILikmyi0SSw57DkPWHGD9xY27o+xPXkod2yUrxJnIKkn0Q HlqkJpOgfimRZUwE4TaYB0PQi76/auxTU1RwEKsBM6kHK4OjmjdsMKwSPYwoWsH2jRfz llWExQaDhjASLhxhsQW6R27VvvJtd2Nk1SK5f6clVi5r8jL2alHZmt9zQ0SIPjGQJlUS dY79HuhTtYIYPqmb01Wmf4DQy6lsDZuytq3ZKi0gV80J1T5vIBaKTEYxtyd7K6dtK5my e8IRBxKiE44vodDWHWQlh45l0mJBuoLKxflTVOhk36xKdft9edyTg5mo6SKBepjbn4ZV hvmg== 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=wTrCHpjklCjY6F1yPniaGAXceEfhiWtap1eaeTWKG7qwJaJP6yhoDnXIaRvu6Y309R 45xRgoxeq62AmHIY8O7Xx5WaAVTuDFx/7+40aR5XElnmdrBQSL30SElpIc2OWW7FwAEk q/gc0kZbRjCDpSHQ99WeUZJ6beG28Inkn2gba/Lp5KyixYVp15PkdWXm+sznpZq5tFpa ChYl0lcWhnVB7ITmacFSUan3h+ai3pjxBUtCcrwhiVSG0LaREz2FnWO76Ya8HKsBnPv2 yQeqfup31kbE0gwXN0eyev+ueE49crPxKiM3QufOG5WOwrWSH1Rd0G+9bCwYMcj8LMB8 U5KQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=DND3o5cH; 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 v10-20020a056402184a00b0046c8d52c79asi1003810edy.357.2023.02.02.18.11.07; Thu, 02 Feb 2023 18:11:07 -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=DND3o5cH; 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 C9C5D68BE56; Fri, 3 Feb 2023 04:10:40 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C79FD68BE30 for ; Fri, 3 Feb 2023 04:10:33 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1675390239; x=1706926239; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=L0fAowE8Rj3D3/ekpvujoRAjdJaOCWU8raZDLJN3GcM=; b=DND3o5cHWFyGNUiELSfQkwqY/8Wd+HtkqW5Qay9Ste84sjXMMZoVOgBF BN8/dYRnK6etMiwnPC1aOKO478p4Q70onmI4b6W63Yj78QlVnWnrN1J/U +bR8eTHnlqjfNXWsQFIBRaVhv8iSqrzjlA/lQ+clsb8P3EsZ3Awx0Vf+y X7iwKffEXcaYO4YFl+XBFKTacgQ6jk3KXjjpQh4Og7l+XinHCR+f2JaeJ B+DDYqn74Vj33A9vLetEtHG3qsLAk1/ntHFFnFs55zY7QWc17G5EQdm5I HCv3Irf8g6qXNWywH40VLld+gwdIG9TlUUwnCGEb7dRx/1HX1S7rHfFHA g==; X-IronPort-AV: E=McAfee;i="6500,9779,10609"; a="328651725" X-IronPort-AV: E=Sophos;i="5.97,269,1669104000"; d="scan'208";a="328651725" Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Feb 2023 18:10:27 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10609"; a="667505863" X-IronPort-AV: E=Sophos;i="5.97,269,1669104000"; d="scan'208";a="667505863" Received: from t.sh.intel.com ([10.239.159.159]) by fmsmga007.fm.intel.com with ESMTP; 02 Feb 2023 18:10:26 -0800 From: Fei Wang To: ffmpeg-devel@ffmpeg.org Date: Fri, 3 Feb 2023 10:09:18 +0800 Message-Id: <20230203020924.443162-4-fei.w.wang@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230203020924.443162-1-fei.w.wang@intel.com> References: <20230203020924.443162-1-fei.w.wang@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v4 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: htuYRSJugkbY 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;