From patchwork Thu Nov 23 19:14:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 44767 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:bca6:b0:181:818d:5e7f with SMTP id fx38csp801826pzb; Thu, 23 Nov 2023 11:19:11 -0800 (PST) X-Google-Smtp-Source: AGHT+IGoQGC7dkGPzvW+oaPbb7a11atvn6XCQ6mABaBqJ4EWXnojo2WLtyHtxOX35jFHxM649eoZ X-Received: by 2002:a17:906:4557:b0:a04:a111:4901 with SMTP id s23-20020a170906455700b00a04a1114901mr228738ejq.18.1700767151597; Thu, 23 Nov 2023 11:19:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700767151; cv=none; d=google.com; s=arc-20160816; b=JeNr3WrUL7anLN8hWsh8zy54CSM8FjxJj5htsC7XfcFSdQK34GqrKQaIAqE4hkJ3yG DBICSxAX/rqcWhXhvjRgJMNStCbChdpqRxreTbrZiAjs+ASfRkZEe6WZnm5N3i1vaG6u wwsTC9sZGS/zj348Bn03InztBeKQygP2MhmdhxO/WuuWHhjKatiEcIHd4uDpSMiSZ1BB 6uGqFB29cgCgx1J/mXTniEUZ2TFhAxL7NGPsZw0KDAXNUsvHkgczyIBQWlCjO9sL4XoD unA5cOhZghXdED6H22nysxfNDfJel4fd+9YA4/BjYDB5NAjr0t37e3Ul2TNMpRsk/aQp Ylig== 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:delivered-to; bh=ZcY96oDkPDN1yUqj9dRmkAEPntrtjp9CTI/UjkJj3Zg=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=hCMxRXpIreoxTWjdWyCOQlJs8hgnjsRb/dHGJMn9xVZETwlXMCjzhsrS53rmmDaVx1 eI0gs0mvwLbZG1GiQVzRwnDjk50UGCyVjk9EvHvLnjf33y40+acXNRbtg6xxW775u7+n i7l1rozc8P0YVpjeIllWCcibd4kPKv7OVLq7RKER+Ti1KWktCrEbACbUiK3nTPY/p/4p Hw2twa3Vj/raKjf6XddJEEfZsIvhXC/gVcaNcuvRqC6uGPBnPGm0hT2Z0dHTB4ORu+nH 2pDz0V/kuXqLUHVSdbT+azOhZyL99OB2NaPT98KYwcta1np4CvAzARfsWFt0it9OoWTU U44Q== ARC-Authentication-Results: i=1; mx.google.com; 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 s16-20020a170906285000b009fc88ee5d4esi912879ejc.182.2023.11.23.11.19.10; Thu, 23 Nov 2023 11:19:11 -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; 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 2266268CEE7; Thu, 23 Nov 2023 21:18:56 +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 4669068CC28 for ; Thu, 23 Nov 2023 21:18:17 +0200 (EET) Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id E66E51486 for ; Thu, 23 Nov 2023 20:18:16 +0100 (CET) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id OxS42jQm5OIn for ; Thu, 23 Nov 2023 20:18:16 +0100 (CET) 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 3A13114DD for ; Thu, 23 Nov 2023 20:18:15 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 23B043A05D0 for ; Thu, 23 Nov 2023 20:18:15 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Thu, 23 Nov 2023 20:14:59 +0100 Message-ID: <20231123191524.11296-6-anton@khirnov.net> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231123191524.11296-2-anton@khirnov.net> References: <20231123191524.11296-2-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 04/13] fftools/ffmpeg: make sure FrameData is writable when we modify it 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: +0YnBbIR95By Also, add a function that returns const FrameData* for cases that only read from it. --- fftools/ffmpeg.c | 21 +++++++++++++++++---- fftools/ffmpeg.h | 2 ++ fftools/ffmpeg_filter.c | 4 ++-- 3 files changed, 21 insertions(+), 6 deletions(-) diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index cdb16ef90b..61fcda2526 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -427,21 +427,34 @@ InputStream *ist_iter(InputStream *prev) return NULL; } -FrameData *frame_data(AVFrame *frame) +static int frame_data_ensure(AVFrame *frame, int writable) { if (!frame->opaque_ref) { FrameData *fd; frame->opaque_ref = av_buffer_allocz(sizeof(*fd)); if (!frame->opaque_ref) - return NULL; + return AVERROR(ENOMEM); fd = (FrameData*)frame->opaque_ref->data; fd->dec.frame_num = UINT64_MAX; fd->dec.pts = AV_NOPTS_VALUE; - } + } else if (writable) + return av_buffer_make_writable(&frame->opaque_ref); - return (FrameData*)frame->opaque_ref->data; + return 0; +} + +FrameData *frame_data(AVFrame *frame) +{ + int ret = frame_data_ensure(frame, 1); + return ret < 0 ? NULL : (FrameData*)frame->opaque_ref->data; +} + +const FrameData *frame_data_c(AVFrame *frame) +{ + int ret = frame_data_ensure(frame, 0); + return ret < 0 ? NULL : (const FrameData*)frame->opaque_ref->data; } void remove_avoptions(AVDictionary **a, AVDictionary *b) diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h index 41935d39d5..1f11a2f002 100644 --- a/fftools/ffmpeg.h +++ b/fftools/ffmpeg.h @@ -726,6 +726,8 @@ int subtitle_wrap_frame(AVFrame *frame, AVSubtitle *subtitle, int copy); */ FrameData *frame_data(AVFrame *frame); +const FrameData *frame_data_c(AVFrame *frame); + int ifilter_send_frame(InputFilter *ifilter, AVFrame *frame, int keep_reference); int ifilter_send_eof(InputFilter *ifilter, int64_t pts, AVRational tb); int ifilter_sub2video(InputFilter *ifilter, const AVFrame *frame); diff --git a/fftools/ffmpeg_filter.c b/fftools/ffmpeg_filter.c index f942c97c40..69c28a6b2b 100644 --- a/fftools/ffmpeg_filter.c +++ b/fftools/ffmpeg_filter.c @@ -1859,9 +1859,9 @@ static int choose_out_timebase(OutputFilterPriv *ofp, AVFrame *frame) FPSConvContext *fps = &ofp->fps; AVRational tb = (AVRational){ 0, 0 }; AVRational fr; - FrameData *fd; + const FrameData *fd; - fd = frame_data(frame); + fd = frame_data_c(frame); // apply -enc_time_base if (ofp->enc_timebase.num == ENC_TIME_BASE_DEMUX &&