Changeset 2aebce79d5f564b25de506071c2de578315cb14a

Timestamp:

23/06/04 19:49:26 (4 years ago)

Author:

Laurent Aimar <fenrir@videolan.org>

git-committer:

Laurent Aimar <fenrir@videolan.org> 1088012966 +0000

git-parent:

[cb45b4c518bd2197c1522189397ec29aacb500c4]

git-author:

Laurent Aimar <fenrir@videolan.org> 1088012966 +0000

Message:

* all: - added a boolean "seekable" object variable to p_input.

(becarefull, it's just if you can seek or not, and not if you have to
display the progress bar, for thet last you have to check if "position"
value get != 0.0 )

• added "audio-delay" and "spu-delay" object variables to delay
  

audio/spu to the video. They can be changed on the fly (untested).

• renamed INPUTGET/SET_SUBDELAY into
  

INPUT_SET_SPU_DELAY and added INPUT_SET_AUDIO_DELAY
(wrapper to "audio-delay" and "spu-delay")

• readded INPUT_ADD/GET_INFO/INPUT_SET_NAME. Becarefull to not over-use
  

them, a demuxer should export DEMUX_GET_META and not using them.

Files:

• include/vlc_input.h (modified) (2 diffs)
• modules/control/hotkeys.c (modified) (1 diff)
• modules/demux/util/sub.c (modified) (5 diffs)
• modules/demux/util/sub.h (modified) (1 diff)
• src/input/control.c (modified) (12 diffs)
• src/input/es_out.c (modified) (5 diffs)
• src/input/input.c (modified) (5 diffs)
• src/input/input_internal.h (modified) (2 diffs)
• src/input/var.c (modified) (5 diffs)

include/vlc_input.h

@@ -312 +312 @@
-    INPUT_SET_STATE,            /* arg1= int            res=can fail    */
-
+    /* input variable "audio-delay" and "spu-delay" */
+    INPUT_GET_AUDIO_DELAY,      /* arg1 = int* res=can fail */
+    INPUT_SET_AUDIO_DELAY,      /* arg1 = int  res=can fail */
+    INPUT_GET_SPU_DELAY,        /* arg1 = int* res=can fail */
+    INPUT_SET_SPU_DELAY,        /* arg1 = int  res=can fail */
+
+    /* Meta datas */
+    INPUT_ADD_INFO,   /* arg1= char * arg2= char * arg3=...  res=can fail    */
+    INPUT_GET_INFO,   /* arg1= char * arg2= char * arg3= char ** res=can fail*/
+
+    INPUT_SET_NAME,   /* arg1= char * res=can fail    */
+
-    /* XXX: all next query aren't working for now */
-
-    /* bookmarks */
-    INPUT_GET_BOOKMARKS,   /* arg1= seekpoint_t *** arg2= int * res=can fail */
@@ -321 +332 @@
-    INPUT_DEL_BOOKMARK,    /* arg1= seekpoint_t *  res=can fail   */
-    INPUT_SET_BOOKMARK,    /* arg1= int  res=can fail    */
-
-    INPUT_ADD_OPTION, /* arg1= char * arg2= char *  res=can fail    */
-
-    /* */
-    INPUT_ADD_INFO,   /* arg1= char * arg2= char * arg3=...  res=can fail    */
-    INPUT_GET_INFO,   /* arg1= char * arg2= char * arg3= char ** res=can fail*/
-
-    INPUT_SET_NAME,   /* arg1= char * res=can fail    */
-
-    /* */
-    INPUT_GET_SUBDELAY,    /* arg1 = int* res=can fail */
-    INPUT_SET_SUBDELAY,    /* arg1 = int  res=can fail */
-};
-

modules/control/hotkeys.c

@@ -292 +292 @@
-        else if( i_action == ACTIONID_SUBDELAY_DOWN )
-        {
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-        }
-        else if( i_action == ACTIONID_SUBDELAY_UP )
-        {
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-        }
-        else if( i_action == ACTIONID_FULLSCREEN && p_vout )

