Leverage libgcrypt CounTeR mode implementation to simplify our code

[vlc] / include / vlc_input.h

diff --git a/include/vlc_input.h b/include/vlc_input.h
index f366b18774cf5afdfba995df5849ecacaf576ddd..8088a3ecef9b0a606eaf9830850cf13c95aac455 100644 (file)
--- a/include/vlc_input.h
+++ b/include/vlc_input.h
@@ -22,6 +22,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
+#if !defined( __LIBVLC__ )
+  #error You are not libvlc or one of its plugins. You cannot include this file
+#endif
+
 /* __ is need because conflict with <vlc/input.h> */
 #ifndef _VLC__INPUT_H
 #define _VLC__INPUT_H 1
@@ -93,14 +97,12 @@ struct input_item_t
 static inline void input_ItemInit( vlc_object_t *p_o, input_item_t *p_i )
 {
     memset( p_i, 0, sizeof(input_item_t) );
-    p_i->psz_name = 0;
-    p_i->psz_uri = 0;
-    p_i->i_es = 0;
-    p_i->es = 0;
-    p_i->i_options  = 0;
-    p_i->ppsz_options = 0;
-    p_i->i_categories = 0 ;
-    p_i->pp_categories = 0;
+    p_i->psz_name = NULL;
+    p_i->psz_uri = NULL;
+    TAB_INIT( p_i->i_es, p_i->es );
+    TAB_INIT( p_i->i_options, p_i->ppsz_options );
+    TAB_INIT( p_i->i_categories, p_i->pp_categories );
+
     p_i->i_type = ITEM_TYPE_UNKNOWN;
     p_i->b_fixed_name = VLC_TRUE;
 
@@ -130,6 +132,8 @@ VLC_EXPORT( void, input_ItemAddOptionNoDup,( input_item_t *, const char * ) );
 
 static inline void input_ItemClean( input_item_t *p_i )
 {
+    int i;
+
     free( p_i->psz_name );
     free( p_i->psz_uri );
     if( p_i->p_stats )
@@ -138,46 +142,44 @@ static inline void input_ItemClean( input_item_t *p_i )
         free( p_i->p_stats );
     }
 
-    if( p_i->p_meta ) vlc_meta_Delete( p_i->p_meta );
+    if( p_i->p_meta )
+        vlc_meta_Delete( p_i->p_meta );
 
-    while( p_i->i_options )
+    for( i = 0; i < p_i->i_options; i++ )
     {
-        p_i->i_options--;
-        if( p_i->ppsz_options[p_i->i_options] )
-            free( p_i->ppsz_options[p_i->i_options] );
-        if( !p_i->i_options ) free( p_i->ppsz_options );
+        if( p_i->ppsz_options[i] )
+            free( p_i->ppsz_options[i] );
     }
+    TAB_CLEAN( p_i->i_options, p_i->ppsz_options );
 
-    while( p_i->i_es )
+    for( i = 0; i < p_i->i_es; i++ )
     {
-        p_i->i_es--;
-        es_format_Clean( p_i->es[p_i->i_es] );
-        if( !p_i->i_es ) free( p_i->es );
+        es_format_Clean( p_i->es[i] );
+        free( p_i->es[i] );
     }
+    TAB_CLEAN( p_i->i_es, p_i->es );
 
-    while( p_i->i_categories )
+    for( i = 0; i < p_i->i_categories; i++ )
     {
-        info_category_t *p_category =
-            p_i->pp_categories[--(p_i->i_categories)];
+        info_category_t *p_category = p_i->pp_categories[i];
+        int j;
 
-        while( p_category->i_infos )
+        for( j = 0; j < p_category->i_infos; j++ )
         {
-            p_category->i_infos--;
+            struct info_t *p_info = p_category->pp_infos[j];
 
-            if( p_category->pp_infos[p_category->i_infos]->psz_name )
-                free( p_category->pp_infos[p_category->i_infos]->psz_name);
-            if( p_category->pp_infos[p_category->i_infos]->psz_value )
-                free( p_category->pp_infos[p_category->i_infos]->psz_value );
-            free( p_category->pp_infos[p_category->i_infos] );
-
-            if( !p_category->i_infos ) free( p_category->pp_infos );
+            if( p_info->psz_name )
+                free( p_info->psz_name);
+            if( p_info->psz_value )
+                free( p_info->psz_value );
+            free( p_info );
         }
+        TAB_CLEAN( p_category->i_infos, p_category->pp_infos );
 
         if( p_category->psz_name ) free( p_category->psz_name );
         free( p_category );
-
-        if( !p_i->i_categories ) free( p_i->pp_categories );
     }
+    TAB_CLEAN( p_i->i_categories, p_i->pp_categories );
 
     vlc_mutex_destroy( &p_i->lock );
 }
@@ -323,7 +325,7 @@ enum input_state_e
  */
 #define INPUT_RATE_DEFAULT  1000
 #define INPUT_RATE_MIN       125            /* Up to 8/1 */
-#define INPUT_RATE_MAX      8000            /* Up to 1/8 */
+#define INPUT_RATE_MAX     32000            /* Up to 1/32 */
 
 /* i_update field of access_t/demux_t */
 #define INPUT_UPDATE_NONE       0x0000
@@ -351,8 +353,11 @@ struct input_thread_t
 
     vlc_bool_t  b_eof;
     vlc_bool_t b_preparsing;
+
     int i_state;
+    vlc_bool_t b_can_pace_control;
     int64_t     i_time;     /* Current time */
+
     /* Internal caching common to all inputs */
     int i_pts_delay;
 
@@ -366,8 +371,6 @@ struct input_thread_t
  *****************************************************************************/
 #define input_CreateThread(a,b) __input_CreateThread(VLC_OBJECT(a),b)
 VLC_EXPORT( input_thread_t *, __input_CreateThread, ( vlc_object_t *, input_item_t * ) );
-#define input_CreateThread2(a,b,c) __input_CreateThread2(VLC_OBJECT(a),b,c)
-VLC_EXPORT( input_thread_t *, __input_CreateThread2, ( vlc_object_t *, input_item_t *, char * ) );
 #define input_Preparse(a,b) __input_Preparse(VLC_OBJECT(a),b)
 VLC_EXPORT( int, __input_Preparse, ( vlc_object_t *, input_item_t * ) );