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 99A5B496A1 for ; Sat, 17 Feb 2024 22:03:46 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7ADA968CF70; Sun, 18 Feb 2024 00:03:43 +0200 (EET) Received: from mail-pg1-f176.google.com (mail-pg1-f176.google.com [209.85.215.176]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CCCE968C74E for ; Sun, 18 Feb 2024 00:03:36 +0200 (EET) Received: by mail-pg1-f176.google.com with SMTP id 41be03b00d2f7-5dca1efad59so2857646a12.2 for ; Sat, 17 Feb 2024 14:03:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708207414; x=1708812214; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=VtbU+wsG3Pxi8vqa1Xs8nxaUXtPIapFka0dVz00s6Kk=; b=WO4hh048GQ986Uy+nJk4fhzFtlwOavl/KG/sb7I51GwKQncW9cCpNMgARoJTR3w5HT GqSp3+z0sDajbepyG9042+E/dErX+Pdcu8Huu4Oybzr9Nm9p1PLOiLcX9aA4MXQxdHJY AnTQPtsNubg2cWw3XV3u+GzMwqEawp+/ScedjDo2Q+QcjeZVGYJVfRtjyw6uRY9m/WbP 2W5DPDDlrKFkG0YjD+yRlaHwzGrgMt2sqPoPX7Wl4H45kktZk2ePzy7ufMHu/wNuLpDz zbw4QSMnmPS/VnqIc0yu46XoPMu/jeKc6i3d76od0cC7abOaaoRnAk79jhW6+OIKzVXp Lviw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708207414; x=1708812214; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=VtbU+wsG3Pxi8vqa1Xs8nxaUXtPIapFka0dVz00s6Kk=; b=KbLnZFHh/Ex5ptUIz+61swnxkG+VCzcUQ2JngCv0hFaIVBL43qqy7CKMfNic19E6+h cciln8uGADM86tYskmRLUoqJmBjf36v1jY2PofXQV+wbeIOSaFxWhkDRtaYeAEE4DOpR y7+2YS3Yjv2R39Qjyg4P23ucEZOOUTiev1tOMKFKqRtT+GdvBs8y7D0ZaylcmL9ZORpV dPuXfI/JWtgWs3xSMoHB3/Gq69nSb+rtjbp/8Qlxk7KRxBvSD8RJDojY2W0gN6SAz5Lq XznudUHZusx8doOIa/0ZMustW3QzresJnS2cne8fdbVG/+L158wCi0useq6VEX0piOU9 w9uA== X-Gm-Message-State: AOJu0YzOhyqNR2QvaQ2vywMq4Vjf6RxjpXXfsGeHIQXnUPY6anb2rOdG eQw8++6lcb4aapDkT3xuQVFfxoOhOGjjvi7820XtecTu3MYE+fdtwzvVjs37 X-Google-Smtp-Source: AGHT+IEFURZ8hbCiKyiY595jdYSbQ05ABD50wjoy44LVd9VG8980tzR798kkiLOqPPyaVcSl3LEDTg== X-Received: by 2002:a17:902:c40e:b0:1db:5b41:c5ac with SMTP id k14-20020a170902c40e00b001db5b41c5acmr10507412plk.68.1708207413700; Sat, 17 Feb 2024 14:03:33 -0800 (PST) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id e6-20020a17090301c600b001d77a0e1374sm1850326plh.151.2024.02.17.14.03.32 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 17 Feb 2024 14:03:33 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sat, 17 Feb 2024 19:02:35 -0300 Message-ID: <20240217220242.62035-1-jamrial@gmail.com> X-Mailer: git-send-email 2.43.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/8] avformat/demux: allow demuxers to output more than one packet per read_packet() call 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: Signed-off-by: James Almer --- libavformat/demux.c | 72 +++++++++++++++++++++++++++++++++------------ libavformat/demux.h | 2 ++ 2 files changed, 56 insertions(+), 18 deletions(-) diff --git a/libavformat/demux.c b/libavformat/demux.c index b70979c520..e0205f9dec 100644 --- a/libavformat/demux.c +++ b/libavformat/demux.c @@ -540,6 +540,59 @@ static int update_wrap_reference(AVFormatContext *s, AVStream *st, int stream_in return 1; } +static void update_timestamps(AVFormatContext *s, AVStream *st, AVPacket *pkt) +{ + FFStream *const sti = ffstream(st); + + if (update_wrap_reference(s, st, pkt->stream_index, pkt) && sti->pts_wrap_behavior == AV_PTS_WRAP_SUB_OFFSET) { + // correct first time stamps to negative values + if (!is_relative(sti->first_dts)) + sti->first_dts = wrap_timestamp(st, sti->first_dts); + if (!is_relative(st->start_time)) + st->start_time = wrap_timestamp(st, st->start_time); + if (!is_relative(sti->cur_dts)) + sti->cur_dts = wrap_timestamp(st, sti->cur_dts); + } + + pkt->dts = wrap_timestamp(st, pkt->dts); + pkt->pts = wrap_timestamp(st, pkt->pts); + + force_codec_ids(s, st); + + /* TODO: audio: time filter; video: frame reordering (pts != dts) */ + if (s->use_wallclock_as_timestamps) + pkt->dts = pkt->pts = av_rescale_q(av_gettime(), AV_TIME_BASE_Q, st->time_base); +} + +int ff_buffer_packet(AVFormatContext *s, AVPacket *pkt) +{ + FFFormatContext *const si = ffformatcontext(s); + AVStream *st = s->streams[pkt->stream_index]; + FFStream *sti = ffstream(st); + const AVPacket *pkt1; + int err; + + update_timestamps(s, st, pkt); + + err = avpriv_packet_list_put(&si->raw_packet_buffer, pkt, NULL, 0); + if (err < 0) { + av_packet_unref(pkt); + return err; + } + + pkt1 = &si->raw_packet_buffer.tail->pkt; + si->raw_packet_buffer_size += pkt1->size; + + if (sti->request_probe <= 0) + return 0; + + err = probe_codec(s, st, pkt1); + if (err < 0) + return err; + + return 0; +} + int ff_read_packet(AVFormatContext *s, AVPacket *pkt) { FFFormatContext *const si = ffformatcontext(s); @@ -619,24 +672,7 @@ FF_ENABLE_DEPRECATION_WARNINGS st = s->streams[pkt->stream_index]; sti = ffstream(st); - if (update_wrap_reference(s, st, pkt->stream_index, pkt) && sti->pts_wrap_behavior == AV_PTS_WRAP_SUB_OFFSET) { - // correct first time stamps to negative values - if (!is_relative(sti->first_dts)) - sti->first_dts = wrap_timestamp(st, sti->first_dts); - if (!is_relative(st->start_time)) - st->start_time = wrap_timestamp(st, st->start_time); - if (!is_relative(sti->cur_dts)) - sti->cur_dts = wrap_timestamp(st, sti->cur_dts); - } - - pkt->dts = wrap_timestamp(st, pkt->dts); - pkt->pts = wrap_timestamp(st, pkt->pts); - - force_codec_ids(s, st); - - /* TODO: audio: time filter; video: frame reordering (pts != dts) */ - if (s->use_wallclock_as_timestamps) - pkt->dts = pkt->pts = av_rescale_q(av_gettime(), AV_TIME_BASE_Q, st->time_base); + update_timestamps(s, st, pkt); if (!pktl && sti->request_probe <= 0) return 0; diff --git a/libavformat/demux.h b/libavformat/demux.h index d65eb16ff8..04a426c420 100644 --- a/libavformat/demux.h +++ b/libavformat/demux.h @@ -238,4 +238,6 @@ int ff_get_extradata(void *logctx, AVCodecParameters *par, AVIOContext *pb, int */ int ff_find_stream_index(const AVFormatContext *s, int id); +int ff_buffer_packet(AVFormatContext *s, AVPacket *pkt); + #endif /* AVFORMAT_DEMUX_H */ -- 2.43.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".