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 8633646E04 for ; Thu, 13 Jul 2023 11:02:14 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8D26368C74C; Thu, 13 Jul 2023 13:58:21 +0300 (EEST) Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3573E68C6D4 for ; Thu, 13 Jul 2023 13:57:57 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id E33BF2404F5 for ; Thu, 13 Jul 2023 12:57:56 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id cVwyE742pb0R for ; Thu, 13 Jul 2023 12:57:56 +0200 (CEST) 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 mail0.khirnov.net (Postfix) with ESMTPS id DE7D6240D25 for ; Thu, 13 Jul 2023 12:57:41 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 62CB43A220F for ; Thu, 13 Jul 2023 12:57:36 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Thu, 13 Jul 2023 12:55:51 +0200 Message-Id: <20230713105553.21052-31-anton@khirnov.net> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230713105553.21052-1-anton@khirnov.net> References: <20230713105553.21052-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 31/33] fftools/ffmpeg: add more structure to FrameData 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: It now contains data from multiple sources, so group those items that always come from the decoder. Also, initialize them to invalid values, so that frames that did not originate from a decoder can be distinguished. --- fftools/ffmpeg.c | 8 +++++++- fftools/ffmpeg.h | 10 +++++++--- fftools/ffmpeg_dec.c | 6 +++--- fftools/ffmpeg_enc.c | 6 +++--- 4 files changed, 20 insertions(+), 10 deletions(-) diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index dd7cfcf632..64778bc0f3 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -434,9 +434,15 @@ InputStream *ist_iter(InputStream *prev) FrameData *frame_data(AVFrame *frame) { if (!frame->opaque_ref) { - frame->opaque_ref = av_buffer_allocz(sizeof(FrameData)); + FrameData *fd; + + frame->opaque_ref = av_buffer_allocz(sizeof(*fd)); if (!frame->opaque_ref) return NULL; + fd = (FrameData*)frame->opaque_ref->data; + + fd->dec.frame_num = UINT64_MAX; + fd->dec.pts = AV_NOPTS_VALUE; } return (FrameData*)frame->opaque_ref->data; diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h index bd6b0ed6d1..97aa4d716e 100644 --- a/fftools/ffmpeg.h +++ b/fftools/ffmpeg.h @@ -626,9 +626,13 @@ typedef struct OutputFile { // optionally attached as opaque_ref to decoded AVFrames typedef struct FrameData { - uint64_t idx; - int64_t pts; - AVRational tb; + // properties that come from the decoder + struct { + uint64_t frame_num; + + int64_t pts; + AVRational tb; + } dec; AVRational frame_rate_filter; diff --git a/fftools/ffmpeg_dec.c b/fftools/ffmpeg_dec.c index a1d811f512..5c1b8888e9 100644 --- a/fftools/ffmpeg_dec.c +++ b/fftools/ffmpeg_dec.c @@ -612,9 +612,9 @@ static int packet_decode(InputStream *ist, const AVPacket *pkt, AVFrame *frame) av_frame_unref(frame); return AVERROR(ENOMEM); } - fd->pts = frame->pts; - fd->tb = dec->pkt_timebase; - fd->idx = dec->frame_num - 1; + fd->dec.pts = frame->pts; + fd->dec.tb = dec->pkt_timebase; + fd->dec.frame_num = dec->frame_num - 1; fd->bits_per_raw_sample = dec->bits_per_raw_sample; frame->time_base = dec->pkt_timebase; diff --git a/fftools/ffmpeg_enc.c b/fftools/ffmpeg_enc.c index 88c62124a9..0e2285c5a2 100644 --- a/fftools/ffmpeg_enc.c +++ b/fftools/ffmpeg_enc.c @@ -569,8 +569,8 @@ void enc_stats_write(OutputStream *ost, EncStats *es, if ((frame && frame->opaque_ref) || (pkt && pkt->opaque_ref)) { fd = (const FrameData*)(frame ? frame->opaque_ref->data : pkt->opaque_ref->data); - tbi = fd->tb; - ptsi = fd->pts; + tbi = fd->dec.tb; + ptsi = fd->dec.pts; } for (size_t i = 0; i < es->nb_components; i++) { @@ -588,7 +588,7 @@ void enc_stats_write(OutputStream *ost, EncStats *es, case ENC_STATS_PTS_TIME_IN: avio_printf(io, "%g", ptsi == INT64_MAX ? INFINITY : ptsi * av_q2d(tbi)); continue; case ENC_STATS_FRAME_NUM: avio_printf(io, "%"PRIu64, frame_num); continue; - case ENC_STATS_FRAME_NUM_IN: avio_printf(io, "%"PRIu64, fd ? fd->idx : -1); continue; + case ENC_STATS_FRAME_NUM_IN: avio_printf(io, "%"PRIu64, fd ? fd->dec.frame_num : -1); continue; } if (frame) { -- 2.40.1 _______________________________________________ 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".