Fixed subtitle/osd memory leaks (subpicture_region_t->psz_text was not freed).

[vlc] / src / video_output / video_output.c

diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c
index fc7530bd7e0918a178abd881078fd4d2fd966b55..45b6edfde0cfa8c3d98b11c42b489259e7644107 100644 (file)
--- a/src/video_output/video_output.c
+++ b/src/video_output/video_output.c
@@ -39,18 +39,20 @@
 #   include <sys/times.h>
 #endif
 
-#include "vlc_video.h"
-#include "video_output.h"
-#include "vlc_spu.h"
-#include <vlc/input.h>                 /* for input_thread_t and i_pts_delay */
-#include "vlc_playlist.h"
+#include <vlc_vout.h>
+#include <vlc_playlist.h>
 
-#include "vlc_filter.h"
+#include <vlc_filter.h>
+#include <vlc_osd.h>
 
 #if defined( __APPLE__ )
-#include "darwin_specific.h"
+/* Include darwin_specific.h here if needed */
 #endif
 
+/** FIXME This is quite ugly but needed while we don't have counters
+ * helpers */
+#include "input/input_internal.h"
+
 /*****************************************************************************
  * Local prototypes
  *****************************************************************************/
@@ -306,6 +308,7 @@ vout_thread_t * __vout_Create( vlc_object_t *p_parent, video_format_t *p_fmt )
     /* Initialize locks */
     vlc_mutex_init( p_vout, &p_vout->picture_lock );
     vlc_mutex_init( p_vout, &p_vout->change_lock );
+    vlc_mutex_init( p_vout, &p_vout->vfilter_lock );
 
     /* Mouse coordinates */
     var_Create( p_vout, "mouse-x", VLC_VAR_INTEGER );
@@ -399,19 +402,19 @@ vout_thread_t * __vout_Create( vlc_object_t *p_parent, video_format_t *p_fmt )
     var_Create( p_vout, "deinterlace", VLC_VAR_STRING | VLC_VAR_HASCHOICE );
     text.psz_string = _("Deinterlace");
     var_Change( p_vout, "deinterlace", VLC_VAR_SETTEXT, &text, NULL );
-    val.psz_string = ""; text.psz_string = _("Disable");
+    val.psz_string = (char *)""; text.psz_string = _("Disable");
     var_Change( p_vout, "deinterlace", VLC_VAR_ADDCHOICE, &val, &text );
-    val.psz_string = "discard"; text.psz_string = _("Discard");
+    val.psz_string = (char *)"discard"; text.psz_string = _("Discard");
     var_Change( p_vout, "deinterlace", VLC_VAR_ADDCHOICE, &val, &text );
-    val.psz_string = "blend"; text.psz_string = _("Blend");
+    val.psz_string = (char *)"blend"; text.psz_string = _("Blend");
     var_Change( p_vout, "deinterlace", VLC_VAR_ADDCHOICE, &val, &text );
-    val.psz_string = "mean"; text.psz_string = _("Mean");
+    val.psz_string = (char *)"mean"; text.psz_string = _("Mean");
     var_Change( p_vout, "deinterlace", VLC_VAR_ADDCHOICE, &val, &text );
-    val.psz_string = "bob"; text.psz_string = _("Bob");
+    val.psz_string = (char *)"bob"; text.psz_string = _("Bob");
     var_Change( p_vout, "deinterlace", VLC_VAR_ADDCHOICE, &val, &text );
-    val.psz_string = "linear"; text.psz_string = _("Linear");
+    val.psz_string = (char *)"linear"; text.psz_string = _("Linear");
     var_Change( p_vout, "deinterlace", VLC_VAR_ADDCHOICE, &val, &text );
-    val.psz_string = "x"; text.psz_string = "X";
+    val.psz_string = (char *)"x"; text.psz_string = (char *)"X";
     var_Change( p_vout, "deinterlace", VLC_VAR_ADDCHOICE, &val, &text );
 
     if( var_Get( p_vout, "deinterlace-mode", &val ) == VLC_SUCCESS )
@@ -490,7 +493,11 @@ void vout_Destroy( vout_thread_t *p_vout )
 
     /* Free structure */
     vlc_object_destroy( p_vout );
