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

ext/theora/theoradec.c: Call right _scale functions.

Browse source 
Original commit message from CVS:
* ext/theora/theoradec.c: (_theora_granule_time),
(theora_dec_src_convert), (theora_dec_sink_convert):
Call right _scale functions.
Use parameter instead of some other random value.
This commit is contained in:
Wim Taymans 2006-01-31 17:44:35 +00:00
parent 344800fb30
commit 6ec9735673
2 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2006-01-31 Wim Taymans <wim@fluendo.com>
* ext/theora/theoradec.c: (_theora_granule_time),
(theora_dec_src_convert), (theora_dec_sink_convert):
Call right _scale functions.
Use parameter instead of some other random value.
2006-01-31 Wim Taymans <wim@fluendo.com> 2006-01-31 Wim Taymans <wim@fluendo.com>
* ext/theora/theoradec.c: (_theora_granule_frame), * ext/theora/theoradec.c: (_theora_granule_frame),

8
ext/theora/theoradec.c
View file

@ -238,7 +238,7 @@ _theora_granule_time (GstTheoraDec * dec, gint64 granulepos)
if (granulepos == -1) if (granulepos == -1)
return -1; return -1;
framecount = _theora_granule_frame (dec, dec->granulepos); framecount = _theora_granule_frame (dec, granulepos);
return gst_util_uint64_scale_int (framecount * GST_SECOND, return gst_util_uint64_scale_int (framecount * GST_SECOND,
dec->info.fps_denominator, dec->info.fps_numerator); dec->info.fps_denominator, dec->info.fps_numerator);
@ -340,7 +340,7 @@ theora_dec_src_convert (GstPad * pad,
case GST_FORMAT_BYTES: case GST_FORMAT_BYTES:
scale = 3 * (dec->info.width * dec->info.height) / 2; scale = 3 * (dec->info.width * dec->info.height) / 2;
case GST_FORMAT_DEFAULT: case GST_FORMAT_DEFAULT:
*dest_value = scale * gst_util_uint64_scale_int (src_value, *dest_value = scale * gst_util_uint64_scale (src_value,
dec->info.fps_numerator, dec->info.fps_denominator * GST_SECOND); dec->info.fps_numerator, dec->info.fps_denominator * GST_SECOND);
break; break;
default: default:
@ -350,7 +350,7 @@ theora_dec_src_convert (GstPad * pad,
case GST_FORMAT_DEFAULT: case GST_FORMAT_DEFAULT:
switch (*dest_format) { switch (*dest_format) {
case GST_FORMAT_TIME: case GST_FORMAT_TIME:
*dest_value = gst_util_uint64_scale_int (src_value, *dest_value = gst_util_uint64_scale (src_value,
GST_SECOND * dec->info.fps_denominator, dec->info.fps_numerator); GST_SECOND * dec->info.fps_denominator, dec->info.fps_numerator);
break; break;
case GST_FORMAT_BYTES: case GST_FORMAT_BYTES:
@ -407,7 +407,7 @@ theora_dec_sink_convert (GstPad * pad,
guint rest; guint rest;
/* framecount */ /* framecount */
*dest_value = gst_util_uint64_scale_int (src_value, *dest_value = gst_util_uint64_scale (src_value,
dec->info.fps_numerator, GST_SECOND * dec->info.fps_denominator); dec->info.fps_numerator, GST_SECOND * dec->info.fps_denominator);
/* funny way of calculating granulepos in theora */ /* funny way of calculating granulepos in theora */