diff options
| author | Sebastian Dröge <sebastian@centricular.com> | 2014-10-27 15:34:58 +0100 |
|---|---|---|
| committer | Sebastian Dröge <sebastian@centricular.com> | 2014-10-27 15:35:43 +0100 |
| commit | 56e49ce3b6fad342c74aabb2f8c4156686315938 (patch) | |
| tree | 1c5f5342b1aaaae00bdaf0922a8ac8c18a0b76bf /gst/inter | |
| parent | 6505e84f7c4f6c0aa8f278652bb9d0da925897f6 (diff) | |
inter: Use 64-bit safe scaling functions
Diffstat (limited to 'gst/inter')
| -rw-r--r-- | gst/inter/gstinteraudiosrc.c | 6 | ||||
| -rw-r--r-- | gst/inter/gstintervideosrc.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/gst/inter/gstinteraudiosrc.c b/gst/inter/gstinteraudiosrc.c index ae7e2d8f6..4a53314b5 100644 --- a/gst/inter/gstinteraudiosrc.c +++ b/gst/inter/gstinteraudiosrc.c @@ -303,7 +303,7 @@ gst_inter_audio_src_create (GstBaseSrc * src, guint64 offset, guint size, &interaudiosrc->info)) { caps = gst_audio_info_to_caps (&interaudiosrc->surface->audio_info); interaudiosrc->timestamp_offset += - gst_util_uint64_scale_int (interaudiosrc->n_samples, GST_SECOND, + gst_util_uint64_scale (interaudiosrc->n_samples, GST_SECOND, interaudiosrc->info.rate); interaudiosrc->n_samples = 0; } @@ -364,12 +364,12 @@ gst_inter_audio_src_create (GstBaseSrc * src, guint64 offset, guint size, GST_BUFFER_OFFSET (buffer) = interaudiosrc->n_samples; GST_BUFFER_OFFSET_END (buffer) = interaudiosrc->n_samples + n; GST_BUFFER_TIMESTAMP (buffer) = interaudiosrc->timestamp_offset + - gst_util_uint64_scale_int (interaudiosrc->n_samples, GST_SECOND, + gst_util_uint64_scale (interaudiosrc->n_samples, GST_SECOND, interaudiosrc->info.rate); GST_DEBUG_OBJECT (interaudiosrc, "create ts %" GST_TIME_FORMAT, GST_TIME_ARGS (GST_BUFFER_TIMESTAMP (buffer))); GST_BUFFER_DURATION (buffer) = interaudiosrc->timestamp_offset + - gst_util_uint64_scale_int (interaudiosrc->n_samples + n, GST_SECOND, + gst_util_uint64_scale (interaudiosrc->n_samples + n, GST_SECOND, interaudiosrc->info.rate) - GST_BUFFER_TIMESTAMP (buffer); GST_BUFFER_FLAG_UNSET (buffer, GST_BUFFER_FLAG_DISCONT); if (interaudiosrc->n_samples == 0) { diff --git a/gst/inter/gstintervideosrc.c b/gst/inter/gstintervideosrc.c index 5427f8d8d..9530ff7c1 100644 --- a/gst/inter/gstintervideosrc.c +++ b/gst/inter/gstintervideosrc.c @@ -317,7 +317,7 @@ gst_inter_video_src_create (GstBaseSrc * src, guint64 offset, guint size, &intervideosrc->info)) { caps = gst_video_info_to_caps (&intervideosrc->surface->video_info); intervideosrc->timestamp_offset += - gst_util_uint64_scale_int (GST_SECOND * intervideosrc->n_frames, + gst_util_uint64_scale (GST_SECOND * intervideosrc->n_frames, GST_VIDEO_INFO_FPS_D (&intervideosrc->info), GST_VIDEO_INFO_FPS_N (&intervideosrc->info)); intervideosrc->n_frames = 0; @@ -351,14 +351,14 @@ gst_inter_video_src_create (GstBaseSrc * src, guint64 offset, guint size, buffer = gst_buffer_make_writable (buffer); GST_BUFFER_PTS (buffer) = intervideosrc->timestamp_offset + - gst_util_uint64_scale_int (GST_SECOND * intervideosrc->n_frames, + gst_util_uint64_scale (GST_SECOND * intervideosrc->n_frames, GST_VIDEO_INFO_FPS_D (&intervideosrc->info), GST_VIDEO_INFO_FPS_N (&intervideosrc->info)); GST_BUFFER_DTS (buffer) = GST_CLOCK_TIME_NONE; GST_DEBUG_OBJECT (intervideosrc, "create ts %" GST_TIME_FORMAT, GST_TIME_ARGS (GST_BUFFER_PTS (buffer))); GST_BUFFER_DURATION (buffer) = intervideosrc->timestamp_offset + - gst_util_uint64_scale_int (GST_SECOND * (intervideosrc->n_frames + 1), + gst_util_uint64_scale (GST_SECOND * (intervideosrc->n_frames + 1), GST_VIDEO_INFO_FPS_D (&intervideosrc->info), GST_VIDEO_INFO_FPS_N (&intervideosrc->info)) - GST_BUFFER_PTS (buffer); GST_BUFFER_OFFSET (buffer) = intervideosrc->n_frames; |