From patchwork Mon Mar 4 13:06:39 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 46771 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a919:b0:19e:cdac:8cce with SMTP id cd25csp2790973pzb; Mon, 4 Mar 2024 05:11:16 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCUi8ZYVO8NCkHUpi78UCB6BL8PPYRucq5BKrjuQNRmx6IdK+tJCyAhB2900FWTijjJmA5LcVZZEExoQtD9spph2V/wH61Xn27qEPw== X-Google-Smtp-Source: AGHT+IFgZMa8NOYCk9Dq4s//0W+7cwMpFyuB52zsT3CUq0A4ba9hWT2DquhUJprOuIqp+KiNaVb3 X-Received: by 2002:a05:6402:5106:b0:566:1952:afc4 with SMTP id m6-20020a056402510600b005661952afc4mr9386043edd.6.1709557876168; Mon, 04 Mar 2024 05:11:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1709557876; cv=none; d=google.com; s=arc-20160816; b=B6l3deX884jIs1p8+SEff7XANzfBvC6LpkTf5YFLjzMK65PQF1b9RP2d+G8Y+kuG01 vP6lz+NmpLB8MExg68A0rkAEIKBMf7MCY7g9O3kfMMPZo60ZycPtiMTjNZMCjZsWhw2E RMeHFMqxBTLFjlqVT4Yhpy67YyoyOzDjX22A12MpJTQHh0uGDeJT6y/P0ujenqQA79Ls 0wTq+yNExr8TrE5IfLNFImWrCoZTrdFEvGAh0AC//l+6aqkVo1uVSBZXZ91R1z2GapPh kqguRbKumZ5h0aDpY2BJgk5TAp1xqs6B0Y39P/AJrHTvsYbzYPVQfCpMjduQHdQCUn1G M3Cg== 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=frRYfhjsqOBClKgJxKHiztJnHUv/lSON8Gz4T+rA9Hs=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=j5hbRzEJCmzg0Dfxg4niGu/O58ByBgnA6eRitMNpzMkrtQz2qi5koteiSVYZVcdnRh YUgeKKF7GJN0WhOhHJ9M/5nCCw4MBJntxGBzJndmLJR3yYuKD97qReDzo5GIadDmoV/O fVwIlfkvtLDpT8i9OmPDcaRG4MTItdqZyNi/so0L+FHaGofCQ6sQETKYlAvkoTQIuziD FKyjE0sDfBiBzL1YFUhdv9fklgtvzGkRnuGOYj+TulVpzRIufIOBcb4U5kdLYQj5Rej2 ReOUCqsbC2WetxdQDgaDaHLXm9s1W23FBH+I/AZXAE9bzMD4GDtxouRQq+1Xb2MdvDm+ rSFw==; 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=iA8praKp; 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 f1-20020a056402194100b00566b4419b46si3547054edz.663.2024.03.04.05.11.15; Mon, 04 Mar 2024 05:11:16 -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=iA8praKp; 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 C412268D4C3; Mon, 4 Mar 2024 15:07:38 +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 BD68868D439 for ; Mon, 4 Mar 2024 15:07:14 +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=iA8praKp; dkim-atps=neutral Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id C13AE4D68 for ; Mon, 4 Mar 2024 14:07:10 +0100 (CET) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id Qi2FmTyADNq1 for ; Mon, 4 Mar 2024 14:07:10 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=khirnov.net; s=mail; t=1709557626; bh=M0KCYFYZIo4VrJkSFnzTEIIv4LEJdiquQJVYTtCU354=; h=From:To:Subject:Date:In-Reply-To:References:From; b=iA8praKp4qYSEITd0p4jtcNAvebFZPBNCkh2O9CqX/WW7Z9fEwDfl+1e1uT6WAtGx v4je8NXP6iOVV5W139bcH+3F9sLJclRUpKF4G09W/0ToKQ1DuUzTxF0Ov5NgDqg1fj 44nRclZl0fKmODHAY4cKl03YmMJnfMz2v0ztLzynuTvZWajUSUqnUEJbBDyH3e1sOT rYx9dyLJ5D3XfXYaUMUwOGsipvgM3D/QCt2/Lif/gw9sGKmqKWnh7HlhM7SvLT/gZa SSBRihSFi69/2Tlcs/T8XlcNFTgUKggzxlMmuD44ZkSyH7byuVsaO4smZlIOWj2ioY grznjC8Osttzg== 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 BCF664D71 for ; Mon, 4 Mar 2024 14:07:06 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 01A233A173A for ; Mon, 4 Mar 2024 14:07:01 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Mon, 4 Mar 2024 14:06:39 +0100 Message-ID: <20240304130657.30631-24-anton@khirnov.net> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240304130657.30631-1-anton@khirnov.net> References: <20240304130657.30631-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 24/29] avcodec/h2645_sei: use 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: RIqmieNEtOlw From: Niklas Haas For consistency, even though this cannot be overriden at the packet level. Signed-off-by: Anton Khirnov --- libavcodec/h2645_sei.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libavcodec/h2645_sei.c b/libavcodec/h2645_sei.c index cb6be0594b..56539608cd 100644 --- a/libavcodec/h2645_sei.c +++ b/libavcodec/h2645_sei.c @@ -35,6 +35,7 @@ #include "atsc_a53.h" #include "avcodec.h" +#include "decode.h" #include "dynamic_hdr_vivid.h" #include "get_bits.h" #include "golomb.h" @@ -607,12 +608,11 @@ int ff_h2645_sei_to_frame(AVFrame *frame, H2645SEI *sei, H2645SEIUnregistered *unreg = &sei->unregistered; if (unreg->buf_ref[i]) { - AVFrameSideData *sd = av_frame_new_side_data_from_buf(frame, + int ret = ff_frame_new_side_data_from_buf(avctx, frame, AV_FRAME_DATA_SEI_UNREGISTERED, - unreg->buf_ref[i]); - if (!sd) - av_buffer_unref(&unreg->buf_ref[i]); - unreg->buf_ref[i] = NULL; + &unreg->buf_ref[i], NULL); + if (ret < 0) + return ret; } } sei->unregistered.nb_buf_ref = 0;