modules/demux/util/sub.c

@@ -77 +77 @@
-               N_("Frames per second"),
-               SUB_FPS_LONGTEXT, VLC_TRUE );
-    add_integer( "sub-delay", 0, NULL,
-                 N_("Delay subtitles (in 1/10s)"),
-                 SUB_DELAY_LONGTEXT, VLC_TRUE );
-    add_string( "sub-type", "auto", NULL, "Subtitles fileformat",
-                SUB_TYPE_LONGTEXT, VLC_TRUE );
@@ -491 +488 @@
-    vlc_bool_t     b;
-    vlc_value_t    val;
-    mtime_t i_delay;
-
-    es_out_Control( p_input->p_es_out, ES_OUT_GET_ES_STATE, p_sub->p_es, &b );
@@ -508 +504 @@
-    if( p_sub->i_sub_type != SUB_TYPE_VOBSUB )
-    {
-        var_Get( p_sub, "sub-delay", &val );
-        i_delay = (mtime_t) val.i_int * 100000;
-        while( p_sub->i_subtitle < p_sub->i_subtitles &&
-- i_delay 
+
-        {
-            block_t *p_block;
@@ -527 +521 @@
-                p_sub->i_subtitle++;
-                continue;
-            }
-
-            /* XXX we should convert all demuxers to use es_out_Control to set              * pcr and then remove that */
-            if( i_delay != 0 )
-            {
-                p_sub->subtitle[p_sub->i_subtitle].i_start += i_delay;
-                p_sub->subtitle[p_sub->i_subtitle].i_stop += i_delay;
-            }
-
@@ -687 +674 @@
-        }
-    } while( !i_done );
-#if 0
-    /* We do not do this here anymore */
-    /* *** and at the end add delay *** */
-    var_Get( p_sub, "sub-delay", &val );
-    i_delay = (mtime_t) val.i_int * 100000;
-    if( i_delay != 0 )
-    {
-        for( i = 0; i < p_sub->i_subtitles; i++ )
-        {
-            p_sub->subtitle[i].i_start += i_delay;
-            p_sub->subtitle[i].i_stop += i_delay;
-            if( p_sub->subtitle[i].i_start < 0 )
-            {
-                p_sub->i_subtitle = i + 1;
-            }
-        }
-    }
-#endif
-}
-

modules/demux/util/sub.h

@@ -82 +82 @@
- *      - i_microsecperframe is used only for microdvd file. (overriden
- *        by --sub-fps )
- *      - it's at this point that --sub-delay is applied
- *
- *****************************************************************************/

src/input/control.c

