Don't call vlc_current_charset and vlc_iconv_open at every conversion

diff --git a/include/main.h b/include/main.h
index 401d0e937a155fb09abf42548b66dea00ea44b45..43d9b0d44f359d724cbaafcb8736c67dc1f8675a 100644 (file)
--- a/include/main.h
+++ b/include/main.h
@@ -51,6 +51,12 @@ struct libvlc_t
     /* The message bank */
     msg_bank_t             msg_bank;
 
+    /* UTF-8 conversion */
+    vlc_mutex_t            from_locale_lock;
+    vlc_mutex_t            to_locale_lock;
+    vlc_iconv_t            from_locale;
+    vlc_iconv_t            to_locale;
+
     /* The module bank */
     module_bank_t *        p_module_bank;
 

diff --git a/src/libvlc.c b/src/libvlc.c
index 79bab43ccbf06443a605cee6914b2fe55695061b..ab1d4b98de4e7af182243919176d08b9f9a2404e 100644 (file)
--- a/src/libvlc.c
+++ b/src/libvlc.c
@@ -191,6 +191,18 @@ int VLC_Create( void )
         libvlc.b_color = VLC_FALSE;
 #endif
 
+        /*
+         * Global iconv
+         */
+        if( !vlc_current_charset( &psz_env ) )
+        {
+            vlc_mutex_init( p_libvlc, &libvlc.from_locale_lock );
+            vlc_mutex_init( p_libvlc, &libvlc.to_locale_lock );
+            libvlc.from_locale = vlc_iconv_open( "UTF-8", psz_env );
+            libvlc.to_locale = vlc_iconv_open( psz_env, "UTF-8" );
+        }
+        free( psz_env );
+
         /* Initialize message queue */
         msg_Create( p_libvlc );
 
@@ -965,6 +977,15 @@ int VLC_Destroy( int i_object )
     msg_Flush( p_vlc );
     msg_Destroy( p_libvlc );
 
+    /* Destroy global iconv */
+    if( libvlc.to_locale != (vlc_iconv_t)(-1) )
+    {
+        vlc_mutex_destroy( &libvlc.from_locale_lock );
+        vlc_mutex_destroy( &libvlc.to_locale_lock );
+        vlc_iconv_close( libvlc.from_locale );
+        vlc_iconv_close( libvlc.to_locale );
+    }
+
     /* Destroy mutexes */
     vlc_mutex_destroy( &p_vlc->config_lock );
 
@@ -2446,3 +2467,79 @@ static void InitDeviceValues( vlc_t *p_vlc )
     }
 #endif
 }
+
+/*****************************************************************************
+ * FromLocale: converts a locale string to UTF-8
+ *****************************************************************************/
+char *FromLocale( const char *locale )
+{
+    if( locale == NULL )
+        return NULL;
+
+    if( libvlc.from_locale != (vlc_iconv_t)(-1) )
+    {
+        char *iptr = (char *)locale, *output, *optr;
+        size_t inb, outb;
+
+        /*
+         * We are not allowed to modify the locale pointer, even if we cast it
+         * to non-const.
+         */
+        inb = strlen( locale );
+        outb = inb * 6 + 1;
+
+        /* FIXME: I'm not sure about the value for the multiplication
+         * (for western people, multiplication by 3 (Latin9) is sufficient) */
+        optr = output = calloc( outb , 1);
+
+        vlc_mutex_lock( &libvlc.from_locale_lock );
+        while( vlc_iconv( libvlc.from_locale, &iptr, &inb, &optr, &outb )
+                                                               == (size_t)-1 )
+            *iptr = '?'; /* should not happen, and yes, it sucks */
+        vlc_mutex_unlock( &libvlc.from_locale_lock );
+
+        return realloc( output, strlen( output ) + 1 );
+    }
+    return (char *)locale;
+}
+
+/*****************************************************************************
+ * ToLocale: converts an UTF-8 string to locale
+ *****************************************************************************/
+char *ToLocale( const char *utf8 )
+{
+    if( utf8 == NULL )
+        return NULL;
+
+    if( libvlc.to_locale != (vlc_iconv_t)(-1) )
+    {
+        char *iptr = (char *)utf8, *output, *optr;
+        size_t inb, outb;
+
+        /*
+         * We are not allowed to modify the locale pointer, even if we cast it
+         * to non-const.
+         */
+        inb = strlen( utf8 );
+        /* FIXME: I'm not sure about the value for the multiplication
+         * (for western people, multiplication is not needed) */
+        outb = inb * 2 + 1;
+
+        optr = output = calloc( outb, 1 );
+        vlc_mutex_lock( &libvlc.to_locale_lock );
+        while( vlc_iconv( libvlc.to_locale, &iptr, &inb, &optr, &outb )
+                                                               == (size_t)-1 )
+            *iptr = '?'; /* should not happen, and yes, it sucks */
+        vlc_mutex_unlock( &libvlc.to_locale_lock );
+
+        return realloc( output, strlen( output ) + 1 );
+    }
+
+    return (char *)utf8;
+}
+
+void LocaleFree( const char *str )
+{
+    if( ( str != NULL ) && ( libvlc.to_locale != (vlc_iconv_t)(-1) ) )
+        free( (char *)str );
+}

