summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Nauwelaerts <mark.nauwelaerts@collabora.co.uk>2012-09-07 17:41:27 +0200
committerSebastian Dröge <sebastian.droege@collabora.co.uk>2012-09-20 09:45:10 +0200
commit23f7381537d938fb03c358fe1691c70f4d697235 (patch)
treed7f8428cd6b08f42a16defb7362eef8e5046fd08
parentc6a36901606b18125dc1d81f9a75377216a6931f (diff)
downloadgstreamer-plugins-base-23f7381537d938fb03c358fe1691c70f4d697235.tar.gz
videoencoder: only set invalid DTS equal to PTS for keyframe
Also add a bit more debug. See also https://bugzilla.gnome.org/show_bug.cgi?id=679443
-rw-r--r--gst-libs/gst/video/gstvideoencoder.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/gst-libs/gst/video/gstvideoencoder.c b/gst-libs/gst/video/gstvideoencoder.c
index c8899331d..27ebd1517 100644
--- a/gst-libs/gst/video/gstvideoencoder.c
+++ b/gst-libs/gst/video/gstvideoencoder.c
@@ -1318,6 +1318,10 @@ gst_video_encoder_finish_frame (GstVideoEncoder * encoder,
GST_LOG_OBJECT (encoder,
"finish frame fpn %d", frame->presentation_frame_number);
+ GST_LOG_OBJECT (encoder, "frame PTS %" GST_TIME_FORMAT
+ ", DTS %" GST_TIME_FORMAT, GST_TIME_ARGS (frame->pts),
+ GST_TIME_ARGS (frame->dts));
+
GST_VIDEO_ENCODER_STREAM_LOCK (encoder);
if (G_UNLIKELY (priv->output_state_changed))
@@ -1412,7 +1416,11 @@ gst_video_encoder_finish_frame (GstVideoEncoder * encoder,
priv->distance_from_sync = 0;
GST_BUFFER_FLAG_UNSET (frame->output_buffer, GST_BUFFER_FLAG_DELTA_UNIT);
/* For keyframes, DTS = PTS */
- frame->dts = frame->pts;
+ if (!GST_CLOCK_TIME_IS_VALID (frame->dts)) {
+ frame->dts = frame->pts;
+ } else if (GST_CLOCK_TIME_IS_VALID (frame->pts) && frame->pts != frame->dts) {
+ GST_WARNING_OBJECT (encoder, "keyframe PTS != DTS");
+ }
} else {
GST_BUFFER_FLAG_SET (frame->output_buffer, GST_BUFFER_FLAG_DELTA_UNIT);
}