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 4ECD64A108 for ; Thu, 21 Mar 2024 12:11:27 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7C20868D4D8; Thu, 21 Mar 2024 14:11:26 +0200 (EET) Received: from mail-pf1-f179.google.com (mail-pf1-f179.google.com [209.85.210.179]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0FB6368D3A3 for ; Thu, 21 Mar 2024 14:11:20 +0200 (EET) Received: by mail-pf1-f179.google.com with SMTP id d2e1a72fcca58-6e6fb9a494aso749352b3a.0 for ; Thu, 21 Mar 2024 05:11:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1711023077; x=1711627877; darn=ffmpeg.org; h=content-transfer-encoding:in-reply-to:from:content-language :references:to:subject:user-agent:mime-version:date:message-id:from :to:cc:subject:date:message-id:reply-to; bh=KFz60sr6D6YCVJ/+i8XS0/rQ6jmvETiuqeiaB6LY/hE=; b=LRz7FxCm+vgqT1UoQ/HILltEtH60ZzrEauH9bdT6PXK+6y479ycA5jWjW3wuHjrOUn keLSuAunsnC7+Kcxc3w4AI4hbuwZCkqftAXvA9LmfPzfQPM3bb7G9+vSPUrpxOf0fm/Q uzMtl0g2/cHhGpal/NB+ODR6L4Ph29VhYRiayZ0aE4mhruTah0cbiFkoJxOlJ0+kREAj 7iohujOsQfaidgl7fZ5KPAxMsWWZ69HARMlHhg0a5ZwT70VV4Oo0HCorzWRbzrmi0lGy 2hthwDDil8XCyRRhVZCoD8AHC6WcBM2QPziDmsCaZYY4m7nNwKJMb89bzf54w+2Z5qKS 9jvg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711023077; x=1711627877; h=content-transfer-encoding:in-reply-to:from:content-language :references:to:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=KFz60sr6D6YCVJ/+i8XS0/rQ6jmvETiuqeiaB6LY/hE=; b=wqyQstDVmUf0ohgMi5G4u+xLUyG2qPNWgLtoLV+BgvCokqk3WYkhx1yx56yl/Fd1zq 0jZXFzHsWNw50qShYMvTyphucp9yinxEfyYSuzpHoqpC9S8vE1M5ioAlygZCyfgoIfUf Lgxj0V10dA1areZYM8ybjde3VugYVn7RDlxUwyz2TSa2bYCgwPwsbjcVnxSH+p+i8HuL NFUAqXfNGwOttdcypdUpww9R9gyal3MHRqHyDgpXNeQeqpzGPKsbCC0FUApkuF74SGRp flk7AZqGw8ynMMoiv50iyWO64x7iae+/UuY36c+xs+WreZ3MpyXnD1ikpcHuFpWNY2h5 qArA== X-Gm-Message-State: AOJu0YwIphsFhRvEP/i01YjsqG4MU4bF7DW8QThepa9GhtYrUYLU2AsI wA9GWI9Avi1PXoxE6shyIUvy83sC5D73KXrsgtDeiQoiP6RhaD1ZK00+XpUc X-Google-Smtp-Source: AGHT+IEwuc0PtUva6NhVUEWPl3xxW9OcnWXjP25/bX2RVDPln0M6T+tnTAZYPwfXAEfSRMxTez5yvQ== X-Received: by 2002:a05:6a00:3c90:b0:6e5:736e:9e4c with SMTP id lm16-20020a056a003c9000b006e5736e9e4cmr1602881pfb.29.1711023076771; Thu, 21 Mar 2024 05:11:16 -0700 (PDT) Received: from [192.168.0.10] ([190.194.167.233]) by smtp.gmail.com with ESMTPSA id c11-20020a62e80b000000b006e6aee6807dsm13210881pfi.22.2024.03.21.05.11.15 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 21 Mar 2024 05:11:16 -0700 (PDT) Message-ID: <78d1ee1d-9617-4757-833d-12719831862d@gmail.com> Date: Thu, 21 Mar 2024 09:11:16 -0300 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird To: ffmpeg-devel@ffmpeg.org References: <20240320233525.29361-1-jamrial@gmail.com> Content-Language: en-US From: James Almer In-Reply-To: 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-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On 3/21/2024 8:15 AM, Andreas Rheinhardt wrote: > James Almer: >> Signed-off-by: James Almer >> --- >> libavcodec/hevc_ps.c | 17 +++++++++++++++-- >> libavcodec/hevc_ps.h | 2 +- >> libavcodec/vulkan_hevc.c | 2 +- >> 3 files changed, 17 insertions(+), 4 deletions(-) >> >> diff --git a/libavcodec/hevc_ps.c b/libavcodec/hevc_ps.c >> index 20ceb09829..d3edc0810d 100644 >> --- a/libavcodec/hevc_ps.c >> +++ b/libavcodec/hevc_ps.c >> @@ -442,13 +442,21 @@ static int decode_hrd(GetBitContext *gb, int common_inf_present, >> return 0; >> } >> >> +static void uninit_vps(FFRefStructOpaque opaque, void *obj) >> +{ >> + HEVCVPS *vps = obj; >> + >> + for (int i = 0; i < vps->vps_num_hrd_parameters; i++) >> + ff_refstruct_unref(&vps->hdr[i]); >> +} >> + >> 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); >> @@ -538,12 +546,17 @@ int ff_hevc_decode_nal_vps(GetBitContext *gb, AVCodecContext *avctx, >> goto err; >> } >> for (i = 0; i < vps->vps_num_hrd_parameters; i++) { >> + HEVCHdrParams *hdr = ff_refstruct_allocz(sizeof(*hdr)); >> int common_inf_present = 1; >> >> + if (!hdr) >> + return AVERROR(ENOMEM); >> + >> get_ue_golomb_long(gb); // hrd_layer_set_idx >> if (i) >> common_inf_present = get_bits1(gb); >> - decode_hrd(gb, common_inf_present, &vps->hdr[i], >> + >> + decode_hrd(gb, common_inf_present, hdr, >> vps->vps_max_sub_layers); >> } > > Why do you allocate the HEVCHdrParams separately when you know > vps_num_hrd_parameters before allocating the first one? You want me to allocate all of them with a single ff_refstruct_allocz() and store individual pointers for each? > >> } >> diff --git a/libavcodec/hevc_ps.h b/libavcodec/hevc_ps.h >> index 9cdec9b6c1..ff94f90a5e 100644 >> --- a/libavcodec/hevc_ps.h >> +++ b/libavcodec/hevc_ps.h >> @@ -150,7 +150,7 @@ typedef struct PTL { >> >> typedef struct HEVCVPS { >> unsigned int vps_id; >> - HEVCHdrParams hdr[HEVC_MAX_LAYER_SETS]; >> + HEVCHdrParams *hdr[HEVC_MAX_LAYER_SETS]; >> >> uint8_t vps_temporal_id_nesting_flag : 1; >> uint8_t vps_sub_layer_ordering_info_present_flag : 1; >> diff --git a/libavcodec/vulkan_hevc.c b/libavcodec/vulkan_hevc.c >> index 239bff75e5..a89d09a372 100644 >> --- a/libavcodec/vulkan_hevc.c >> +++ b/libavcodec/vulkan_hevc.c >> @@ -563,7 +563,7 @@ static void set_vps(const HEVCVPS *vps, >> HEVCHeaderVPSSet sls[]) >> { >> for (int i = 0; i < vps->vps_num_hrd_parameters; i++) { >> - const HEVCHdrParams *src = &vps->hdr[i]; >> + const HEVCHdrParams *src = vps->hdr[i]; >> >> sls_hdr[i] = (StdVideoH265HrdParameters) { >> .flags = (StdVideoH265HrdFlags) { > > _______________________________________________ > 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".