Forward port of [17351]. Report input error condition to JavaScript

[vlc] / src / control / input.c

diff --git a/src/control/input.c b/src/control/input.c
index 8cc3d1aaa1b9418fd7b1fb063360bc2d6a7eb6d2..825c828a9b9d00e82a37aa25a79e1fcce0767bd6 100644 (file)
--- a/src/control/input.c
+++ b/src/control/input.c
@@ -41,17 +41,18 @@ input_thread_t *libvlc_get_input_thread( libvlc_input_t *p_input,
 {
     input_thread_t *p_input_thread;
 
-    if( !p_input ) RAISENULL( "Input is NULL" );
+    if( !p_input )
+        RAISENULL( "Input is NULL" );
 
     p_input_thread = (input_thread_t*)vlc_object_get(
                                              p_input->p_instance->p_libvlc_int,
                                              p_input->i_input_id );
-    if( !p_input_thread ) RAISENULL( "Input does not exist" );
+    if( !p_input_thread )
+        RAISENULL( "Input does not exist" );
 
     return p_input_thread;
 }
 
-    
 
 /**************************************************************************
  * Getters for stream information
@@ -63,12 +64,13 @@ vlc_int64_t libvlc_input_get_length( libvlc_input_t *p_input,
     vlc_value_t val;
 
     p_input_thread = libvlc_get_input_thread ( p_input, p_e);
-    if( libvlc_exception_raised( p_e ) )  return -1;
-       
+    if( libvlc_exception_raised( p_e ) )
+        return -1;
+
     var_Get( p_input_thread, "length", &val );
     vlc_object_release( p_input_thread );
 
-    return val.i_time;
+    return (val.i_time+500LL)/1000LL;
 }
 
 vlc_int64_t libvlc_input_get_time( libvlc_input_t *p_input,
@@ -78,11 +80,12 @@ vlc_int64_t libvlc_input_get_time( libvlc_input_t *p_input,
     vlc_value_t val;
 
     p_input_thread = libvlc_get_input_thread ( p_input, p_e );
-    if( libvlc_exception_raised( p_e ) )  return -1;
+    if( libvlc_exception_raised( p_e ) )
+        return -1;
 
     var_Get( p_input_thread , "time", &val );
     vlc_object_release( p_input_thread );
-    return val.i_time;
+    return (val.i_time+500LL)/1000LL;
 }
 
 void libvlc_input_set_time( libvlc_input_t *p_input, vlc_int64_t time,
@@ -92,9 +95,10 @@ void libvlc_input_set_time( libvlc_input_t *p_input, vlc_int64_t time,
     vlc_value_t value;
 
     p_input_thread = libvlc_get_input_thread ( p_input, p_e );
-    if( libvlc_exception_raised( p_e ) )  return;
-    
-    value.i_time = time;
+    if( libvlc_exception_raised( p_e ) )
+        return;
+
+    value.i_time = time*1000LL;
     var_Set( p_input_thread, "time", value );
     vlc_object_release( p_input_thread );
 }
@@ -105,9 +109,10 @@ void libvlc_input_set_position( libvlc_input_t *p_input, float position,
     input_thread_t *p_input_thread;
     vlc_value_t val;
     val.f_float = position;
-    
+
     p_input_thread = libvlc_get_input_thread ( p_input, p_e);
-    if ( libvlc_exception_raised( p_e ) ) return;
+    if ( libvlc_exception_raised( p_e ) )
+        return;
 
     var_Set( p_input_thread, "position", val );
     vlc_object_release( p_input_thread );
@@ -120,7 +125,8 @@ float libvlc_input_get_position( libvlc_input_t *p_input,
     vlc_value_t val;
 
     p_input_thread = libvlc_get_input_thread ( p_input, p_e);
-    if ( libvlc_exception_raised( p_e ) )  return -1.0;
+    if ( libvlc_exception_raised( p_e ) )
+        return -1.0;
 
     var_Get( p_input_thread, "position", &val );
     vlc_object_release( p_input_thread );
@@ -135,7 +141,8 @@ float libvlc_input_get_fps( libvlc_input_t *p_input,
     input_thread_t *p_input_thread;
 
     p_input_thread = libvlc_get_input_thread ( p_input, p_e );
-    if ( libvlc_exception_raised( p_e ) )  return 0.0;
+    if ( libvlc_exception_raised( p_e ) )
+        return 0.0;
 
     if( demux2_Control( p_input_thread->input.p_demux, DEMUX_GET_FPS, &f_fps )
         || f_fps < 0.1 ) 
@@ -155,7 +162,8 @@ vlc_bool_t libvlc_input_will_play( libvlc_input_t *p_input,
 {
     input_thread_t *p_input_thread =
                             libvlc_get_input_thread ( p_input, p_e);
-    if ( libvlc_exception_raised( p_e ) ) return VLC_FALSE;
+    if ( libvlc_exception_raised( p_e ) )
+        return VLC_FALSE;
 
     if ( !p_input_thread->b_die && !p_input_thread->b_dead ) 
     {
@@ -171,10 +179,15 @@ void libvlc_input_set_rate( libvlc_input_t *p_input, float rate,
 {
     input_thread_t *p_input_thread;
     vlc_value_t val;
-    val.i_int = rate*1000.0f;
-    
+
+    if( rate <= 0 )
+        RAISEVOID( "Rate value is invalid" );
+
+    val.i_int = 1000.0f/rate;
+
     p_input_thread = libvlc_get_input_thread ( p_input, p_e);
-    if ( libvlc_exception_raised( p_e ) ) return;
+    if ( libvlc_exception_raised( p_e ) )
+        return;
 
     var_Set( p_input_thread, "rate", val );
     vlc_object_release( p_input_thread );
@@ -187,12 +200,13 @@ float libvlc_input_get_rate( libvlc_input_t *p_input,
     vlc_value_t val;
 
     p_input_thread = libvlc_get_input_thread ( p_input, p_e);
-    if ( libvlc_exception_raised( p_e ) )  return -1.0;
+    if ( libvlc_exception_raised( p_e ) )
+        return -1.0;
 
     var_Get( p_input_thread, "rate", &val );
     vlc_object_release( p_input_thread );
 
-    return (float)val.i_int/1000.0f;
+    return (float)1000.0f/val.i_int;
 }
 
 int libvlc_input_get_state( libvlc_input_t *p_input,
@@ -201,8 +215,9 @@ int libvlc_input_get_state( libvlc_input_t *p_input,
     input_thread_t *p_input_thread;
     vlc_value_t val;
 
-    p_input_thread = libvlc_get_input_thread ( p_input, p_e);
-    if ( libvlc_exception_raised( p_e ) )  return 0;
+    p_input_thread = libvlc_get_input_thread ( p_input, p_e );
+    if ( libvlc_exception_raised( p_e ) )
+        return 6; /* Return ERROR_S (see include/vlc_input.c) */
 
     var_Get( p_input_thread, "state", &val );
     vlc_object_release( p_input_thread );