Initial implementation of libvlc_get_input_fps.

diff --git a/include/vlc/libvlc.h b/include/vlc/libvlc.h
index 18027f671838fbcbcb65b04a51d1f274e9597975..48d94d77cb5894e68c0d5f116b2c9e81eb06d81a 100644 (file)
--- a/include/vlc/libvlc.h
+++ b/include/vlc/libvlc.h
@@ -270,7 +270,8 @@ vlc_int64_t libvlc_input_get_time       ( libvlc_input_t *, libvlc_exception_t *
 float       libvlc_input_get_position   ( libvlc_input_t *, libvlc_exception_t *);
 vlc_bool_t  libvlc_input_will_play      ( libvlc_input_t *, libvlc_exception_t *);
 vlc_bool_t  libvlc_input_has_vout       ( libvlc_input_t *, libvlc_exception_t *);
-
+float       libvlc_input_get_fps        ( libvlc_input_t *, libvlc_exception_t *);
+        
 /** @} */
 
 /** defgroup libvlc_video Video

diff --git a/src/control/input.c b/src/control/input.c
index 4a2b89360e64414c81f40136eefe89bbd6bb64e2..ef173c3e378d416311eccd8fb32238a72767011a 100644 (file)
--- a/src/control/input.c
+++ b/src/control/input.c
@@ -22,6 +22,7 @@
  *****************************************************************************/
 
 #include <libvlc_internal.h>
+#include <vlc_demux.h>
 #include <vlc/libvlc.h>
 
 #include <vlc/intf.h>
@@ -116,6 +117,20 @@ float libvlc_input_get_position( libvlc_input_t *p_input,
     return val.f_float;
 }
 
+float libvlc_input_get_fps( libvlc_input_t *p_input,
+                            libvlc_exception_t *p_exception) 
+{
+    double f_fps;
+    input_thread_t *p_input_thread;
+
+    p_input_thread = libvlc_get_input_thread ( p_input, p_exception);
+
+    if( demux2_Control( p_input_thread->input.p_demux, DEMUX_GET_FPS, &f_fps ) || f_fps < 0.1 )
+        return 0;
+    else
+        return( f_fps );
+}
+
 vlc_bool_t libvlc_input_will_play( libvlc_input_t *p_input,
                                    libvlc_exception_t *p_exception) 
 {