From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 79EAB454A2 for ; Wed, 27 Mar 2024 07:41:21 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3585A68D59B; Wed, 27 Mar 2024 09:41:20 +0200 (EET) Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.18]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D942E68D521 for ; Wed, 27 Mar 2024 09:41:12 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1711525278; x=1743061278; h=from:to:subject:date:message-id:references:in-reply-to: content-transfer-encoding:mime-version; bh=3e1M1jPs2m6tGKOiHYrlizhZQNBHYkDwwg9CpGX2Pa0=; b=Xa65cgcIf4yv0ejbsYNXjuh/z95Uf77wbEnBxXDwveajIjoN+iCcuXXx A4qjJG+N1ZUv3NTjEd4qx+TqE++9dv1ekQhVKjRWoas4l20QbIQUCwKEL Sk/nu4buOTyAHHeHTIUUtncuBxaxHAxKQ4sW560YBCcWALwxEabmK4BnY VlMaQhCEGBa4Pk1mygOiGou8yZELEphOHlY3S0uRH32hgtluzt8QEy+yG n3vCbdLbkvnMZlHjn9utHrk+S54k7fIHJb2VhTXp/2zzGJ8Yck/t5BQdJ 9kKYtTQnQaxgPe4b17v/N4l7muJUHBnbzHHgQjeQolHiC9b2WSLs2Rl1I w==; X-CSE-ConnectionGUID: GcAuag1sQa+WIxcvOY8Vkw== X-CSE-MsgGUID: CFrbZxqfTZW6ZKpPi5XmiA== X-IronPort-AV: E=McAfee;i="6600,9927,11025"; a="6740158" X-IronPort-AV: E=Sophos;i="6.07,158,1708416000"; d="scan'208";a="6740158" Received: from orviesa002.jf.intel.com ([10.64.159.142]) by orvoesa110.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Mar 2024 00:41:10 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,158,1708416000"; d="scan'208";a="47216497" Received: from fmsmsx603.amr.corp.intel.com ([10.18.126.83]) by orviesa002.jf.intel.com with ESMTP/TLS/AES256-GCM-SHA384; 27 Mar 2024 00:41:11 -0700 Received: from fmsmsx611.amr.corp.intel.com (10.18.126.91) by fmsmsx603.amr.corp.intel.com (10.18.126.83) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.35; Wed, 27 Mar 2024 00:41:09 -0700 Received: from FMSEDG603.ED.cps.intel.com (10.1.192.133) by fmsmsx611.amr.corp.intel.com (10.18.126.91) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.35 via Frontend Transport; Wed, 27 Mar 2024 00:41:09 -0700 Received: from NAM12-MW2-obe.outbound.protection.outlook.com (104.47.66.40) by edgegateway.intel.com (192.55.55.68) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.35; Wed, 27 Mar 2024 00:41:09 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=eaS2keMkeXXbYEia7DTXQR4TfaHqe2/ZmZugazVGVag2nYhDc0MVBh5WPVPLrI8at1OunTgiQ88wAS85IeMy451wrUQ8prJ7jjKTA2JEAnRvwXQAQM4me9uPguJXNIOi8vSjkEA547WcQ5zTRH8nQlNICCDyyKy66KVkQp6n+S7to64cAdgMDgSoi0EQK/z+T8CX/0qvWSDWYYcDwB4CFtKh7GJY2Argqy8ZLw80M5Hsca2UXcPdeA4ETbS8w8UpKW9FXhI8MvJA4DyxWrryiN8eZJ4WtT5fT/MhBS5QanjQ63ml0G6zGaLFzuR4TAOgA1ezQhaViVKFa6I7ooA8gA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=nn5YvZFJz+EvcQlul3p+KliELKUtgBVbCYWQXZJ6bWU=; b=GVU8sM/zdK6isHAbFTLaUOu/5Yx+dc/5RKpB4Kt5CHxp4Ck3OboIUyE5twjsDsSSf1gjf3Zs+HXjJ1NK8j0fn+9AfH+VAerI1eb8D0IxqNyek9THQMlzEd6BBr/aiGuREcCkjv80MhQHiV1d3ktGxM4CDYHPObFauz/A0tml26zurtDajA6JF6jOrJK/gLM8zEeVcg32mJtQEGlUF6pCyu/yZwpN79bFtXu5E359bN8OTJdXhA98m9Z2HonGhYcT8QZf17ef8/8gGb+ndjgGX9fV5/sKSWRNGrBu777Itv1J22WUVSJg7ElY7N1Bo36HgNEacZ40PiIfeOK7a4pT0A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none Received: from CH3PR11MB8659.namprd11.prod.outlook.com (2603:10b6:610:1cf::5) by DS7PR11MB7950.namprd11.prod.outlook.com (2603:10b6:8:e0::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.32; Wed, 27 Mar 2024 07:41:03 +0000 Received: from CH3PR11MB8659.namprd11.prod.outlook.com ([fe80::4c7a:ec78:f0:ac0a]) by CH3PR11MB8659.namprd11.prod.outlook.com ([fe80::4c7a:ec78:f0:ac0a%3]) with mapi id 15.20.7409.031; Wed, 27 Mar 2024 07:41:03 +0000 From: "Wu, Tong1" To: FFmpeg development discussions and patches Thread-Topic: [FFmpeg-devel] [PATCH] avcodec/hevc_ps: allocate only the required HEVCHdrParams within a VPS Thread-Index: AQHaeyBLFj/8haNjn064CzJSr6bL9bFCDAsAgAAPcwCAAAJQAIAAAr8AgAkbMAA= Date: Wed, 27 Mar 2024 07:41:02 +0000 Message-ID: References: <20240321122922.7643-1-jamrial@gmail.com> In-Reply-To: <20240321122922.7643-1-jamrial@gmail.com> Accept-Language: zh-CN, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; x-ms-publictraffictype: Email x-ms-traffictypediagnostic: CH3PR11MB8659:EE_|DS7PR11MB7950:EE_ x-ms-office365-filtering-correlation-id: 7b4dc175-8640-4aef-277a-08dc4e3140fc x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: bpM2oSIMjoP8lyw1ko4D0boNBp1yxM7kPJW3VnuksVfOj6jbUQii60jUaACRHZyV9SIRag86c/h6oG59oN9+P1T80kyG0jt7P433HSVWU3ayKEnwNJ4gjyMLHdw5Vyn5cZhHkxJBcBOyIvNM3dDVfqxCDRe5Unh0paw58xS0DbdmpRDyhyJX93M238VpfHI91allHT+uslWWv2UZWRo9Kbioifaejjd4cf7eD3R0s9BVb4PKUZ5NeYNcH/66SEV6rI3DZc3hqi18zQ3AiPI4qkBkmsyXV/1ylXT05Kr6gtgeFeY9WEoReEGlGylQBwvcNlR5T3ask3W0r7R56ciDkWfjMc1ZsXYzUDCP+AzKo7NiR7mvaexghQ8SIntynHBYC47YZBYSAJXiA50W2J6W8txoRJQenyampi1Vr5oFRSdNDgFONJuHQEil9UP799MlInUu0haiW3VyboTbu36CZWM3Pgqai1n6NwS1NDFzYnU2uIT7wWBEudU3CBOqNUVYfS4w6enMZWNcgR6ITTQMc+OMoWlRim/N5F1gjSW+ZC1ygREttsblRKrNeMz/bP9wQpVuR40SVDf8oUPHs0/i0qkXfKp18hefLn/q9ZirPoQ/WSnpKini6Qy7FCM50Ic5Y9ovdVDJSbZWL1eH1K3+R2UxmEo4qzEwo/EimQofEeE= x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:CH3PR11MB8659.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230031)(1800799015)(366007)(376005)(38070700009); DIR:OUT; SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?+aWwKdKmy7C/Z7oOcrcJNOmyigju23p7E1CgVY4UYs4Gqrn6lbOu8G6t8waK?= =?us-ascii?Q?2urZ4Kg9TfbzFbz9ZhQN4gYQFBGPlUCdFfXbIu1gQr7bi7QudhGCEfW+fb4g?= =?us-ascii?Q?J8WhC7HKKBr2DKilTxzOeD1Zfy2DDtkTuZBYCqsHYo2SMOd6jCjmhWnmQV1H?= =?us-ascii?Q?SJgjXl/croGnDQIu4DbpAfx6uQ8mSHPkmbbpf0sx2IW76KxNcA2MaojA5qFr?= =?us-ascii?Q?YjU36FXwJ5ZPABN8e3cyPJZMBSrXAGeQaU11PETzCd5/Num6jS+ZyujEhjZ/?= =?us-ascii?Q?xe2P72ctPBeoxqFj369YBNbrcrCd3BN3P+AW7P2xbGqIifOoS4lVvhoPpDeE?= =?us-ascii?Q?5E+Xaa6rvTT8v6ciqyzpM9Sgs/BRR1+NWtjkGbuZOWt4sdYNTbZkkMrLkVsy?= =?us-ascii?Q?GlPx4PxoeYhzcnBDc2VJcWtmQWLKE84CZ7BrY+46/SRMpQO7+66fPIExILsd?= =?us-ascii?Q?NOOSufQqkzjMLapaxPxfbZRGneRJ0YIWJLdDgrmdJY8J0Pz0gCkYz0d8DjJH?= =?us-ascii?Q?j6aSsHFWLBa96TAPww/Fwm128KlkvXTpVGSLN2hsJsYaTMb8v/9gsqoZF07q?= =?us-ascii?Q?vs4ACKjXw79tAmrVQ/tS7A7dn0JTJR7kRec3RrVf678aZJqd0CToCXpgvlk+?= =?us-ascii?Q?66ycbS03prRU3dSQ1r6AILOVyIq4q/J7r3ybd+/qNK09ui6oAlE6+nxup29T?= =?us-ascii?Q?R8thaL4vfMy3yjgpFfdYdQgus54FL17aMsqin0vcga7iSsadEcsbrE/dl1S5?= =?us-ascii?Q?/wiZec4yxQfUx6Gkvc4fhIC2+XfhvjeH2Tm1eI7adhYSKkshyMY+ub7APNMK?= =?us-ascii?Q?SAym7G9l2kjp5PcLhU+oYajvidp4QwG6Jl+13c1XC7Wm4tjDkUlvEh1NjxIb?= =?us-ascii?Q?eaGZiv3PW2wtMVTpcWiHOqRUNZrnnakAT6UJftTh+Or/Ax+xsdybteqSCDaW?= =?us-ascii?Q?ou6XvTwvR1MyRJ7h5GpyJr2liU98KlLZXyuiezj8LfJyYnhdaq6BjBaMZ12t?= =?us-ascii?Q?ThRY2ezqu8FVb7pYMTqf+Ad1SPwIZmm8VocJKENid79Pu85XN/atHt0gSLBS?= =?us-ascii?Q?zPKyQ8LD1y3pwEvx6eF0kGs5zOTl+2R8YU2wczfI5ugTMaW9IOsipHZFUiRz?= =?us-ascii?Q?Mj2XuTcK9NMn3hb5bvmKbOU10+xoval+5mXSbWUcDkgg8DmiTlsu58SIG28j?= =?us-ascii?Q?UPOn5oqO/4OHhKli/5M/cgGLsf4L5xpN/fdfcXrW3XQQ2UyHiF6N54Z+jg9/?= =?us-ascii?Q?x3nmW48BmhHLpUiBMup8p1CQTLEQ+QpEyTvz8W1wSqM76RRGe6QatnO42zlz?= =?us-ascii?Q?VfvOLq2x/eYqphS88aQwEb5t7HCQlI6BD83cNgDEtD0dHqMBpBvAhtxwQ+XF?= =?us-ascii?Q?whFIE2YpchRjWeuek0i68Hok7aPAO4lIYt81uUfhmAu4q8sCTYBUhlRsQS/r?= =?us-ascii?Q?tURn4hHLub7JokkCpqwHbgQ9O7UC7vaN99flRpKklEVlegQ5GsK0AZT3EjC3?= =?us-ascii?Q?zJh71f7JCI6JUG4VtX5+mfjQ++5us1mhtUGW3oc5Blgd/vrDb3BJ8nesLV0N?= =?us-ascii?Q?zAOOjjC4plRg9V+YPb7eR0+bTaFu0+6ar3YACxBz?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: CH3PR11MB8659.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7b4dc175-8640-4aef-277a-08dc4e3140fc X-MS-Exchange-CrossTenant-originalarrivaltime: 27 Mar 2024 07:41:03.0013 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: civIq3XKFFhB6q/BT+iK+1vjF5jTduIluzXxcgBamWkWbdTn4x/I/RbHPJgTk8WA4utLO7SED9grYR/+JRdrBA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS7PR11MB7950 X-OriginatorOrg: intel.com Subject: Re: [FFmpeg-devel] [PATCH] avcodec/hevc_ps: allocate only the required HEVCHdrParams within a VPS 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Hi James, >From: ffmpeg-devel On Behalf Of James >Almer >Sent: Thursday, March 21, 2024 8:29 PM >To: ffmpeg-devel@ffmpeg.org >Subject: [FFmpeg-devel] [PATCH] avcodec/hevc_ps: allocate only the required >HEVCHdrParams within a VPS > >Signed-off-by: James Almer >--- > libavcodec/hevc_ps.c | 14 +++++++++++++- > libavcodec/hevc_ps.h | 2 +- > 2 files changed, 14 insertions(+), 2 deletions(-) > >diff --git a/libavcodec/hevc_ps.c b/libavcodec/hevc_ps.c >index fb997066d9..d29cf9f372 100644 >--- a/libavcodec/hevc_ps.c >+++ b/libavcodec/hevc_ps.c >@@ -438,13 +438,20 @@ static int decode_hrd(GetBitContext *gb, int >common_inf_present, > return 0; > } > >+static void uninit_vps(FFRefStructOpaque opaque, void *obj) >+{ >+ HEVCVPS *vps = obj; >+ >+ av_freep(&vps->hdr); >+} >+ > int ff_hevc_decode_nal_vps(GetBitContext *gb, AVCodecContext *avctx, > HEVCParamSets *ps) > { > int i,j; > int vps_id = 0; > ptrdiff_t nal_size; >- HEVCVPS *vps = ff_refstruct_allocz(sizeof(*vps)); >+ HEVCVPS *vps = ff_refstruct_alloc_ext(sizeof(*vps), 0, NULL, uninit_vps); > > if (!vps) > return AVERROR(ENOMEM); >@@ -533,6 +540,11 @@ int ff_hevc_decode_nal_vps(GetBitContext *gb, >AVCodecContext *avctx, > "vps_num_hrd_parameters %d is invalid\n", vps- >>vps_num_hrd_parameters); > goto err; > } >+ >+ vps->hdr = av_calloc(vps->vps_num_hrd_parameters, sizeof(*vps->hdr)); >+ if (!vps->hdr) >+ goto err; >+ It looks like this will cause the following !memcmp(ps->vps_list[vps_id], vps, sizeof(*vps)) becomes 0 and furtherly remove_vps is called. Is that expected? Thanks, Tong > for (i = 0; i < vps->vps_num_hrd_parameters; i++) { > int common_inf_present = 1; > >diff --git a/libavcodec/hevc_ps.h b/libavcodec/hevc_ps.h >index 786c896709..87cea479e9 100644 >--- a/libavcodec/hevc_ps.h >+++ b/libavcodec/hevc_ps.h >@@ -152,7 +152,7 @@ typedef struct PTL { > > typedef struct HEVCVPS { > unsigned int vps_id; >- HEVCHdrParams hdr[HEVC_MAX_LAYER_SETS]; >+ HEVCHdrParams *hdr; > > uint8_t vps_temporal_id_nesting_flag; > int vps_max_layers; >-- >2.44.0 > >_______________________________________________ >ffmpeg-devel mailing list >ffmpeg-devel@ffmpeg.org >https://ffmpeg.org/mailman/listinfo/ffmpeg-devel > >To unsubscribe, visit link above, or email >ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe". _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".