From patchwork Thu Mar 28 09:11:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wu, Tong1" X-Patchwork-Id: 47578 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9f96:b0:1a3:b6bb:3029 with SMTP id mm22csp1182854pzb; Thu, 28 Mar 2024 02:12:58 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXSsHFtKHEZ/fYT7Vy3vzQ5B40Hm/Vv4eHjxtbNpu+coHdyCz7IO1BF717A0tA/ol0Y1yekjiVpxXdvdzsOphc7+/A51ZP96bgKVA== X-Google-Smtp-Source: AGHT+IH5Svz0fUYRCkri7CSgLCdl6LtD3Lczoej3bCKGDlgv5vPnZ+gCFipWLJjd4oDEpe01norO X-Received: by 2002:a17:906:e28e:b0:a4e:2653:d54c with SMTP id gg14-20020a170906e28e00b00a4e2653d54cmr285606ejb.6.1711617178536; Thu, 28 Mar 2024 02:12:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1711617178; cv=none; d=google.com; s=arc-20160816; b=hBk13AQpT5LCPWOfPpscV56iabJ/rLlFyeek122YGTuYBOjePs2Rlksf7iqV1NZ0e9 Y0LoRHBx2+x+dRGfCkyE7LRzlqKh7fjBoqzsDpc8dszz5NVOs018ZuOVvrFGw1BCVZH3 /+Ht9AnegS9FSckm2HA5ieNyOa+YTdM1N0zA6OXgRyZUe+5yP7x3k2jlOwp25i8/uJvz HzaPsme94tyLhZWAhIgNF9xawNKE3L+KYOWJP1+TdIFavxL1UTSsK//qffW/w+luXxmx fcUtD3nFg/Xe/1lA3mnzwk6bVaH9FbKrpkkP8lMv15ptjpnvn9nng6bzS/Gjj65yJlJJ qGGw== 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=Zfc4VVeirhpUPxNFqGjRevfuCAEtMD9B/TwtM3olwwc=; fh=CX/m9qTuMDwrotqtm4RkAOJT6yXlKL2vcfWDitFPXZs=; b=Yk9lintkn6z2ozubgP6UKrgtSLTRJ62bOUAcUg7N92sC+8MGCqczUit3g1poA6XJf0 ny8sankREalpBRhcKvyWfWKL6f9MQr6Z025jsBUvfDjEpMwVB/3WFsOK5KG5rdRzpCcg W+lEumln48v5IbksV5r1HhTGg7z9bvREmAOepNow1kVFWbfy8QfmOsv/VX8+I0XntGJn sfscvCeYzxU3syNY9xc2oaNMa2kHrQGbgyjfVE2rLH6loZaTESzEbkmuuY0VXesWvVTx yloE5ZNzzDzy0ARgfHaWFrDGLa2OulhRWrA+1vYPPd2FYC2FD1YWtXklV//CXrDFt21r 4ozQ==; 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=UIId9WOL; 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 mj26-20020a170906af9a00b00a4872002425si528379ejb.453.2024.03.28.02.12.58; Thu, 28 Mar 2024 02:12:58 -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=UIId9WOL; 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 56E2068D732; Thu, 28 Mar 2024 11:12:54 +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.10]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C3C2F68D1FB for ; Thu, 28 Mar 2024 11:12:47 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1711617173; x=1743153173; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=m4OZU5YbDGBmi7ieYjsZhW/HQTQPHxE8c9XW5GVQuWs=; b=UIId9WOLed7yI+fuXKnyJL0IFCEmriaCwm7XimJ7UO2etuGM+ZkFb3+x gjVovPadFuTSR9eWhd4tIHq9atKW5OeWkONUeXXCibMBzXNA0JRYrjST5 pMS/YtBcEd4USm39E5iKfp7sIOvbuER3vLDyU75Nj9siyMSLHfDjjCc4/ GZXvyV1/tsH7+jcNSClg9KfnHNfZO1FTB6+z1casnMgeiL16jco8kktTH E8cx2M/XCyWSZgb5WzdtEIdeZtck/GDSErfIkizxlHwluZHqN74BaZyRa A671Z15VLniyohuCqYM97IXDcgKUmIpcfI0yX0GEsX86hxX5/hqOxormK g==; X-CSE-ConnectionGUID: IKWxA+WHT6iBVJHSjAYdAQ== X-CSE-MsgGUID: IeV6pcr6SEK1BqzlYLuakA== X-IronPort-AV: E=McAfee;i="6600,9927,11026"; a="24207776" X-IronPort-AV: E=Sophos;i="6.07,161,1708416000"; d="scan'208";a="24207776" Received: from orviesa007.jf.intel.com ([10.64.159.147]) by orvoesa102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Mar 2024 02:12:45 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,161,1708416000"; d="scan'208";a="16997231" Received: from desktop-qn7n0nf.sh.intel.com (HELO localhost.localdomain) ([10.239.160.66]) by orviesa007.jf.intel.com with ESMTP; 28 Mar 2024 02:12:43 -0700 From: tong1.wu-at-intel.com@ffmpeg.org To: ffmpeg-devel@ffmpeg.org Date: Thu, 28 Mar 2024 17:11:34 +0800 Message-ID: <20240328091134.388-1-tong1.wu@intel.com> X-Mailer: git-send-email 2.41.0.windows.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] 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: YEw80FEp/FhB 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 | 20 ++++++++++++++++---- libavcodec/hevc_ps.h | 2 +- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/libavcodec/hevc_ps.c b/libavcodec/hevc_ps.c index cbef3ef4cd..8b3a27a17c 100644 --- a/libavcodec/hevc_ps.c +++ b/libavcodec/hevc_ps.c @@ -449,6 +449,16 @@ 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) || + (vps1->hdr && vps2->hdr && !memcmp(vps1->hdr, vps2->hdr, sizeof(*vps1->hdr)))) { + return !memcmp(vps1, vps2, offsetof(HEVCVPS, hdr)); + } + + return 0; +} + int ff_hevc_decode_nal_vps(GetBitContext *gb, AVCodecContext *avctx, HEVCParamSets *ps) { @@ -545,9 +555,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 +581,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..8edac2508d 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,7 @@ typedef struct HEVCVPS { uint8_t data[4096]; int data_size; + HEVCHdrParams *hdr; } HEVCVPS; typedef struct ScalingList {