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 65EB447403 for ; Wed, 6 Mar 2024 11:07:39 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C29ED68CED2; Wed, 6 Mar 2024 13:05:44 +0200 (EET) Received: from mail1.khirnov.net (quelana.khirnov.net [94.230.150.81]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CE5CA68C462 for ; Wed, 6 Mar 2024 13:05:30 +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=ImYZicdI; dkim-atps=neutral Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id AC7344D5D for ; Wed, 6 Mar 2024 12:05:27 +0100 (CET) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id 8wDlg90uQe9t for ; Wed, 6 Mar 2024 12:05:27 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=khirnov.net; s=mail; t=1709723123; bh=0/n618pxJ/PVbuCl3zqWaGMuZvEVOdMRJzX9LIcQDUI=; h=From:To:Subject:Date:In-Reply-To:References:From; b=ImYZicdItpXyJJLZyZN/QzdaauQmuXsn6icohSfINrEjhZRmfd3Rcn+1kMxcn9HJZ dZkBixqGg381eu1nVmLjIwH1eQs94PfLP7gjXPP8ERDtw77815qGWFUDaLYjKgp377 rhoEBsRis8OSmMeNYyERbBE+QEI77NpEAPQ9TrCQi6cpNSMDCx8G4FpFqGcEfwM8oc xR138F6fYGPuLJd+6CfeuLo68/202d8M6Kub7JaUrVJToJkPyDL6ZIdY3D8he95+Qv 5iejNuqFNVJ6NkxwH95VpfoHB7dLS6YllGD1qowgsu/pilI+gj+g6+W6ilkB0iWMOI YcZfifBfrDbLg== 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 48CDD4D62 for ; Wed, 6 Mar 2024 12:05:23 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 3BE833A076E for ; Wed, 6 Mar 2024 12:05:23 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Wed, 6 Mar 2024 12:03:17 +0100 Message-ID: <20240306110319.17339-16-anton@khirnov.net> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240306110319.17339-1-anton@khirnov.net> References: <20240306110319.17339-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 16/18] fftools/ffmpeg: prepare FrameData for having allocated fields 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: Will be useful in following commits. --- fftools/ffmpeg.c | 41 +++++++++++++++++++++++++++++++---------- 1 file changed, 31 insertions(+), 10 deletions(-) diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index 2f01a01e2d..ffd25f4c5b 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -402,23 +402,44 @@ InputStream *ist_iter(InputStream *prev) return NULL; } +static void frame_data_free(void *opaque, uint8_t *data) +{ + av_free(data); +} + static int frame_data_ensure(AVBufferRef **dst, int writable) { - if (!*dst) { + AVBufferRef *src = *dst; + + if (!src || (writable && !av_buffer_is_writable(src))) { FrameData *fd; - *dst = av_buffer_allocz(sizeof(*fd)); - if (!*dst) + fd = av_mallocz(sizeof(*fd)); + if (!fd) return AVERROR(ENOMEM); - fd = (FrameData*)((*dst)->data); - fd->dec.frame_num = UINT64_MAX; - fd->dec.pts = AV_NOPTS_VALUE; + *dst = av_buffer_create((uint8_t *)fd, sizeof(*fd), + frame_data_free, NULL, 0); + if (!*dst) { + av_buffer_unref(&src); + av_freep(&fd); + return AVERROR(ENOMEM); + } - for (unsigned i = 0; i < FF_ARRAY_ELEMS(fd->wallclock); i++) - fd->wallclock[i] = INT64_MIN; - } else if (writable) - return av_buffer_make_writable(dst); + if (src) { + const FrameData *fd_src = (const FrameData *)src->data; + + memcpy(fd, fd_src, sizeof(*fd)); + + av_buffer_unref(&src); + } else { + fd->dec.frame_num = UINT64_MAX; + fd->dec.pts = AV_NOPTS_VALUE; + + for (unsigned i = 0; i < FF_ARRAY_ELEMS(fd->wallclock); i++) + fd->wallclock[i] = INT64_MIN; + } + } return 0; } -- 2.43.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".