diff options
| author | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2012-11-20 12:08:26 +0100 |
|---|---|---|
| committer | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2012-12-10 12:06:18 +0000 |
| commit | 82f899bde4cec4a6a5cba6bbca28c0feebed66e7 (patch) | |
| tree | cc9ccb7c0e6d26e71a075c4af7d8c601b32f4ad1 | |
| parent | 4d3281b0ab810fe596ac1ed5410d88a4a174f71c (diff) | |
| download | gstreamer-plugins-base-82f899bde4cec4a6a5cba6bbca28c0feebed66e7.tar.gz | |
videodecoder: Rename from get_qos_info() to get_qos_proportion()
And only return the proportion. The earliest time already can be
retrieved from get_max_decode_time() and by renaming we allow this
to be more extensible in the future.
| -rw-r--r-- | docs/libs/gst-plugins-base-libs-sections.txt | 2 | ||||
| -rw-r--r-- | gst-libs/gst/video/gstvideodecoder.c | 10 | ||||
| -rw-r--r-- | gst-libs/gst/video/gstvideodecoder.h | 5 | ||||
| -rw-r--r-- | win32/common/libgstvideo.def | 2 |
4 files changed, 7 insertions, 12 deletions
diff --git a/docs/libs/gst-plugins-base-libs-sections.txt b/docs/libs/gst-plugins-base-libs-sections.txt index 8c02f0614..27f47d075 100644 --- a/docs/libs/gst-plugins-base-libs-sections.txt +++ b/docs/libs/gst-plugins-base-libs-sections.txt @@ -2537,7 +2537,7 @@ gst_video_decoder_get_max_decode_time gst_video_decoder_get_max_errors gst_video_decoder_get_oldest_frame gst_video_decoder_get_packetized -gst_video_decoder_get_qos_info +gst_video_decoder_get_qos_proportion gst_video_decoder_have_frame gst_video_decoder_get_latency gst_video_decoder_set_latency diff --git a/gst-libs/gst/video/gstvideodecoder.c b/gst-libs/gst/video/gstvideodecoder.c index d0370748e..be5d419d0 100644 --- a/gst-libs/gst/video/gstvideodecoder.c +++ b/gst-libs/gst/video/gstvideodecoder.c @@ -2896,28 +2896,24 @@ gst_video_decoder_get_max_decode_time (GstVideoDecoder * } /** - * gst_video_decoder_get_qos_info: + * 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 - * @earliest_time: (out) (allow-none): address of variable in which to store the - * QoS earliest_time, or %NULL * * Returns: TRUE on success * * Since: 1.0.3 */ gboolean -gst_video_decoder_get_qos_info (GstVideoDecoder * decoder, gdouble * proportion, - GstClockTime * earliest_time) +gst_video_decoder_get_qos_proportion (GstVideoDecoder * decoder, + gdouble * proportion) { g_return_val_if_fail (GST_IS_VIDEO_DECODER (decoder), FALSE); GST_OBJECT_LOCK (decoder); if (proportion != NULL) *proportion = decoder->priv->proportion; - if (earliest_time != NULL) - *earliest_time = decoder->priv->earliest_time; GST_OBJECT_UNLOCK (decoder); return TRUE; diff --git a/gst-libs/gst/video/gstvideodecoder.h b/gst-libs/gst/video/gstvideodecoder.h index 539faf146..cd7cacc53 100644 --- a/gst-libs/gst/video/gstvideodecoder.h +++ b/gst-libs/gst/video/gstvideodecoder.h @@ -358,9 +358,8 @@ 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_info (GstVideoDecoder * decoder, - gdouble *proportion, - GstClockTime *earliest_time); +gboolean gst_video_decoder_get_qos_proportion (GstVideoDecoder * decoder, + gdouble * proportion); GstFlowReturn gst_video_decoder_finish_frame (GstVideoDecoder *decoder, GstVideoCodecFrame *frame); diff --git a/win32/common/libgstvideo.def b/win32/common/libgstvideo.def index 4b8f60513..fb0debea6 100644 --- a/win32/common/libgstvideo.def +++ b/win32/common/libgstvideo.def @@ -33,7 +33,7 @@ EXPORTS gst_video_decoder_get_oldest_frame gst_video_decoder_get_output_state gst_video_decoder_get_packetized - gst_video_decoder_get_qos_info + gst_video_decoder_get_qos_proportion gst_video_decoder_get_type gst_video_decoder_have_frame gst_video_decoder_set_estimate_rate |