mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-28 04:31:06 +00:00
Code Issues 1 Projects Releases Wiki Activity

videodecoder: Remove gst_video_decoder_get_timestamp function

Browse source 
Interpolating the timestamps from the picture numbers
does more harm than good, getting it wrong in a lot of
cases (especially reverse playback). Removing it in favour
of simply incrementing the timestamps until there's
something better
This commit is contained in:
Jan Schmidt 2012-06-20 03:40:29 +10:00
parent 45cf9f651b
commit 9a79a145b1
1 changed files with 7 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
gst-libs/gst/video/gstvideodecoder.c
View file

@ -423,8 +423,6 @@ static gboolean gst_video_decoder_set_src_caps (GstVideoDecoder * decoder);
static void gst_video_decoder_release_frame (GstVideoDecoder * dec, static void gst_video_decoder_release_frame (GstVideoDecoder * dec,
GstVideoCodecFrame * frame); GstVideoCodecFrame * frame);
static GstClockTime gst_video_decoder_get_timestamp (GstVideoDecoder * decoder,
GstVideoCodecFrame * frame);
static GstClockTime gst_video_decoder_get_frame_duration (GstVideoDecoder * static GstClockTime gst_video_decoder_get_frame_duration (GstVideoDecoder *
decoder, GstVideoCodecFrame * frame); decoder, GstVideoCodecFrame * frame);
static GstVideoCodecFrame *gst_video_decoder_new_frame (GstVideoDecoder * static GstVideoCodecFrame *gst_video_decoder_new_frame (GstVideoDecoder *
@ -2022,25 +2020,23 @@ gst_video_decoder_prepare_finish_frame (GstVideoDecoder *
} }
} }
if (frame->pts == GST_CLOCK_TIME_NONE) { if (frame->duration == GST_CLOCK_TIME_NONE) {
frame->pts = gst_video_decoder_get_timestamp (decoder, frame);
frame->duration = gst_video_decoder_get_frame_duration (decoder, frame); frame->duration = gst_video_decoder_get_frame_duration (decoder, frame);
GST_LOG_OBJECT (decoder,
"Guessing duration %" GST_TIME_FORMAT " for frame...",
GST_TIME_ARGS (frame->duration));
}
if (frame->pts == GST_CLOCK_TIME_NONE) {
/* Last ditch timestamp guess: Just add the duration to the previous /* Last ditch timestamp guess: Just add the duration to the previous
* frame */ * frame */
if (frame->pts == GST_CLOCK_TIME_NONE && if (priv->last_timestamp_out != GST_CLOCK_TIME_NONE &&
priv->last_timestamp_out != GST_CLOCK_TIME_NONE &&
frame->duration != GST_CLOCK_TIME_NONE) { frame->duration != GST_CLOCK_TIME_NONE) {
frame->pts = priv->last_timestamp_out + frame->duration; frame->pts = priv->last_timestamp_out + frame->duration;
GST_LOG_OBJECT (decoder, GST_LOG_OBJECT (decoder,
"Guessing timestamp %" GST_TIME_FORMAT " for frame...", "Guessing timestamp %" GST_TIME_FORMAT " for frame...",
GST_TIME_ARGS (frame->pts)); GST_TIME_ARGS (frame->pts));
} }
} else if (frame->duration == GST_CLOCK_TIME_NONE) {
frame->duration = gst_video_decoder_get_frame_duration (decoder, frame);
GST_LOG_OBJECT (decoder,
"Guessing duration %" GST_TIME_FORMAT " for frame...",
GST_TIME_ARGS (frame->duration));
} }
if (GST_CLOCK_TIME_IS_VALID (priv->last_timestamp_out)) { if (GST_CLOCK_TIME_IS_VALID (priv->last_timestamp_out)) {
@ -2323,42 +2319,6 @@ gst_video_decoder_add_to_frame (GstVideoDecoder * decoder, int n_bytes)
GST_VIDEO_DECODER_STREAM_UNLOCK (decoder); GST_VIDEO_DECODER_STREAM_UNLOCK (decoder);
} }
static GstClockTime
gst_video_decoder_get_timestamp (GstVideoDecoder * decoder,
GstVideoCodecFrame * frame)
{
GstVideoDecoderPrivate *priv = decoder->priv;
GstVideoCodecState *state = priv->output_state;
guint64 picture_number = frame->decode_frame_number;
GstClockTime res = GST_CLOCK_TIME_NONE;
if (state->info.fps_d == 0 || state->info.fps_n == 0) {
return GST_CLOCK_TIME_NONE;
}
if (priv->base_timestamp != GST_CLOCK_TIME_NONE) {
if (picture_number < priv->base_picture_number) {
GstClockTime offset;
offset = gst_util_uint64_scale (priv->base_picture_number
- picture_number, state->info.fps_d * GST_SECOND, state->info.fps_n);
if (offset <= priv->base_timestamp)
res = priv->base_timestamp - offset;
} else {
res = priv->base_timestamp +
gst_util_uint64_scale (picture_number - priv->base_picture_number,
state->info.fps_d * GST_SECOND, state->info.fps_n);
}
GST_LOG_OBJECT (decoder, "Interpolated TS %" GST_TIME_FORMAT
" for picture %" G_GUINT64_FORMAT " from base time %" GST_TIME_FORMAT
" and pic %" G_GUINT64_FORMAT, GST_TIME_ARGS (res), picture_number,
GST_TIME_ARGS (priv->base_timestamp), priv->base_picture_number);
}
return res;
}
static guint64 static guint64
gst_video_decoder_get_frame_duration (GstVideoDecoder * decoder, gst_video_decoder_get_frame_duration (GstVideoDecoder * decoder,
GstVideoCodecFrame * frame) GstVideoCodecFrame * frame)