From patchwork Thu Mar 21 12:29:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 47288 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:3a4a:b0:1a3:31a3:7958 with SMTP id zu10csp516456pzb; Thu, 21 Mar 2024 05:37:30 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWGqFOxap9JXYInDL2wGVGTkBx3TfplBj6mXc38kqI8nl6gc8JtewHMr79SDYpe4V7Kjsemijpkvd/iFbg920SMkRD7h/Ell63RxA== X-Google-Smtp-Source: AGHT+IF32HHhtH8oovUVJJ1xY2hI//esjqEBo+Fwk9xOfCAbB8uvjhYCZcdiMWQdMkgwTXT2G2kP X-Received: by 2002:a17:906:4692:b0:a47:ac1:5b94 with SMTP id a18-20020a170906469200b00a470ac15b94mr1429086ejr.4.1711024649935; Thu, 21 Mar 2024 05:37:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1711024649; cv=none; d=google.com; s=arc-20160816; b=gZ9Rj9Na6YrGXm2/TbveyUIafCjhwc7t7hOtUZIOIUt9bBsOZTCV1xypp4MXtRx48A Z6qPZEqswED70BpcB3enVU4+CPaZmuS1F51kGdOUjoXsEF9ht1rGoZsbZV86Fx39uJIQ YU/ZilscJBds7jWGykAvN4uLpUJcUomvawVPb3j6ik4G3F5FrBQDhb++IisYKGafe4Nu 4YpAVyIgip7+dLp/8hViGEJHDIvgN6p29jZVMDQ4zhx2/VB3e7NK9D95yuC01QEglLVR zAwfb9PlUdLRe4UiXqptEsFbv2ywgGNfcVJAQvFIVcNtbddOa2U+RtTUiJ5pOZTomoFm KL5Q== 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=Msk9A80dsPYscKWyxbIyTKx0+0b+sTplnXL/MrVu0AA=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=bUB8/BuMj3/mWMzs5tnlx1TdrU99k5f3OFedjsmZ2TVJkQP9abtfDJ14qtTnCeM9bc pElow/2uWZ2k25ZjACm9qZyrS1oIrYM3lOJNmZzifn1U5fniRWu/0MhkkwjGtRCMFXvk zpREQ26fuVqkL71COMhBFZf0f2ijHYAcZKyrxDkt0W+c8QMmem8qTu+bzp2ATnzxEwQx rzjBIKI8MSdAG0c+QVa5YGr8vDy1d/CpkrZ3NKaPrC2ZuTvy7GlzsQxhahXDdRkUx2zV aki/hVuk32fFfNXDGYwq/uaC9UWxnEioM3j5IFtSCNsf7bcfLzkFTsfiViJcksvlybFY ho7g==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=JJ6NnvQC; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id o20-20020a170906289400b00a44eae46844si7550821ejd.673.2024.03.21.05.37.29; Thu, 21 Mar 2024 05:37:29 -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=@gmail.com header.s=20230601 header.b=JJ6NnvQC; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id AD8D668D541; Thu, 21 Mar 2024 14:37:26 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f181.google.com (mail-pf1-f181.google.com [209.85.210.181]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5002468D04F for ; Thu, 21 Mar 2024 14:37:20 +0200 (EET) Received: by mail-pf1-f181.google.com with SMTP id d2e1a72fcca58-6e6b729669bso787125b3a.3 for ; Thu, 21 Mar 2024 05:37:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1711024638; x=1711629438; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=+zPD+crcKb8VzgdysEbHagUrznTlI0MzvcSS7ozyXAc=; b=JJ6NnvQCVxwLYoFxliY+tJCN3Jy/0iuiESi8xyueot4q0SYFoCxhX3nTDHGdlOJyov NDWgYKqYiDwifefzpxcEM3K++61p/Toh/a1HBrd0jkCQKT05ohdEcS8qehuEBAtwhNu+ y58UpRG7JcgykwX4jh3tf8AQyXj+FPJvLHGa+smPrrkbYH7LZfzJfYockHF23JkP1RQq 1LIX82l/6ZBhgbtXTgQuPI/2yzJx4u4FIaA0Z2LcjptyaHFKkQ+aD5467p8EB1/0oPFk hmlhlSI+KSiUMVg59A2sysUZvQB2oIa7zdsi5cutjsxc9wWLGE/hAd72PL8J9t9gbYB3 O4eA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711024638; x=1711629438; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=+zPD+crcKb8VzgdysEbHagUrznTlI0MzvcSS7ozyXAc=; b=JFej2W/M2aH6U0Cht0Lk5HkC6ywgJuglqoOYoSRCicynhNaE3YlSB0fNov8t7OUvIy zG9AZ+G/s/q4IriRRJVO9lOpKZnPzphRA5tSUsEyrE6kHJnII21RFKMfcosT+DfgTCkM 5nNe3OCpDCP7gWwb0cqMb3dpg7vDx71v/kazglu34PNkPyddhUY0Nb5VEl0qrGcbVahL FPwxmmMyChOJL5YdLyJOI0CLin2Fr1MYoYG0dQ5SV/cwU/1lALMpLYjt0BEuQsT0XsUj Foxwirp4eFVHYpXjQeKkbG+35CC8gQvmVoT0l/Ls0yjQzDvX+O1gHKt9n1elu6W4Vp2/ J1oQ== X-Gm-Message-State: AOJu0YyfgTI/89aLwTS5/eRmRVHhdWTB72NRZoa04crQc5YVluKIJvwC 5WzX1DPMdkn+S1vikVATlNcUBdFjLXVSnu6GDYveaIDv53qMZZfltuzACCwz X-Received: by 2002:a05:6a20:394a:b0:1a3:6daf:3379 with SMTP id r10-20020a056a20394a00b001a36daf3379mr10319776pzg.6.1711024174420; Thu, 21 Mar 2024 05:29:34 -0700 (PDT) Received: from localhost.localdomain ([190.194.167.233]) by smtp.gmail.com with ESMTPSA id l18-20020a17090a599200b0029beb0fc60fsm3427505pji.28.2024.03.21.05.29.33 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Mar 2024 05:29:34 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Thu, 21 Mar 2024 09:29:22 -0300 Message-ID: <20240321122922.7643-1-jamrial@gmail.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: References: MIME-Version: 1.0 Subject: [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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: nIQCq2+uiCxv 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; + 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;