@@ -31 +31 @@
-
-static void UpdateBookmarksOption( input_thread_t * );
+static void NotifyPlaylist( input_thread_t * );
-
-/****************************************************************************
@@ -55 +56 @@
-int input_vaControl( input_thread_t *p_input, int i_query, va_list args )
-{
-
+/* 
-    int i_bkmk = 0;
-    int *pi_bkmk;
-
-
-
+
-    int i_int, *pi_int;
-    double f, *pf;
@@ -108 +107 @@
-            return var_SetInteger( p_input, "state", i_int );
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-        case INPUT_ADD_INFO:
@@ -183 +135 @@
-            int i;
-
-
-
-
-
-
-
+
+
+
+
-                             psz_cat ) )
-break
-
-
-
+return VLC_EGENERIC
+
+
+input.
-            {
-                p_cat = malloc( sizeof( info_category_t ) );
-
+
+
-                p_cat->psz_name = strdup( psz_cat );
-                p_cat->i_infos = 0;
-                p_cat->pp_infos = NULL;
-
-
-
-
-
-
+input.
+input.
+input.
+
+
+input.
-
-            for( i = 0; i < p_cat->i_infos; i++ )
@@ -213 +164 @@
-                    if( p_cat->pp_infos[i]->psz_value )
-                        free( p_cat->pp_infos[i]->psz_value );
-break
+return VLC_EGENERIC
-                }
-            }
@@ -220 +171 @@
-            {
-                p_info = malloc( sizeof( info_t ) );
-
+
+
-                INSERT_ELEM( p_cat->pp_infos, p_cat->i_infos,
-                             p_cat->i_infos, p_info );
@@ -229 +181 @@
-            vasprintf( &p_info->psz_value, psz_format, args );
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-        }
-break
+return VLC_SUCCESS
-
-        case INPUT_GET_INFO:
@@ -256 +192 @@
-            char *psz_name = (char *)va_arg( args, char * );
-            char **ppsz_value = (char **)va_arg( args, char ** );
+            int i_ret = VLC_EGENERIC;
-            int i;
-
-            i_ret = VLC_EGENERIC;
-            *ppsz_value = NULL;
-
-
-
-
-
+input.
+input.
+
+input.
-                             psz_cat ) )
-break
-
-
-
+return VLC_EGENERIC
+
+
+input.
-            {
-                info_category_t *p_cat;
-
+input.
-
-                for( i = 0; i < p_cat->i_infos; i++ )
@@ -287 +222 @@
-                }
-            }
-
+
+
-        }
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        case INPUT_ADD_BOOKMARK:
-            p_bkmk = (seekpoint_t *)va_arg( args, seekpoint_t * );
@@ -441 +395 @@
-            break;
-
-        case INPUT_GET_SUBDELAY:
-            pi = (int*)va_arg( args, int *);
-            /* We work on the first subtitle */
-            if( p_input->p_sys != NULL )
-            {
-                if( p_input->p_sys->i_sub > 0 )
-                {
-                    i_ret = var_Get( (vlc_object_t *)p_input->p_sys->sub[0],
-                                      "sub-delay", &val );
-                    *pi = val.i_int;
-                }
-                else
-                {
-                    msg_Dbg( p_input,"no subtitle track");
-                    i_ret = VLC_EGENERIC;
-                }
-            }
-            else
-            {
-                i_ret = VLC_EGENERIC;
-            }
-            break;
-
-        case INPUT_SET_SUBDELAY:
-            i = (int)va_arg( args, int );
-            /* We work on the first subtitle */
-            if( p_input->p_sys )
-            {
-                if( p_input->p_sys->i_sub > 0 )
-                {
-                    val.i_int = i;
-                    i_ret = var_Set( (vlc_object_t *)p_input->p_sys->sub[0],
-                                      "sub-delay", val );
-                }
-                else
-                {
-                    msg_Dbg( p_input,"no subtitle track");
-                    i_ret = VLC_EGENERIC;
-                }
-            }
-            else
-            {
-                i_ret = VLC_EGENERIC;
-            }
-            break;
-#endif
-        case INPUT_GET_BOOKMARKS:
@@ -493 +402 @@
-        case INPUT_DEL_BOOKMARK:
-        case INPUT_SET_BOOKMARK:
-        case INPUT_ADD_OPTION:
-        case INPUT_ADD_INFO:
-        case INPUT_GET_INFO:
-        case INPUT_SET_NAME:
-        case INPUT_GET_SUBDELAY:
-        case INPUT_SET_SUBDELAY:
-            /* FIXME */
-            msg_Err( p_input, "unimplemented query in input_vaControl" );
@@ -507 +410 @@
-}
-
+static void NotifyPlaylist( input_thread_t *p_input )
+{
+    playlist_t *p_playlist =
+        (playlist_t *)vlc_object_find( p_input, VLC_OBJECT_PLAYLIST,
+                                       FIND_PARENT );
+    if( p_playlist )
+    {
+        var_SetInteger( p_playlist, "item-change", p_playlist->i_index );
+        vlc_object_release( p_playlist );
+    }
+}
+
-static void UpdateBookmarksOption( input_thread_t *p_input )
-{
+#if 0
-    int i, i_len = 0;
-    char *psz_value = NULL, *psz_next = NULL;
-    /* FIXME */
-#if 0
-    vlc_mutex_unlock( &p_input->stream.stream_lock );
-

src/input/es_out.c

@@ -98 +98 @@
-    es_out_id_t *p_es_video;
-    es_out_id_t *p_es_sub;
+
+    /* delay */
+    int64_t i_audio_delay;
+    int64_t i_spu_delay;
-};
-
@@ -154 +158 @@
-    p_sys->p_es_sub   = NULL;
-
+    p_sys->i_audio_delay= 0;
+    p_sys->i_spu_delay  = 0;
+
-    return out;
-}
@@ -224 +231 @@
-        }
-    }
+}
+
+void input_EsOutSetDelay( es_out_t *out, int i_cat, int64_t i_delay )
+{
+    es_out_sys_t *p_sys = out->p_sys;
+
+    if( i_cat == AUDIO_ES )
+        p_sys->i_audio_delay = i_delay;
+    else if( i_cat == SPU_ES )
+        p_sys->i_spu_delay = i_delay;
-}
-
@@ -716 +733 @@
-    input_thread_t    *p_input = p_sys->p_input;
-    es_out_pgrm_t *p_pgrm = es->p_pgrm;
+    int64_t i_delay;
+
+    if( es->fmt.i_cat == AUDIO_ES )
+        i_delay = p_sys->i_audio_delay;
+    else if( es->fmt.i_cat == SPU_ES )
+        i_delay = p_sys->i_spu_delay;
+    else
+        i_delay = 0;
-
-    /* +11 -> avoid null value with non null dts/pts */
@@ -721 +746 @@
-    {
-        p_block->i_dts =
-
+
+
-    }
-    if( p_block->i_pts > 0 )
-    {
-        p_block->i_pts =
-
+
+
-    }
-

