Fixed input bookmark thread safety, support and event.

diff --git a/include/vlc_input.h b/include/vlc_input.h
index 94ce851f7774de8c3d4ae014bafe9cfaa5c259ef..f241d7df7ebf27d5075a286219bbf429cdcbc11b 100644 (file)
--- a/include/vlc_input.h
+++ b/include/vlc_input.h
@@ -435,7 +435,6 @@ struct input_thread_t
  * TODO complete the documentation.
  * The read only variables are:
  *  - "length"
- *  - "bookmarks"
  *  - "can-seek" (if you can seek, it doesn't say if 'bar display' has be shown
  *    or not, for that check position != 0.0)
  *  - "can-pause"
@@ -455,7 +454,7 @@ struct input_thread_t
  *  - chapter, next-chapter, next-chapter-prev
  *  - program, audio-es, video-es, spu-es
  *  - audio-delay, spu-delay
- *  - bookmark
+ *  - bookmark (bookmark list)
  *  - record
  *  - frame-next
  *  - navigation (list of "title %2i")
@@ -560,6 +559,9 @@ typedef enum input_event_type_e
     /* "spu-delay" has changed */
     INPUT_EVENT_SUBTITLE_DELAY,
 
+    /* "bookmark" has changed */
+    INPUT_EVENT_BOOKMARK,
+
 } input_event_type_e;
 
 /** @}*/

diff --git a/src/input/control.c b/src/input/control.c
index c01b6b69b1f9a98fe0c7e0151ee3e59be75767db..48f3a1dee0f1d5bd276179725faa26884abd6c1b 100644 (file)
--- a/src/input/control.c
+++ b/src/input/control.c
@@ -151,7 +151,6 @@ int input_vaControl( input_thread_t *p_input, int i_query, va_list args )
                 input_SendEventMetaInfo( p_input );
             return i_ret;
         }
-
         case INPUT_DEL_INFO:
         {
             char *psz_cat = (char *)va_arg( args, char * );
@@ -164,8 +163,6 @@ int input_vaControl( input_thread_t *p_input, int i_query, va_list args )
                 input_SendEventMetaInfo( p_input );
             return i_ret;
         }
-
-
         case INPUT_GET_INFO:
         {
             char *psz_cat = (char *)va_arg( args, char * );
@@ -205,21 +202,6 @@ int input_vaControl( input_thread_t *p_input, int i_query, va_list args )
             }
 
             TAB_APPEND( p_input->p->i_bookmark, p_input->p->pp_bookmark, p_bkmk );
-
-            /* Reflect the changes on the object var */
-            var_Change( p_input, "bookmark", VLC_VAR_CLEARCHOICES, 0, 0 );
-            {
-                vlc_value_t val, text;
-                int i;
-
-                for( i = 0; i < p_input->p->i_bookmark; i++ )
-                {
-                    val.i_int = i;
-                    text.psz_string = p_input->p->pp_bookmark[i]->psz_name;
-                    var_Change( p_input, "bookmark", VLC_VAR_ADDCHOICE,
-                                &val, &text );
-                }
-            }
             vlc_mutex_unlock( &p_input->p->p_item->lock );
 
             UpdateBookmarksOption( p_input );
@@ -233,20 +215,8 @@ int input_vaControl( input_thread_t *p_input, int i_query, va_list args )
             vlc_mutex_lock( &p_input->p->p_item->lock );
             if( i_bkmk < p_input->p->i_bookmark )
             {
-                vlc_value_t val, text;
-                int i;
-
-                p_input->p->pp_bookmark[i_bkmk] = p_bkmk;
-
-                /* Reflect the changes on the object var */
-                var_Change( p_input, "bookmark", VLC_VAR_CLEARCHOICES, 0, 0 );
-                for( i = 0; i < p_input->p->i_bookmark; i++ )
-                {
-                    val.i_int = i;
-                    text.psz_string = p_input->p->pp_bookmark[i]->psz_name;
-                    var_Change( p_input, "bookmark", VLC_VAR_ADDCHOICE,
-                                &val, &text );
-                }
+                vlc_seekpoint_Delete( p_input->p->pp_bookmark[i_bkmk] );
+                p_input->p->pp_bookmark[i_bkmk] = vlc_seekpoint_Duplicate( p_bkmk );
             }
             vlc_mutex_unlock( &p_input->p->p_item->lock );
 
