mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-23 14:36:24 +00:00
Code Issues 1 Projects Releases Wiki Activity

Fix the timestamps. A new incomming timestamp should not be used on a pertial buffer.

Browse source 
Original commit message from CVS:
Fix the timestamps. A new incomming timestamp should not be used on a
pertial buffer.
This commit is contained in:
Wim Taymans 2002-09-18 22:04:32 +00:00
parent ae44e5bdab
commit 15968144ba
1 changed files with 22 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
ext/mad/gstmad.c
View file

@ -925,6 +925,7 @@ gst_mad_chain (GstPad *pad, GstBuffer *buffer)
GstMad *mad; GstMad *mad;
gchar *data; gchar *data;
glong size; glong size;
gboolean new_pts = FALSE;
mad = GST_MAD (gst_pad_get_parent (pad)); mad = GST_MAD (gst_pad_get_parent (pad));
@ -957,6 +958,8 @@ gst_mad_chain (GstPad *pad, GstBuffer *buffer)
time = 0; time = 0;
} }
/* for now, this is the best we can do. Let's hope a real timestamp
* arrives with the next buffer */
mad->base_time = time; mad->base_time = time;
gst_event_unref (event); gst_event_unref (event);
@ -979,9 +982,18 @@ gst_mad_chain (GstPad *pad, GstBuffer *buffer)
} }
if (GST_BUFFER_TIMESTAMP (buffer) != -1) { if (GST_BUFFER_TIMESTAMP (buffer) != -1) {
/* if there is nothing queued (partial buffer), we prepare to set the
* timestamp on the next buffer */
if (mad->tempsize == 0) {
mad->base_time = GST_BUFFER_TIMESTAMP (buffer); mad->base_time = GST_BUFFER_TIMESTAMP (buffer);
mad->total_samples = 0; mad->total_samples = 0;
} }
/* else we need to finish the current partial frame with the old timestamp
* and queue this timestamp for the next frame */
else {
new_pts = TRUE;
}
}
/* end of new bit */ /* end of new bit */
data = GST_BUFFER_DATA (buffer); data = GST_BUFFER_DATA (buffer);
@ -1124,6 +1136,14 @@ gst_mad_chain (GstPad *pad, GstBuffer *buffer)
mad->total_samples += nsamples; mad->total_samples += nsamples;
} }
/* we have a queued timestamp on the incomming buffer that we should
* use for the next frame */
if (new_pts) {
new_pts = FALSE;
mad->base_time = GST_BUFFER_TIMESTAMP (buffer);
mad->total_samples = 0;
}
if (mad->restart) { if (mad->restart) {
mad->restart = FALSE; mad->restart = FALSE;
mad->tempsize = 0; mad->tempsize = 0;
@ -1131,7 +1151,6 @@ gst_mad_chain (GstPad *pad, GstBuffer *buffer)
} }
next: next:
/* figure out how many bytes mad consumed */ /* figure out how many bytes mad consumed */
consumed = mad->stream.next_frame - mad_input_buffer; consumed = mad->stream.next_frame - mad_input_buffer;