vlc_object_get(): removes unused parameter

[vlc] / src / input / input.c

diff --git a/src/input/input.c b/src/input/input.c
index fdfda62b60eaad4cd9ba9fda79304ca4b9033fdd..dcb7b66dae1d33fa4fed096f13a23f18cec1c3db 100644 (file)
--- a/src/input/input.c
+++ b/src/input/input.c
@@ -25,10 +25,15 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include <vlc/vlc.h>
 
 #include <ctype.h>
 #include <limits.h>
+#include <assert.h>
 
 #include "input_internal.h"
 
@@ -108,6 +113,7 @@ static void AppendAttachment( int *pi_attachment, input_attachment_t ***ppp_atta
  *  - length
  *  - bookmarks
  *  - seekable (if you can seek, it doesn't say if 'bar display' has be shown or not, for that check position != 0.0)
+ *  - can-pause
  * * For intf callback upon changes
  *  - intf-change
  * TODO explain when Callback is called
@@ -174,6 +180,8 @@ static input_thread_t *Create( vlc_object_t *p_parent, input_item_t *p_item,
     p_input->p->input.title    = NULL;
     p_input->p->input.i_title_offset = p_input->p->input.i_seekpoint_offset = 0;
     p_input->p->input.b_can_pace_control = VLC_TRUE;
+    p_input->p->input.b_can_rate_control = VLC_TRUE;
+    p_input->p->input.b_rescale_ts = VLC_TRUE;
     p_input->p->input.b_eof = VLC_FALSE;
     p_input->p->input.i_cr_average = 0;
 
@@ -835,7 +843,6 @@ static int Init( input_thread_t * p_input )
             {
                 /* Create a new one */
                 p_input->p->p_sout = sout_NewInstance( p_input, psz );
-
                 if( !p_input->p->p_sout )
                 {
                     input_ChangeState( p_input, ERROR_S );
@@ -867,7 +874,7 @@ static int Init( input_thread_t * p_input )
     }
 
     /* Create es out */
-    p_input->p->p_es_out = input_EsOutNew( p_input );
+    p_input->p->p_es_out = input_EsOutNew( p_input, p_input->p->i_rate );
     es_out_Control( p_input->p->p_es_out, ES_OUT_SET_ACTIVE, VLC_FALSE );
     es_out_Control( p_input->p->p_es_out, ES_OUT_SET_MODE, ES_OUT_MODE_NONE );
 
@@ -897,6 +904,7 @@ static int Init( input_thread_t * p_input )
         /* Global flag */
         p_input->b_can_pace_control = p_input->p->input.b_can_pace_control;
         p_input->p->b_can_pause        = p_input->p->input.b_can_pause;
+        p_input->p->b_can_rate_control = p_input->p->input.b_can_rate_control;
 
         /* Fix pts delay */
         if( p_input->i_pts_delay < 0 )
@@ -1253,10 +1261,10 @@ error:
  *****************************************************************************/
 static void Error( input_thread_t *p_input )
 {
+    input_ChangeState( p_input, ERROR_S );
     while( !p_input->b_die )
     {
         /* Sleep a while */
-        input_ChangeState( p_input, ERROR_S );
         msleep( INPUT_IDLE_SLEEP );
     }
 }
@@ -1733,12 +1741,29 @@ static vlc_bool_t Control( input_thread_t *p_input, int i_type,
                 i_rate = INPUT_RATE_MAX;
             }
             if( i_rate != INPUT_RATE_DEFAULT &&
-                ( !p_input->b_can_pace_control ||
+                ( ( !p_input->b_can_pace_control && !p_input->p->b_can_rate_control ) ||
                   ( p_input->p->p_sout && !p_input->p->b_out_pace_control ) ) )
             {
                 msg_Dbg( p_input, "cannot change rate" );
                 i_rate = INPUT_RATE_DEFAULT;
             }
+            if( i_rate != p_input->p->i_rate &&
+                !p_input->b_can_pace_control && p_input->p->b_can_rate_control )
+            {
+                int i_ret;
+                if( p_input->p->input.p_access )
+                    i_ret = VLC_EGENERIC;
+                else
+                    i_ret = demux2_Control( p_input->p->input.p_demux,
+                                            DEMUX_SET_RATE, &i_rate );
+                if( i_ret )
+                {
+                    msg_Warn( p_input, "ACCESS/DEMUX_SET_RATE failed" );
+                    i_rate = p_input->p->i_rate;
+                }
+            }
+
+            /* */
             if( i_rate != p_input->p->i_rate )
             {
                 val.i_int = i_rate;
@@ -1746,7 +1771,9 @@ static vlc_bool_t Control( input_thread_t *p_input, int i_type,
 
                 p_input->p->i_rate  = i_rate;
 
-                input_EsOutChangeRate( p_input->p->p_es_out );
+                /* FIXME do we need a RESET_PCR when !p_input->p->input.b_rescale_ts ? */
+                if( p_input->p->input.b_rescale_ts )
+                    input_EsOutChangeRate( p_input->p->p_es_out, i_rate );
 
                 b_force_update = VLC_TRUE;
             }
@@ -2096,7 +2123,7 @@ static void UpdateItemLength( input_thread_t *p_input, int64_t i_length )
         pl_Yield( p_input );
         var_SetInteger( pl_Get( p_input ), "item-change",
                         p_input->p->input.p_item->i_id );
-        pl_Release( p_input )
+        pl_Release( p_input );
     }
 }
 
@@ -2119,7 +2146,10 @@ static input_source_t *InputSourceNew( input_thread_t *p_input )
     in->p_demux  = NULL;
     in->b_title_demux = VLC_FALSE;
     TAB_INIT( in->i_title, in->title );
+    in->b_can_pause = VLC_TRUE;
     in->b_can_pace_control = VLC_TRUE;
+    in->b_can_rate_control = VLC_TRUE;
+    in->b_rescale_ts = VLC_TRUE;
     in->b_eof = VLC_FALSE;
     in->f_fps = 0.0;
     in->i_cr_average = 0;
@@ -2220,15 +2250,34 @@ static int InputSourceInit( input_thread_t *p_input,
             in->i_title = 0;
             in->title   = NULL;
         }
-        demux2_Control( in->p_demux, DEMUX_CAN_CONTROL_PACE,
-                        &in->b_can_pace_control );
-        demux2_Control( in->p_demux, DEMUX_CAN_PAUSE,
-                        &in->b_can_pause );
+        if( demux2_Control( in->p_demux, DEMUX_CAN_CONTROL_PACE,
+                            &in->b_can_pace_control ) )
+            in->b_can_pace_control = VLC_FALSE;
+
+        if( !in->b_can_pace_control )
+        {
+            if( demux2_Control( in->p_demux, DEMUX_CAN_CONTROL_RATE,
+                                &in->b_can_rate_control, &in->b_rescale_ts ) )
+            {
+                in->b_can_rate_control = VLC_FALSE;
+                in->b_rescale_ts = VLC_TRUE; /* not used */
+            }
+        }
+        else
+        {
+            in->b_can_rate_control = VLC_TRUE;
+            in->b_rescale_ts = VLC_TRUE;
+        }
+        if( demux2_Control( in->p_demux, DEMUX_CAN_PAUSE,
+                            &in->b_can_pause ) )
+            in->b_can_pause = VLC_FALSE;
+        var_SetBool( p_input, "can-pause", in->b_can_pause );
 
-        /* FIXME todo
-        demux2_Control( in->p_demux, DEMUX_CAN_SEEK,
+        int ret = demux2_Control( in->p_demux, DEMUX_CAN_SEEK,
                         &val.b_bool );
-        */
+        if( ret != VLC_SUCCESS )
+            val.b_bool = VLC_FALSE;
+        var_Set( p_input, "seekable", val );
     }
     else
     {
@@ -2258,7 +2307,8 @@ static int InputSourceInit( input_thread_t *p_input,
         {
             msg_Dbg( p_input, "retrying with access `' demux `' path `%s'",
                      psz_mrl );
-             in->p_access = access2_New( p_input,
+            psz_demux =  "" ; 
+            in->p_access = access2_New( p_input,
                                          "", "", psz_mrl,
                                          p_input->b_preparsing );
         }
@@ -2313,8 +2363,12 @@ static int InputSourceInit( input_thread_t *p_input,
             }
             access2_Control( in->p_access, ACCESS_CAN_CONTROL_PACE,
                              &in->b_can_pace_control );
+            in->b_can_rate_control = in->b_can_pace_control;
+            in->b_rescale_ts = VLC_TRUE;
+
             access2_Control( in->p_access, ACCESS_CAN_PAUSE,
                              &in->b_can_pause );
+            var_SetBool( p_input, "can-pause", in->b_can_pause );
             access2_Control( in->p_access, ACCESS_CAN_SEEK,
                              &val.b_bool );
             var_Set( p_input, "seekable", val );