mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-16 19:25:18 +00:00
Code Issues 1 Projects Releases Wiki Activity

videodecoder: Refactor post-decode PTS/DTS recovery code

Browse source 
The code was a bit hard to follow. Use clear/explicity variable names and
comment a bit more on what is going on.

Also fold the double list iteration into a single one

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4694>
This commit is contained in:
Edward Hervey 2023-05-05 14:38:56 +02:00 committed by GStreamer Marge Bot
parent 1e9e976268
commit bce9f3327d
1 changed files with 35 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

72
subprojects/gst-plugins-base/gst-libs/gst/video/gstvideodecoder.c
View file

@ -3046,30 +3046,45 @@ gst_video_decoder_prepare_finish_frame (GstVideoDecoder *
GST_TIME_ARGS (frame->duration)); GST_TIME_ARGS (frame->duration));
} }
/* PTS is expected montone ascending, /* PTS is expected monotone ascending,
* so a good guess is lowest unsent DTS */ * so a good guess is lowest unsent DTS */
{ {
GstClockTime min_ts = GST_CLOCK_TIME_NONE; GstClockTime min_dts = GST_CLOCK_TIME_NONE;
GstVideoCodecFrame *oframe = NULL; GstClockTime min_pts = GST_CLOCK_TIME_NONE;
gboolean seen_none = FALSE; GstVideoCodecFrame *earliest_dts_frame = NULL;
GstVideoCodecFrame *earliest_pts_frame = NULL;
gboolean frames_without_dts = FALSE;
gboolean frames_without_pts = FALSE;
/* some maintenance regardless */ /* Check what is the earliest PTS and DTS in our pendings frames */
for (l = priv->frames.head; l; l = l->next) { for (l = priv->frames.head; l; l = l->next) {
GstVideoCodecFrame *tmp = l->data; GstVideoCodecFrame *tmp = l->data;
/* ABI.ts contains DTS */
if (!GST_CLOCK_TIME_IS_VALID (tmp->abidata.ABI.ts)) { if (!GST_CLOCK_TIME_IS_VALID (tmp->abidata.ABI.ts)) {
seen_none = TRUE; frames_without_dts = TRUE;
continue; } else if (!GST_CLOCK_TIME_IS_VALID (min_dts)
|| tmp->abidata.ABI.ts < min_dts) {
min_dts = tmp->abidata.ABI.ts;
earliest_dts_frame = tmp;
} }
if (!GST_CLOCK_TIME_IS_VALID (min_ts) || tmp->abidata.ABI.ts < min_ts) { /* ABI.ts2 contains PTS */
min_ts = tmp->abidata.ABI.ts; if (!GST_CLOCK_TIME_IS_VALID (tmp->abidata.ABI.ts2)) {
oframe = tmp; frames_without_pts = TRUE;
} else if (!GST_CLOCK_TIME_IS_VALID (min_pts)
|| tmp->abidata.ABI.ts2 < min_pts) {
min_pts = tmp->abidata.ABI.ts2;
earliest_pts_frame = tmp;
} }
} }
/* save a ts if needed */ /* save dts if needed */
if (oframe && oframe != frame) { if (earliest_dts_frame && earliest_dts_frame != frame) {
oframe->abidata.ABI.ts = frame->abidata.ABI.ts; earliest_dts_frame->abidata.ABI.ts = frame->abidata.ABI.ts;
}
/* save pts if needed */
if (earliest_pts_frame && earliest_pts_frame != frame) {
earliest_pts_frame->abidata.ABI.ts2 = frame->abidata.ABI.ts2;
} }
/* and set if needed; /* and set if needed;
@ -3077,44 +3092,27 @@ gst_video_decoder_prepare_finish_frame (GstVideoDecoder *
/* also, if we ended up reordered, means this approach is conflicting /* also, if we ended up reordered, means this approach is conflicting
* with some sparse existing PTS, and so it does not work out */ * with some sparse existing PTS, and so it does not work out */
if (!priv->reordered_output && if (!priv->reordered_output &&
!GST_CLOCK_TIME_IS_VALID (frame->pts) && !seen_none && !GST_CLOCK_TIME_IS_VALID (frame->pts) && !frames_without_dts &&
GST_CLOCK_TIME_IS_VALID (priv->pts_delta)) { GST_CLOCK_TIME_IS_VALID (priv->pts_delta)) {
frame->pts = min_ts + priv->pts_delta; frame->pts = min_dts + priv->pts_delta;
GST_DEBUG_OBJECT (decoder, GST_DEBUG_OBJECT (decoder,
"no valid PTS, using oldest DTS %" GST_TIME_FORMAT, "no valid PTS, using oldest DTS %" GST_TIME_FORMAT,
GST_TIME_ARGS (frame->pts)); GST_TIME_ARGS (frame->pts));
} }
/* some more maintenance, ts2 holds PTS */
min_ts = GST_CLOCK_TIME_NONE;
seen_none = FALSE;
for (l = priv->frames.head; l; l = l->next) {
GstVideoCodecFrame *tmp = l->data;
if (!GST_CLOCK_TIME_IS_VALID (tmp->abidata.ABI.ts2)) {
seen_none = TRUE;
continue;
}
if (!GST_CLOCK_TIME_IS_VALID (min_ts) || tmp->abidata.ABI.ts2 < min_ts) {
min_ts = tmp->abidata.ABI.ts2;
oframe = tmp;
}
}
/* save a ts if needed */
if (oframe && oframe != frame) {
oframe->abidata.ABI.ts2 = frame->abidata.ABI.ts2;
} }
/* if we detected reordered output, then PTS are void, /* if we detected reordered output, then PTS are void,
* however those were obtained; bogus input, subclass etc */ * however those were obtained; bogus input, subclass etc */
if (priv->reordered_output && !seen_none) { if (priv->reordered_output && !frames_without_pts) {
GST_DEBUG_OBJECT (decoder, "invalidating PTS"); GST_DEBUG_OBJECT (decoder, "invalidating PTS");
frame->pts = GST_CLOCK_TIME_NONE; frame->pts = GST_CLOCK_TIME_NONE;
} }
if (!GST_CLOCK_TIME_IS_VALID (frame->pts) && !seen_none) { /* If the frame doesn't have a PTS we can take the earliest PTS from our
frame->pts = min_ts; * pending frame list (Only valid if all pending frames have PTS) */
if (!GST_CLOCK_TIME_IS_VALID (frame->pts) && !frames_without_pts) {
frame->pts = min_pts;
GST_DEBUG_OBJECT (decoder, GST_DEBUG_OBJECT (decoder,
"no valid PTS, using oldest PTS %" GST_TIME_FORMAT, "no valid PTS, using oldest PTS %" GST_TIME_FORMAT,
GST_TIME_ARGS (frame->pts)); GST_TIME_ARGS (frame->pts));