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

Correctly convert timestamps between us and ns

Browse source
This commit is contained in:
Sebastian Dröge 2012-09-10 12:56:04 +02:00
parent 2fe74efc04
commit cb262e2465
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
sys/androidmedia/gstamcvideodec.c
View file

@ -714,8 +714,7 @@ retry:
frame = frame =
_find_nearest_frame (self, _find_nearest_frame (self,
gst_util_uint64_scale (buffer_info.presentation_time_us, GST_USECOND, gst_util_uint64_scale (buffer_info.presentation_time_us, GST_USECOND, 1));
GST_SECOND));
is_eos = ! !(buffer_info.flags & BUFFER_FLAG_END_OF_STREAM); is_eos = ! !(buffer_info.flags & BUFFER_FLAG_END_OF_STREAM);
@ -1178,8 +1177,7 @@ gst_amc_video_dec_handle_frame (GstVideoDecoder * decoder,
if (timestamp != GST_CLOCK_TIME_NONE) { if (timestamp != GST_CLOCK_TIME_NONE) {
buffer_info.presentation_time_us = buffer_info.presentation_time_us =
gst_util_uint64_scale (timestamp + timestamp_offset, gst_util_uint64_scale (timestamp + timestamp_offset, 1, GST_USECOND);
GST_USECOND, GST_SECOND);
self->last_upstream_ts = timestamp + timestamp_offset; self->last_upstream_ts = timestamp + timestamp_offset;
} }
if (duration != GST_CLOCK_TIME_NONE) if (duration != GST_CLOCK_TIME_NONE)
@ -1272,7 +1270,7 @@ gst_amc_video_dec_finish (GstVideoDecoder * decoder)
memset (&buffer_info, 0, sizeof (buffer_info)); memset (&buffer_info, 0, sizeof (buffer_info));
buffer_info.size = 0; buffer_info.size = 0;
buffer_info.presentation_time_us = buffer_info.presentation_time_us =
gst_util_uint64_scale (self->last_upstream_ts, GST_USECOND, GST_SECOND); gst_util_uint64_scale (self->last_upstream_ts, 1, GST_USECOND);
buffer_info.flags |= BUFFER_FLAG_END_OF_STREAM; buffer_info.flags |= BUFFER_FLAG_END_OF_STREAM;
if (gst_amc_codec_queue_input_buffer (self->codec, idx, &buffer_info)) if (gst_amc_codec_queue_input_buffer (self->codec, idx, &buffer_info))
@ -1328,7 +1326,7 @@ gst_amc_video_dec_drain (GstAmcVideoDec * self)
memset (&buffer_info, 0, sizeof (buffer_info)); memset (&buffer_info, 0, sizeof (buffer_info));
buffer_info.size = 0; buffer_info.size = 0;
buffer_info.presentation_time_us = buffer_info.presentation_time_us =
gst_util_uint64_scale (self->last_upstream_ts, GST_USECOND, GST_SECOND); gst_util_uint64_scale (self->last_upstream_ts, 1, GST_USECOND);
buffer_info.flags |= BUFFER_FLAG_END_OF_STREAM; buffer_info.flags |= BUFFER_FLAG_END_OF_STREAM;
if (gst_amc_codec_queue_input_buffer (self->codec, idx, &buffer_info)) { if (gst_amc_codec_queue_input_buffer (self->codec, idx, &buffer_info)) {