src/input/input.c

@@ -76 +76 @@
- *  - chapter,chapter-next, chapter-prev
- *  - program, audio-es, video-es, spu-es
+ *  - audio-delay, spu-delay
- *  - bookmark
- * * Get only:
- *  - 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)
- * * For intf callback upon changes
- *  - intf-change
@@ -281 +283 @@
- *****************************************************************************
- * Thread in charge of processing the network packets and demultiplexing.
+ *
+ * TODO:
+ *  read subtitle support (XXX take care of spu-delay in the right way).
+ *  multi-input support (XXX may be done with subs)
- *****************************************************************************/
-static int Run( input_thread_t *p_input )
@@ -674 +680 @@
-        demux2_Control( p_input->input.p_demux, DEMUX_CAN_PAUSE,
-                        &p_input->input.b_can_pause );
+
+        /* FIXME todo
+        demux2_Control( p_input->input.p_demux, DEMUX_CAN_SEEK,
+                        &val.b_bool );
+        */
-    }
-    else
@@ -729 +740 @@
-        access2_Control( p_input->input.p_access, ACCESS_CAN_PAUSE,
-                         &p_input->input.b_can_pace_control );
+        access2_Control( p_input->input.p_access, ACCESS_CAN_SEEK,
+                         &val.b_bool );
+        var_Set( p_input, "seekable", val );
-
-        /* Create the stream_t */
@@ -1529 +1543 @@
-            break;
-
+        case INPUT_CONTROL_SET_AUDIO_DELAY:
+            input_EsOutSetDelay( p_input->p_es_out,
+                                 AUDIO_ES, val.i_time );
+            var_Change( p_input, "audio-delay", VLC_VAR_SETVALUE, &val, NULL );
+            break;
+
+        case INPUT_CONTROL_SET_SPU_DELAY:
+            input_EsOutSetDelay( p_input->p_es_out,
+                                 SPU_ES, val.i_time );
+            var_Change( p_input, "spu-delay", VLC_VAR_SETVALUE, &val, NULL );
+            break;
+
-        case INPUT_CONTROL_SET_TITLE:
-        case INPUT_CONTROL_SET_TITLE_NEXT:

