From patchwork Fri Feb 23 13:58:58 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 46470 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:26a3:b0:19e:cdac:8cce with SMTP id h35csp993237pze; Fri, 23 Feb 2024 06:33:33 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCVyCjJfqwUPNEm5M6jdOP949gsLC3Hx82/1vgc4CpV4g8BfuP1eeDJIByEfZt9G1SQZM8YqAqmZ4fRxP5uv4hltnr23gXGejjZlOg== X-Google-Smtp-Source: AGHT+IFMxa5QaTzaW05KZd54cUWt8tOEyffvOfSqMAFx5F18KDqvTlELAKzhCOF33V5HAEEbmJW6 X-Received: by 2002:a05:6512:3b9b:b0:512:bd32:ed55 with SMTP id g27-20020a0565123b9b00b00512bd32ed55mr1785654lfv.4.1708698813530; Fri, 23 Feb 2024 06:33:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1708698813; cv=none; d=google.com; s=arc-20160816; b=NFNcRK/DE2v+L3bbrCO8b8ld60GGdBoRDRNE/3brE5WpovHB5lVi2/oNfBLUen6YUn uCYR1aEVdokrMV3Rf8SOI/rBWHF3PHHbm7M8ystJfXR8VovzUyUcRwrnXqd/xnBmzf/L r4HgTLaYd6StCJ4JqRFP/lbgGtq+ATQkTg1a2aedN4I3fGUIwL2lV5dCmekT/KuOuwE+ /XkfqnX36gPweLQA3+DEkFBqhrvPCf0lySdOPG7h6NogsWg/W39jQth5YRes3zW8lSow a5+sIBXkIIq6PuKk9LCIxdpG/BH/9gnHwYJldKncHEVqJCdqLttWRDwQm/SCK4cXkOkc tTlg== 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=dpcAPmQQ3CO/xhMSUqcAl+QNWFFtQpR8pettDrZ9x3s=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=B99tPrJwgEdMhR0hgcuLmPqm5AhYlJN8k62v77MFkwOR+vPmVkI51F692rE0KVV4xJ mJZ7DqJx5e7yVuOdI+TEZ+hQXswEXVRFwlQLIrRPOWMb89Mj2nCbmIcibJjYGqQVcY0x NaMEIhk6J8Jit3Tu+8F+ia9Bh93AcXJByJlVMsuuqTTk6LCInAIsE4PnVLUEI8iYJD4U O2k9+m1cpk783G0lraF0F2E4I55jzOE9V5JkGnVXxk3dTHybjAx2BvIVMtIo6I5FWN/a QiqKHGF54sO6WbwfpMk2lkfFeHXtAMtjOF+C+R9miCh2MqTAY1fkreY6if4fbPqXH0A2 Jwqw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@khirnov.net header.s=mail header.b="f0a/vBXl"; 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 ks15-20020a170906f84f00b00a3edb485acdsi3695867ejb.824.2024.02.23.06.33.33; Fri, 23 Feb 2024 06:33:33 -0800 (PST) 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=@khirnov.net header.s=mail header.b="f0a/vBXl"; 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 DE41A68C984; Fri, 23 Feb 2024 16:31:50 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail1.khirnov.net (quelana.khirnov.net [94.230.150.81]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BA33768C657 for ; Fri, 23 Feb 2024 16:31:35 +0200 (EET) Authentication-Results: mail1.khirnov.net; dkim=pass (2048-bit key; unprotected) header.d=khirnov.net header.i=@khirnov.net header.a=rsa-sha256 header.s=mail header.b=f0a/vBXl; dkim-atps=neutral Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id 60DEA4D5E for ; Fri, 23 Feb 2024 15:31:34 +0100 (CET) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id mDGYICFeLKHm for ; Fri, 23 Feb 2024 15:31:34 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=khirnov.net; s=mail; t=1708698688; bh=28aC7klwA7/hcW1w4FKsSAyLEYWp46IUDxTxmGkRBS4=; h=From:To:Subject:Date:In-Reply-To:References:From; b=f0a/vBXlxK4IODkbTKAAc+tpcWZXMWT5gGVw0/LOe1rvi0Zx8zbMGf/NGg1FWuRca gTtcPBKMgLEf9G43+ChBbWfoP5yoiBL6R0hhZMSPADAoBdpBZ0ka6kUS5JtJqn+I1z jxzFAk2wGuMcFisPEL1cWqxEvaqSYpyyzMrVdUFhqkvOV+YMrOfAvsR6aST5ZQ5Ms8 GChy3/KFyd4gEKbn6qWNbvRUqt/Gtg8gJ/6OdgxESk5k/fHjyAmnTSJ6H1oOqcGMB+ vCAMhXdYblmHbDO8RMPZRu3w2CM60toKvJwjO4jmnUvWgrM8U2fUrucxUYCOmlXwy+ erLt5FizvalXQ== Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail1.khirnov.net (Postfix) with ESMTPS id 3CEE54D64 for ; Fri, 23 Feb 2024 15:31:28 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 837913A274D for ; Fri, 23 Feb 2024 15:31:23 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Fri, 23 Feb 2024 14:58:58 +0100 Message-ID: <20240223143115.16521-37-anton@khirnov.net> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20240223143115.16521-1-anton@khirnov.net> References: <20240223143115.16521-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 36/38] avcodec/hevcdec: switch to ff_frame_new_side_data_from_buf 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: tuWywEBXfqkX From: Niklas Haas For consistency, even though this cannot be overriden at the packet level. --- libavcodec/hevcdec.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/libavcodec/hevcdec.c b/libavcodec/hevcdec.c index 0cb2577b39..e5213aa252 100644 --- a/libavcodec/hevcdec.c +++ b/libavcodec/hevcdec.c @@ -2824,10 +2824,8 @@ static int set_side_data(HEVCContext *s) } if (s->rpu_buf) { - AVFrameSideData *rpu = av_frame_new_side_data_from_buf(out, AV_FRAME_DATA_DOVI_RPU_BUFFER, s->rpu_buf); - if (!rpu) - return AVERROR(ENOMEM); - + if (!ff_frame_new_side_data_from_buf(s->avctx, out, AV_FRAME_DATA_DOVI_RPU_BUFFER, s->rpu_buf)) + av_buffer_unref(&s->rpu_buf); s->rpu_buf = NULL; } @@ -2839,10 +2837,8 @@ static int set_side_data(HEVCContext *s) if (!info_ref) return AVERROR(ENOMEM); - if (!av_frame_new_side_data_from_buf(out, AV_FRAME_DATA_DYNAMIC_HDR_VIVID, info_ref)) { + if (!ff_frame_new_side_data_from_buf(s->avctx, out, AV_FRAME_DATA_DYNAMIC_HDR_VIVID, info_ref)) av_buffer_unref(&info_ref); - return AVERROR(ENOMEM); - } } return 0;