@@ -260,23 +230,10 @@ int input_vaControl( input_thread_t *p_input, int i_query, va_list args )
             vlc_mutex_lock( &p_input->p->p_item->lock );
             if( i_bkmk < p_input->p->i_bookmark )
             {
-                vlc_value_t val, text;
-                int i;
-
                 p_bkmk = p_input->p->pp_bookmark[i_bkmk];
-                TAB_REMOVE( p_input->p->i_bookmark, p_input->p->pp_bookmark,
-                            p_bkmk );
+                TAB_REMOVE( p_input->p->i_bookmark, p_input->p->pp_bookmark, p_bkmk );
                 vlc_seekpoint_Delete( p_bkmk );
 
-                /* Reflect the changes on the object var */
-                var_Change( p_input, "bookmark", VLC_VAR_CLEARCHOICES, 0, 0 );
-                for( i = 0; i < p_input->p->i_bookmark; i++ )
-                {
-                    val.i_int = i;
-                    text.psz_string = p_input->p->pp_bookmark[i]->psz_name;
-                    var_Change( p_input, "bookmark", VLC_VAR_ADDCHOICE,
-                                &val, &text );
-                }
                 vlc_mutex_unlock( &p_input->p->p_item->lock );
 
                 UpdateBookmarksOption( p_input );
@@ -302,7 +259,7 @@ int input_vaControl( input_thread_t *p_input, int i_query, va_list args )
                 for( i = 0; i < p_input->p->i_bookmark; i++ )
                 {
                     (*ppp_bkmk)[i] =
-                        vlc_seekpoint_Duplicate(p_input->p->pp_bookmark[i]);
+                        vlc_seekpoint_Duplicate( p_input->p->pp_bookmark[i] );
                 }
 
                 vlc_mutex_unlock( &p_input->p->p_item->lock );
@@ -321,68 +278,26 @@ int input_vaControl( input_thread_t *p_input, int i_query, va_list args )
         case INPUT_CLEAR_BOOKMARKS:
 
             vlc_mutex_lock( &p_input->p->p_item->lock );
-            if( p_input->p->i_bookmark )
+            while( p_input->p->i_bookmark > 0 )
             {
-                int i;
+                p_bkmk = p_input->p->pp_bookmark[p_input->p->i_bookmark-1];
 
-                for( i = p_input->p->i_bookmark - 1; i >= 0; i-- )
-                {
-                    p_bkmk = p_input->p->pp_bookmark[i];
-                    TAB_REMOVE( p_input->p->i_bookmark, p_input->p->pp_bookmark,
-                                p_bkmk );
-                    vlc_seekpoint_Delete( p_bkmk );
-                }
-                var_Change( p_input, "bookmark", VLC_VAR_CLEARCHOICES, 0, 0 );
+                TAB_REMOVE( p_input->p->i_bookmark, p_input->p->pp_bookmark,
+                            p_bkmk );
+                vlc_seekpoint_Delete( p_bkmk );
             }
             vlc_mutex_unlock( &p_input->p->p_item->lock );
 
             UpdateBookmarksOption( p_input );
-
             return VLC_SUCCESS;
 
         case INPUT_SET_BOOKMARK:
             i_bkmk = (int)va_arg( args, int );
 
-            vlc_mutex_lock( &p_input->p->p_item->lock );
-            if( i_bkmk >= 0 && i_bkmk < p_input->p->i_bookmark )
-            {
-                vlc_value_t pos;
-                int i_ret;
+            val.i_int = i_bkmk;
+            input_ControlPush( p_input, INPUT_CONTROL_SET_BOOKMARK, &val );
 
-                if( p_input->p->pp_bookmark[i_bkmk]->i_time_offset != -1 )
-                {
-                    pos.i_time = p_input->p->pp_bookmark[i_bkmk]->i_time_offset;
-                    i_ret = var_Set( p_input, "time", pos );
-                }
-                else if( p_input->p->pp_bookmark[i_bkmk]->i_byte_offset != -1 )
-                {
-                    // don't crash on bookmarks in live streams
-                    if( stream_Size( p_input->p->input.p_stream ) == 0 )
-                    {
-                        vlc_mutex_unlock( &p_input->p->p_item->lock );
-                        return VLC_EGENERIC;
-                    }
-                    pos.f_float = !p_input->p->input.p_stream ? 0 :
-                        p_input->p->pp_bookmark[i_bkmk]->i_byte_offset /
-                        stream_Size( p_input->p->input.p_stream );
-                    i_ret = var_Set( p_input, "position", pos );
-                }
-                else
-                {
-                    pos.f_float = 0;
-                    i_ret = var_Set( p_input, "position", pos );
-                }
-
-                vlc_mutex_unlock( &p_input->p->p_item->lock );
-                return i_ret;
-            }
-            else
-            {
-                vlc_mutex_unlock( &p_input->p->p_item->lock );
-                return VLC_EGENERIC;
-            }
-
-            break;
+            return VLC_SUCCESS;
 
         case INPUT_GET_BOOKMARK:
             p_bkmk = (seekpoint_t *)va_arg( args, seekpoint_t * );
@@ -492,37 +407,56 @@ int input_vaControl( input_thread_t *p_input, int i_query, va_list args )
 
 static void UpdateBookmarksOption( input_thread_t *p_input )
 {
-    int i, i_len = 0;
-    char *psz_value = NULL, *psz_next = NULL;
-
     vlc_mutex_lock( &p_input->p->p_item->lock );
-    if( p_input->p->i_bookmark > 0 )
+
+    /* Update the "bookmark" list */
+    var_Change( p_input, "bookmark", VLC_VAR_CLEARCHOICES, 0, 0 );
+    for( int i = 0; i < p_input->p->i_bookmark; i++ )
     {
-        for( i = 0; i < p_input->p->i_bookmark; i++ )
-        {
-            i_len += snprintf( NULL, 0, "{name=%s,bytes=%"PRId64",time=%"PRId64"}",
-                               p_input->p->pp_bookmark[i]->psz_name,
-                               p_input->p->pp_bookmark[i]->i_byte_offset,
-                               p_input->p->pp_bookmark[i]->i_time_offset/1000000 );
-        }
-        psz_value = psz_next = malloc( i_len + p_input->p->i_bookmark );
+        vlc_value_t val, text;
 
-        for( i = 0; i < p_input->p->i_bookmark; i++ )
-        {
-            sprintf( psz_next, "{name=%s,bytes=%"PRId64",time=%"PRId64"}",
-                     p_input->p->pp_bookmark[i]->psz_name,
-                     p_input->p->pp_bookmark[i]->i_byte_offset,
-                     p_input->p->pp_bookmark[i]->i_time_offset/1000000 );
-
-            psz_next += strlen( psz_next );
-            if( i < p_input->p->i_bookmark - 1)
-                *psz_next = ','; psz_next++;
-        }
+        val.i_int = i;
+        text.psz_string = p_input->p->pp_bookmark[i]->psz_name;
+        var_Change( p_input, "bookmark", VLC_VAR_ADDCHOICE,
+                    &val, &text );
+    }
+
+    /* Create the "bookmarks" option value */
+    const char *psz_format = "{name=%s,bytes=%"PRId64",time=%"PRId64"}";
+    int i_len = strlen( "bookmarks=" );
+    for( int i = 0; i < p_input->p->i_bookmark; i++ )
+    {
+        const seekpoint_t *p_bookmark = p_input->p->pp_bookmark[i];
+
+        i_len += snprintf( NULL, 0, psz_format,
+                           p_bookmark->psz_name,
+                           p_bookmark->i_byte_offset,
+                           p_bookmark->i_time_offset/1000000 );
+    }
+
+    char *psz_value = malloc( i_len + p_input->p->i_bookmark + 1 );
+    char *psz_next = psz_value;
+
+    psz_next += sprintf( psz_next, "bookmarks=" );
+    for( int i = 0; i < p_input->p->i_bookmark && psz_value != NULL; i++ )
+    {
+        const seekpoint_t *p_bookmark = p_input->p->pp_bookmark[i];
+
+        psz_next += sprintf( psz_next, psz_format,
+                             p_bookmark->psz_name,
+                             p_bookmark->i_byte_offset,
+                             p_bookmark->i_time_offset/1000000 );
+
+        if( i < p_input->p->i_bookmark - 1)
+            *psz_next++ = ',';
     }
     vlc_mutex_unlock( &p_input->p->p_item->lock );
 
-    input_Control( p_input, INPUT_ADD_OPTION, "bookmarks",
-                   psz_value ? psz_value : "" );
+    if( psz_value )
+        input_item_AddOpt( p_input->p->p_item, psz_value, VLC_INPUT_OPTION_UNIQUE );
+
     free( psz_value );
+
+    input_SendEventBookmark( p_input );
 }
 

diff --git a/src/input/event.c b/src/input/event.c
index 47ecd2cc04a769f5ddf110654303d7a20b42fc50..4e5aeb596b160aa5ae13bf327c76c55184658fb7 100644 (file)
--- a/src/input/event.c
+++ b/src/input/event.c
@@ -304,6 +304,14 @@ void input_SendEventVout( input_thread_t *p_input )
     Trigger( p_input, INPUT_EVENT_VOUT );
 }
 
