diff options
| author | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2012-11-20 12:21:08 +0100 |
|---|---|---|
| committer | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2012-12-10 12:06:27 +0000 |
| commit | 3b924de03dbb77d2c5bad5a7d754ad436bdfb161 (patch) | |
| tree | 3728bf371a4590199f5a227f1e0f4054d829736b | |
| parent | 82f899bde4cec4a6a5cba6bbca28c0feebed66e7 (diff) | |
| download | gstreamer-plugins-base-3b924de03dbb77d2c5bad5a7d754ad436bdfb161.tar.gz | |
videodecoder: Return the proportion directly
| -rw-r--r-- | gst-libs/gst/video/gstvideodecoder.c | 17 | ||||
| -rw-r--r-- | gst-libs/gst/video/gstvideodecoder.h | 3 |
2 files changed, 9 insertions, 11 deletions
diff --git a/gst-libs/gst/video/gstvideodecoder.c b/gst-libs/gst/video/gstvideodecoder.c index be5d419d0..f0b457540 100644 --- a/gst-libs/gst/video/gstvideodecoder.c +++ b/gst-libs/gst/video/gstvideodecoder.c @@ -2898,25 +2898,24 @@ gst_video_decoder_get_max_decode_time (GstVideoDecoder * /** * gst_video_decoder_get_qos_proportion: * @decoder: a #GstVideoDecoder - * @proportion: (out) (allow-none): address of variable in which to store the * current QoS proportion, or %NULL * - * Returns: TRUE on success + * Returns: The current QoS proportion. * * Since: 1.0.3 */ -gboolean -gst_video_decoder_get_qos_proportion (GstVideoDecoder * decoder, - gdouble * proportion) +gdouble +gst_video_decoder_get_qos_proportion (GstVideoDecoder * decoder) { - g_return_val_if_fail (GST_IS_VIDEO_DECODER (decoder), FALSE); + gdouble proportion; + + g_return_val_if_fail (GST_IS_VIDEO_DECODER (decoder), 1.0); GST_OBJECT_LOCK (decoder); - if (proportion != NULL) - *proportion = decoder->priv->proportion; + proportion = decoder->priv->proportion; GST_OBJECT_UNLOCK (decoder); - return TRUE; + return proportion; } GstFlowReturn diff --git a/gst-libs/gst/video/gstvideodecoder.h b/gst-libs/gst/video/gstvideodecoder.h index cd7cacc53..38f3e2dbc 100644 --- a/gst-libs/gst/video/gstvideodecoder.h +++ b/gst-libs/gst/video/gstvideodecoder.h @@ -358,8 +358,7 @@ GstVideoCodecState *gst_video_decoder_get_output_state (GstVideoDecoder *decoder GstClockTimeDiff gst_video_decoder_get_max_decode_time (GstVideoDecoder *decoder, GstVideoCodecFrame *frame); -gboolean gst_video_decoder_get_qos_proportion (GstVideoDecoder * decoder, - gdouble * proportion); +gdouble gst_video_decoder_get_qos_proportion (GstVideoDecoder * decoder); GstFlowReturn gst_video_decoder_finish_frame (GstVideoDecoder *decoder, GstVideoCodecFrame *frame); |