-
+#ifndef __APPLE__
+    /* This is a dirty hack for mostly Linux, where there is no way to get the GUI
+       back if you closed it while playing video. This is solved in Mac OS X,
+       where we have this novelty called menubar, that will always allow you access
+       to the applications main functionality. They should try that on linux sometime */
     p_another_vout = vlc_object_find( p_playlist,
                                       VLC_OBJECT_VOUT, FIND_ANYWHERE );
     if( p_another_vout == NULL )
@@ -503,6 +510,7 @@ void vout_Destroy( vout_thread_t *p_vout )
     {
         vlc_object_release( p_another_vout );
     }
+#endif
     vlc_object_release( p_playlist );
 }
 
@@ -771,14 +779,14 @@ static void RunThread( vout_thread_t *p_vout)
             }
             if( p_input )
             {
-                vlc_mutex_lock( &p_input->counters.counters_lock );
-                stats_UpdateInteger( p_vout, p_input->counters.p_lost_pictures,
+                vlc_mutex_lock( &p_input->p->counters.counters_lock );
+                stats_UpdateInteger( p_vout, p_input->p->counters.p_lost_pictures,
                                      i_lost , NULL);
                 stats_UpdateInteger( p_vout,
-                                     p_input->counters.p_displayed_pictures,
+                                     p_input->p->counters.p_displayed_pictures,
                                      i_displayed , NULL);
                 i_displayed = i_lost = 0;
-                vlc_mutex_unlock( &p_input->counters.counters_lock );
+                vlc_mutex_unlock( &p_input->p->counters.counters_lock );
             }
         }
 #if 0
@@ -935,6 +943,7 @@ static void RunThread( vout_thread_t *p_vout)
         if( p_vout->b_vfilter_change == VLC_TRUE )
         {
             int i;
+            vlc_mutex_lock( &p_vout->vfilter_lock );
             RemoveVideoFilters2( p_vout );
             for( i = 0; i < p_vout->i_vfilters_cfg; i++ )
             {
@@ -981,6 +990,7 @@ static void RunThread( vout_thread_t *p_vout)
                 }
             }
             p_vout->b_vfilter_change = VLC_FALSE;
+            vlc_mutex_unlock( &p_vout->vfilter_lock );
         }
 
         if( p_picture )
@@ -1277,6 +1287,7 @@ static void DestroyThread( vout_thread_t *p_vout )
     /* Destroy the locks */
     vlc_mutex_destroy( &p_vout->picture_lock );
     vlc_mutex_destroy( &p_vout->change_lock );
+    vlc_mutex_destroy( &p_vout->vfilter_lock );
 
     /* Release the module */
     if( p_vout && p_vout->p_module )
@@ -1542,7 +1553,11 @@ static int ParseVideoFilter2Chain( vout_thread_t *p_vout, char *psz_vfilters )
         struct config_chain_t *p_cfg =
             p_vout->p_vfilters_cfg[p_vout->i_vfilters_cfg];
         config_ChainDestroy( p_cfg );
-        free( p_vout->psz_vfilters[p_vout->i_vfilters_cfg] );
+        if( p_vout->psz_vfilters[p_vout->i_vfilters_cfg] )
+        {
+            free( p_vout->psz_vfilters[p_vout->i_vfilters_cfg] );
+            p_vout->psz_vfilters[p_vout->i_vfilters_cfg] = NULL;
+        }
     }
     p_vout->i_vfilters_cfg = 0;
     if( psz_vfilters && *psz_vfilters )
@@ -1558,7 +1573,7 @@ static int ParseVideoFilter2Chain( vout_thread_t *p_vout, char *psz_vfilters )
             msg_Dbg( p_vout, "adding vfilter: %s",
                      p_vout->psz_vfilters[p_vout->i_vfilters_cfg] );
             p_vout->i_vfilters_cfg++;
-            if( psz_parser && psz_parser )
+            if( psz_parser && *psz_parser )
             {
                 if( p_vout->i_vfilters_cfg == MAX_VFILTERS )
                 {
@@ -1578,8 +1593,10 @@ static int VideoFilter2Callback( vlc_object_t *p_this, char const *psz_cmd,
 {
     vout_thread_t *p_vout = (vout_thread_t *)p_this;
 
+    vlc_mutex_lock( &p_vout->vfilter_lock );
     ParseVideoFilter2Chain( p_vout, newval.psz_string );
     p_vout->b_vfilter_change = VLC_TRUE;
+    vlc_mutex_unlock( &p_vout->vfilter_lock );
 
     return VLC_SUCCESS;
 }