+/*****************************************************************************
+ * Event for control.c/input.c
+ *****************************************************************************/
+void input_SendEventBookmark( input_thread_t *p_input )
+{
+    Trigger( p_input, INPUT_EVENT_BOOKMARK );
+}
+
 /*****************************************************************************
  *
  *****************************************************************************/

diff --git a/src/input/event.h b/src/input/event.h
index 0262b57b9afcad60dc4a2431967e803570dabdb0..e86199acf0dcc3d26b7443fb7fee8b8ecb0905ef 100644 (file)
--- a/src/input/event.h
+++ b/src/input/event.h
@@ -68,5 +68,11 @@ void input_SendEventTeletext( input_thread_t *p_input, int i_id );
  *****************************************************************************/
 void input_SendEventVout( input_thread_t *p_input );
 
+/*****************************************************************************
+ * Event for control.c/input.c
+ *****************************************************************************/
+void input_SendEventBookmark( input_thread_t *p_input );
+
+
 #endif
 

diff --git a/src/input/input.c b/src/input/input.c
index 51bde8390bf8f5b59e7b8774dffacbae04398540..4c0b4c99b189b48b5e93098942c1f33d6629f694 100644 (file)
--- a/src/input/input.c
+++ b/src/input/input.c
@@ -2115,6 +2115,45 @@ static bool Control( input_thread_t *p_input, int i_type,
             break;
 
         case INPUT_CONTROL_SET_BOOKMARK:
+        {
+            seekpoint_t bookmark;
+
+            bookmark.i_time_offset = -1;
+            bookmark.i_byte_offset = -1;
+
+            vlc_mutex_lock( &p_input->p->p_item->lock );
+            if( val.i_int >= 0 && val.i_int < p_input->p->i_bookmark )
+            {
+                const seekpoint_t *p_bookmark = p_input->p->pp_bookmark[val.i_int];
+                bookmark.i_time_offset = p_bookmark->i_time_offset;
+                bookmark.i_byte_offset = p_bookmark->i_byte_offset;
+            }
+            vlc_mutex_unlock( &p_input->p->p_item->lock );
+
+            if( bookmark.i_time_offset < 0 && bookmark.i_byte_offset < 0 )
+            {
+                msg_Err( p_input, "invalid bookmark %d", val.i_int );
+                break;
+            }
+
+            if( bookmark.i_time_offset >= 0 )
+            {
+                val.i_time = bookmark.i_time_offset;
+                b_force_update = Control( p_input, INPUT_CONTROL_SET_TIME, val );
+            }
+            else if( bookmark.i_byte_offset >= 0 &&
+                     p_input->p->input.p_stream )
+            {
+                const int64_t i_size = stream_Size( p_input->p->input.p_stream );
+                if( i_size > 0 && bookmark.i_byte_offset <= i_size )
+                {
+                    val.f_float = (double)bookmark.i_byte_offset / i_size;
+                    b_force_update = Control( p_input, INPUT_CONTROL_SET_POSITION, val );
+                }
+            }
+            break;
+        }
+
         default:
             msg_Err( p_input, "not yet implemented" );
             break;