From patchwork Fri Mar 29 15:13:07 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wu, Tong1" X-Patchwork-Id: 47649 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9f96:b0:1a3:b6bb:3029 with SMTP id mm22csp2043287pzb; Fri, 29 Mar 2024 08:14:31 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXHC3eXbwg1/1AP5+521DHuGqE2F7CI8Mx4CHr0WHNe5mS/WTni8mOgvlGetdUmT4IOYvTckOOVvNFeSEFOMeY0ubOhTTroh4PIVA== X-Google-Smtp-Source: AGHT+IHZtWpOdTHonqWWXO1hVoWB8LOIsetufXqw14S+X+nKq8/uJl5G6tIPwS7Fy5NDRd5epvt0 X-Received: by 2002:a17:906:7251:b0:a4d:f682:50cd with SMTP id n17-20020a170906725100b00a4df68250cdmr1479287ejk.4.1711725271540; Fri, 29 Mar 2024 08:14:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1711725271; cv=none; d=google.com; s=arc-20160816; b=yZ7PJGP2SFfN8PVwYl4skHKOxKFdoF/70qaKwpycvqdLEvH8YmgEl7r+IRVgqSHjQk FTGciWOSH1mawnwNtjyz/27+CMfObM80i8799DsOr3c+kskMAdfLiafnc1H3RiuHtvrN N6CExuw6KhEEekpjUP7HTFNsRpeIohSYDvJIraYm67bu26bBsWx32ndFLioGczm1trok /dCnC3X5nwfJXhdbCUMGhUzW4zdB6AZO74Ull8xcbqrN9QIWmljBJjpX9T6m/+icaEXd HLftXlo5ZQnWXN3lLQkggfNBGzB7ttBGaSG2j/L+Vx7aaY0FWyqh8Xe4b7HDkliZYK9t tnzg== 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:message-id:date:to:from :dkim-signature:delivered-to; bh=4BWh4rlsyglr7rUQj3G+KNDNNLAnZSo7Vx1NpoAbWjE=; fh=CX/m9qTuMDwrotqtm4RkAOJT6yXlKL2vcfWDitFPXZs=; b=leyckD66YOt1+jCwQ1JowRF7oAxdpJABPLK3bvCR7PMYzCd3frY66eJcPRfXxRAeXe txEjz4EV3gNmSXnPI06Fp8F6c9fQ7wQnDmU96mPY/GUwdcflmUawLcX8wO6f7zAeLXJt QElkSIJ1iyiI0oh/XTQT+AE4jzhuINvxeiLdH85eNEDDSOd+P6CnUjSNEucDIK/ZMeaA +llFLw8E1+wfO3ltrR0VN0AYUiwNVf7GWT5Son/La5zWnr576Bbxa+sqPhGH3hcAjN05 PmDHtYgmXEDvWbDvM4YmWswB7dQXOC0SHPko4nJBYpaD3rLYijZH9UBjS8b8EVHkEOtY pGJQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=Fzwn2bnf; 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 x21-20020a170906b09500b00a46bdefb639si1871232ejy.382.2024.03.29.08.14.31; Fri, 29 Mar 2024 08:14:31 -0700 (PDT) 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=Fzwn2bnf; 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 C959C68D5E0; Fri, 29 Mar 2024 17:14:27 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.9]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0239068D54D for ; Fri, 29 Mar 2024 17:14:19 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1711725266; x=1743261266; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=ALs+JGfbs5yw/FYIMJWiyF3OkasaCxaHZMnO1T1kkHA=; b=Fzwn2bnftBOFoknStUm+UXb4ts3K76dXw8na8tu22ceQ2Uve76EYR6p7 tcPN3LBBMjvy3bSyZbBLkrkN9fB7gkQ9JMTiDCWvufOC9vR5QeMYBm2qn wJpVbuttGq5ffHMdVpPQAJmyWjPfDkZ4kbILmz/xhg0j44Xe7PjVMWlL/ EudVGm3V7rEXzZxZp4kUM9emxVtzW8pivw2Pgt/WH/FkQk34IioJZU8TQ G+dVdJv5n1aiGULDWr+KwuajEEydRxAzmCix57osRGIGI20BzwikU/sOu 1v0PMTxl38s1jITjqlwmN1kHAF7oOPohgNgDjiEtuE40LivMxiq/yB64z A==; X-CSE-ConnectionGUID: fxFdyzL2Ql+Y3lMo7JvLNQ== X-CSE-MsgGUID: 70Nn8hCwQOeYXmzmZ7B0yg== X-IronPort-AV: E=McAfee;i="6600,9927,11028"; a="29398288" X-IronPort-AV: E=Sophos;i="6.07,165,1708416000"; d="scan'208";a="29398288" Received: from orviesa006.jf.intel.com ([10.64.159.146]) by orvoesa101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Mar 2024 08:14:17 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,165,1708416000"; d="scan'208";a="17468270" Received: from desktop-qn7n0nf.sh.intel.com (HELO localhost.localdomain) ([10.239.160.66]) by orviesa006.jf.intel.com with ESMTP; 29 Mar 2024 08:14:15 -0700 From: tong1.wu-at-intel.com@ffmpeg.org To: ffmpeg-devel@ffmpeg.org Date: Fri, 29 Mar 2024 23:13:07 +0800 Message-ID: <20240329151307.659-1-tong1.wu@intel.com> X-Mailer: git-send-email 2.41.0.windows.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2] avcodec/hevc_ps: fix the problem of memcmp losing effectiveness 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: Tong Wu Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: fEm/szP2E34U From: Tong Wu HEVCHdrParams* receives a pointer which points to a dynamically allocated memory block. It causes the memcmp always returning 1. Add a function to do the comparision. A condition is also added to avoid malloc(0). Signed-off-by: Tong Wu --- libavcodec/hevc_ps.c | 22 ++++++++++++++++++---- libavcodec/hevc_ps.h | 4 +++- 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/libavcodec/hevc_ps.c b/libavcodec/hevc_ps.c index cbef3ef4cd..d3c589ec24 100644 --- a/libavcodec/hevc_ps.c +++ b/libavcodec/hevc_ps.c @@ -449,6 +449,18 @@ static void uninit_vps(FFRefStructOpaque opaque, void *obj) av_freep(&vps->hdr); } +static int compare_vps(const HEVCVPS *vps1, const HEVCVPS *vps2) +{ + if (!vps1->hdr && !vps2->hdr && !memcmp(vps1, vps2, offsetof(HEVCVPS, hdr))) + return 1; + + if (vps1->hdr && vps2->hdr && !memcmp(vps1, vps2, offsetof(HEVCVPS, hdr)) && + !memcmp(vps1->hdr, vps2->hdr, vps1->vps_num_hrd_parameters * sizeof(*vps1->hdr))) + return 1; + + return 0; +} + int ff_hevc_decode_nal_vps(GetBitContext *gb, AVCodecContext *avctx, HEVCParamSets *ps) { @@ -545,9 +557,11 @@ int ff_hevc_decode_nal_vps(GetBitContext *gb, AVCodecContext *avctx, goto err; } - vps->hdr = av_calloc(vps->vps_num_hrd_parameters, sizeof(*vps->hdr)); - if (!vps->hdr) - goto err; + if (vps->vps_num_hrd_parameters) { + vps->hdr = av_calloc(vps->vps_num_hrd_parameters, sizeof(*vps->hdr)); + if (!vps->hdr) + goto err; + } for (i = 0; i < vps->vps_num_hrd_parameters; i++) { int common_inf_present = 1; @@ -569,7 +583,7 @@ int ff_hevc_decode_nal_vps(GetBitContext *gb, AVCodecContext *avctx, } if (ps->vps_list[vps_id] && - !memcmp(ps->vps_list[vps_id], vps, sizeof(*vps))) { + compare_vps(ps->vps_list[vps_id], vps)) { ff_refstruct_unref(&vps); } else { remove_vps(ps, vps_id); diff --git a/libavcodec/hevc_ps.h b/libavcodec/hevc_ps.h index cc75aeb8d3..0d8eaf2b3e 100644 --- a/libavcodec/hevc_ps.h +++ b/libavcodec/hevc_ps.h @@ -153,7 +153,6 @@ typedef struct PTL { typedef struct HEVCVPS { unsigned int vps_id; - HEVCHdrParams *hdr; uint8_t vps_temporal_id_nesting_flag; int vps_max_layers; @@ -175,6 +174,9 @@ typedef struct HEVCVPS { uint8_t data[4096]; int data_size; + /* Put this at the end of the structure to make it easier to calculate the + * size before this pointer, which is used for memcmp */ + HEVCHdrParams *hdr; } HEVCVPS; typedef struct ScalingList {