diff --git a/src/misc/unicode.c b/src/misc/unicode.c
index d7dae82cab2bf5e47c7617460ecbfea28bb1ac44..ec3bd1433024b298af58c10ec88cd8a9984046c0 100644 (file)
--- a/src/misc/unicode.c
+++ b/src/misc/unicode.c
@@ -27,98 +27,6 @@
 #include <vlc/vlc.h>
 #include "charset.h"
 
-/* Evil global variable */
-static vlc_bool_t native_utf8;
-
-
-/*****************************************************************************
- * FromLocale: converts a locale string to UTF-8
- *****************************************************************************/
-/* FIXME FIXME: it really has to be made quicker */
-char *FromLocale( const char *locale )
-{
-    char *psz_charset;
-
-    if( locale == NULL )
-        return NULL;
-
-    native_utf8 = vlc_current_charset( &psz_charset );
-    if( !native_utf8 )
-    {
-        char *iptr = (char *)locale, *output, *optr;
-        size_t inb, outb;
-
-        /* cannot fail (unless vlc_current_charset sucks) */
-        vlc_iconv_t hd = vlc_iconv_open( "UTF-8", psz_charset );
-        free( psz_charset );
-
-        /*
-         * We are not allowed to modify the locale pointer, even if we cast it to
-         * non-const.
-         */
-        inb = strlen( locale );
-        outb = inb * 6 + 1;
-
-        /* FIXME: I'm not sure about the value for the multiplication
-         * (for western people, multiplication by 3 (Latin9) is sufficient) */
-        optr = output = calloc( outb , 1);
-        while( vlc_iconv( hd, &iptr, &inb, &optr, &outb ) == (size_t)-1 )
-            *iptr = '?'; /* should not happen, and yes, it sucks */
-
-        vlc_iconv_close( hd );
-        return realloc( output, strlen( output ) + 1 );
-    }
-    free( psz_charset );
-    return (char *)locale;
-}
-
-/*****************************************************************************
- * ToLocale: converts an UTF-8 string to locale
- *****************************************************************************/
-/* FIXME FIXME: it really has to be made quicker */
-char *ToLocale( const char *utf8 )
-{
-    char *psz_charset;
-
-    if( utf8 == NULL )
-        return NULL;
-
-    native_utf8 = vlc_current_charset( &psz_charset );
-    if( !native_utf8 )
-    {
-        char *iptr = (char *)utf8, *output, *optr;
-        size_t inb, outb;
-
-        /* cannot fail (unless vlc_current_charset sucks) */
-        vlc_iconv_t hd = vlc_iconv_open( psz_charset, "UTF-8" );
-        free( psz_charset );
-
-        /*
-         * We are not allowed to modify the locale pointer, even if we cast it to
-         * non-const.
-         */
-        inb = strlen( utf8 );
-        /* FIXME: I'm not sure about the value for the multiplication
-         * (for western people, multiplication is not needed) */
-        outb = inb * 2 + 1;
-
-        optr = output = calloc( outb, 1 );
-        while( vlc_iconv( hd, &iptr, &inb, &optr, &outb ) == (size_t)-1 )
-            *iptr = '?'; /* should not happen, and yes, it sucks */
-
-        vlc_iconv_close( hd );
-        return realloc( output, strlen( output ) + 1 );
-    }
-    free( psz_charset );
-    return (char *)utf8;
-}
-
-void LocaleFree( const char *str )
-{
-    if( ( str != NULL ) && ( !native_utf8 ) )
-        free( (char *)str );
-}
-
 /*****************************************************************************
  * EnsureUTF8: replaces invalid/overlong UTF-8 sequences with question marks
  *****************************************************************************