src/input/input_internal.h

@@ -57 +57 @@
-
-    INPUT_CONTROL_SET_ES,
+
+    INPUT_CONTROL_SET_AUDIO_DELAY,
+    INPUT_CONTROL_SET_SPU_DELAY,
-};
-struct input_thread_sys_t
@@ -120 +123 @@
-es_out_id_t *input_EsOutGetFromID( es_out_t *, int i_id );
-void      input_EsOutDiscontinuity( es_out_t *, vlc_bool_t b_audio );
+void      input_EsOutSetDelay( es_out_t *, int i_cat, int64_t );
-
-/* clock.c */

src/input/var.c

@@ -63 +63 @@
-static int ESCallback      ( vlc_object_t *p_this, char const *psz_cmd,
-                             vlc_value_t oldval, vlc_value_t newval, void * );
+static int EsDelayCallback ( vlc_object_t *p_this, char const *psz_cmd,
+                             vlc_value_t oldval, vlc_value_t newval, void * );
+
-static int BookmarkCallback( vlc_object_t *p_this, char const *psz_cmd,
-                             vlc_value_t oldval, vlc_value_t newval, void * );
@@ -145 +148 @@
-    var_Change( p_input, "navigation", VLC_VAR_SETTEXT, &text, NULL );
-
+    /* Delay */
+    var_Create( p_input, "audio-delay", VLC_VAR_TIME );
+    val.i_time = 0;
+    var_Change( p_input, "audio-delay", VLC_VAR_SETVALUE, &val, NULL );
+    var_AddCallback( p_input, "audio-delay", EsDelayCallback, NULL );
+    var_Create( p_input, "spu-delay", VLC_VAR_TIME );
+    val.i_time = 0;
+    var_Change( p_input, "spu-delay", VLC_VAR_SETVALUE, &val, NULL );
+    var_AddCallback( p_input, "spu-delay", EsDelayCallback, NULL );
+
+
-    /* Video ES */
-    var_Create( p_input, "video-es", VLC_VAR_INTEGER | VLC_VAR_HASCHOICE );
@@ -193 +207 @@
-    var_Destroy( p_input, "time" );
-    var_Destroy( p_input, "time-offset" );
+
+    var_Destroy( p_input, "audio-delay" );
+    var_Destroy( p_input, "spu-delay" );
-
-    var_Destroy( p_input, "bookmark" );
@@ -385 +402 @@
-
-    var_Create( p_input, "cr-average", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
+
+    var_Create( p_input, "seekable", VLC_VAR_BOOL );
+    val.b_bool = VLC_TRUE; /* Fixed later*/
+    var_Change( p_input, "seekable", VLC_VAR_SETVALUE, &val, NULL );
+
-}
-
@@ -624 +646 @@
-}
-
+static int EsDelayCallback ( vlc_object_t *p_this, char const *psz_cmd,
+                             vlc_value_t oldval, vlc_value_t newval, void *p )
+{
+    input_thread_t *p_input = (input_thread_t*)p_this;
+
+    if( !strcmp( psz_cmd, "audio-delay" ) )
+        input_ControlPush( p_input, INPUT_CONTROL_SET_AUDIO_DELAY, &newval );
+    else if( !strcmp( psz_cmd, "spu-delay" ) )
+        input_ControlPush( p_input, INPUT_CONTROL_SET_SPU_DELAY, &newval );
+    return VLC_SUCCESS;
+}
+
-static int BookmarkCallback( vlc_object_t *p_this, char const *psz_cmd,
-                             vlc_value_t oldval, vlc_value_t newval, void *p_data )