[FFmpeg-devel] [PATCH 1/8] avformat/demux: allow demuxers to output more than one packet per read_packet() call
James Almer
jamrial at gmail.com
Sun Feb 18 00:02:35 EET 2024
Signed-off-by: James Almer <jamrial at gmail.com>
---
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
More information about the ffmpeg-devel
mailing list