mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 20:21:24 +00:00
Code Issues 1 Projects Releases Wiki Activity

- fix timestamps

Browse source 
Original commit message from CVS:
- fix timestamps
This commit is contained in:
Wim Taymans 2003-05-30 14:48:29 +00:00
parent cd928692ab
commit 1b3a2a30f7
1 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
ext/mad/gstmad.c
View file

@ -50,6 +50,7 @@ struct _GstMad {
guchar *tempbuffer; guchar *tempbuffer;
glong tempsize; /* used to keep track of partial buffers */ glong tempsize; /* used to keep track of partial buffers */
gboolean need_sync; gboolean need_sync;
GstClockTime last_ts;
guint64 base_byte_offset; guint64 base_byte_offset;
guint64 bytes_consumed; /* since the base_byte_offset */ guint64 bytes_consumed; /* since the base_byte_offset */
guint64 total_samples; /* the number of samples since the sync point */ guint64 total_samples; /* the number of samples since the sync point */
@ -1113,8 +1114,9 @@ gst_mad_chain (GstPad *pad, GstBuffer *buffer)
/* if there is nothing queued (partial buffer), we prepare to set the /* if there is nothing queued (partial buffer), we prepare to set the
* timestamp on the next buffer */ * timestamp on the next buffer */
if (mad->tempsize == 0) { if (mad->tempsize == 0) {
GstFormat format = GST_FORMAT_DEFAULT; /* we have to save the result here because we can't yet convert the timestamp
gst_pad_convert (pad, GST_FORMAT_TIME, timestamp, &format, &mad->total_samples); * to a sample offset yet, the samplerate might not be known yet */
mad->last_ts = timestamp;
mad->base_byte_offset = GST_BUFFER_OFFSET (buffer); mad->base_byte_offset = GST_BUFFER_OFFSET (buffer);
mad->bytes_consumed = 0; mad->bytes_consumed = 0;
} }
@ -1258,6 +1260,12 @@ gst_mad_chain (GstPad *pad, GstBuffer *buffer)
time_duration = GST_CLOCK_TIME_NONE; time_duration = GST_CLOCK_TIME_NONE;
} }
else { else {
/* if we have a pending timestamp, we can use it now to calculate the sample offset */
if (GST_CLOCK_TIME_IS_VALID (mad->last_ts)) {
GstFormat format = GST_FORMAT_DEFAULT;
gst_pad_convert (mad->srcpad, GST_FORMAT_TIME, mad->last_ts, &format, &mad->total_samples);
mad->last_ts = GST_CLOCK_TIME_NONE;
}
time_offset = mad->total_samples * GST_SECOND time_offset = mad->total_samples * GST_SECOND
/ mad->frame.header.samplerate; / mad->frame.header.samplerate;
time_duration = ((mad->total_samples + nsamples) * GST_SECOND time_duration = ((mad->total_samples + nsamples) * GST_SECOND
@ -1317,10 +1325,8 @@ gst_mad_chain (GstPad *pad, GstBuffer *buffer)
/* we have a queued timestamp on the incoming buffer that we should /* we have a queued timestamp on the incoming buffer that we should
* use for the next frame */ * use for the next frame */
if (new_pts) { if (new_pts) {
GstFormat format = GST_FORMAT_DEFAULT; mad->last_ts = timestamp;
new_pts = FALSE; new_pts = FALSE;
gst_pad_convert (pad, GST_FORMAT_TIME, timestamp, &format, &mad->total_samples);
mad->base_byte_offset = GST_BUFFER_OFFSET (buffer); mad->base_byte_offset = GST_BUFFER_OFFSET (buffer);
mad->bytes_consumed = 0; mad->bytes_consumed = 0;
} }
@ -1373,6 +1379,7 @@ gst_mad_change_state (GstElement *element)
mad->framecount = 0; mad->framecount = 0;
mad->vbr_rate = 0; mad->vbr_rate = 0;
mad->frame.header.samplerate = 0; mad->frame.header.samplerate = 0;
mad->last_ts = GST_CLOCK_TIME_NONE;
if (mad->ignore_crc) options |= MAD_OPTION_IGNORECRC; if (mad->ignore_crc) options |= MAD_OPTION_IGNORECRC;
if (mad->half) options |= MAD_OPTION_HALFSAMPLERATE; if (mad->half) options |= MAD_OPTION_HALFSAMPLERATE;
mad_stream_options (&mad->stream, options); mad_stream_options (&mad->stream, options);