mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-22 08:17:01 +00:00
Code Issues 1 Projects Releases Wiki Activity

rtmpsrc: Fix timestamps after a seek

Browse source
This commit is contained in:
Sebastian Dröge 2010-06-09 20:49:10 +02:00
parent bc8f4adaa6
commit f0e7bd298c
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
ext/rtmp/gstrtmpsrc.c
View file

@ -307,8 +307,6 @@ gst_rtmp_src_create (GstPushSrc * pushsrc, GstBuffer ** buffer)
data = GST_BUFFER_DATA (buf); data = GST_BUFFER_DATA (buf);
read = 0; read = 0;
src->last_timestamp =
MAX (src->last_timestamp, src->rtmp->m_mediaStamp * GST_MSECOND);
while (todo > 0) { while (todo > 0) {
read = RTMP_Read (src->rtmp, (char *) data, todo); read = RTMP_Read (src->rtmp, (char *) data, todo);
@ -340,9 +338,12 @@ gst_rtmp_src_create (GstPushSrc * pushsrc, GstBuffer ** buffer)
GST_BUFFER_TIMESTAMP (buf) = src->last_timestamp; GST_BUFFER_TIMESTAMP (buf) = src->last_timestamp;
GST_BUFFER_OFFSET (buf) = src->cur_offset; GST_BUFFER_OFFSET (buf) = src->cur_offset;
src->last_timestamp =
MAX (src->last_timestamp, src->rtmp->m_mediaStamp * GST_MSECOND);
src->cur_offset += size; src->cur_offset += size;
if (src->last_timestamp == GST_CLOCK_TIME_NONE)
src->last_timestamp = src->rtmp->m_mediaStamp * GST_MSECOND;
else
src->last_timestamp =
MAX (src->last_timestamp, src->rtmp->m_mediaStamp * GST_MSECOND);
GST_LOG_OBJECT (src, "Created buffer of size %u at %" G_GINT64_FORMAT GST_LOG_OBJECT (src, "Created buffer of size %u at %" G_GINT64_FORMAT
" with timestamp %" GST_TIME_FORMAT, size, GST_BUFFER_OFFSET (buf), " with timestamp %" GST_TIME_FORMAT, size, GST_BUFFER_OFFSET (buf),
@ -490,12 +491,12 @@ gst_rtmp_src_do_seek (GstBaseSrc * basesrc, GstSegment * segment)
} }
src->discont = TRUE; src->discont = TRUE;
src->last_timestamp = 0;
/* Initial seek */ /* Initial seek */
if (src->cur_offset == 0 && segment->start == 0) if (src->cur_offset == 0 && segment->start == 0)
return TRUE; return TRUE;
src->last_timestamp = GST_CLOCK_TIME_NONE;
if (!RTMP_SendSeek (src->rtmp, segment->start / GST_MSECOND)) { if (!RTMP_SendSeek (src->rtmp, segment->start / GST_MSECOND)) {
GST_ERROR_OBJECT (src, "Seeking failed"); GST_ERROR_OBJECT (src, "Seeking failed");
src->seekable = FALSE; src->seekable = FALSE;