Fixed memory leak of 1 audio(video?) buffer when quitting.

[vlc] / src / input / decoder.c

diff --git a/src/input/decoder.c b/src/input/decoder.c
index aa715e96e2177c947b42d0a2711a121f33246731..b4beeddf7ea3ce6632c8ed263373eefdb05cacb9 100644 (file)
--- a/src/input/decoder.c
+++ b/src/input/decoder.c
@@ -445,10 +445,7 @@ static decoder_t * CreateDecoder( input_thread_t *p_input,
 
     p_dec = vlc_object_create( p_input, i_object_type );
     if( p_dec == NULL )
-    {
-        msg_Err( p_input, "out of memory" );
         return NULL;
-    }
 
     p_dec->pf_decode_audio = 0;
     p_dec->pf_decode_video = 0;
@@ -467,7 +464,7 @@ static decoder_t * CreateDecoder( input_thread_t *p_input,
     p_dec->p_owner = p_owner = malloc( sizeof( decoder_owner_sys_t ) );
     if( p_dec->p_owner == NULL )
     {
-        msg_Err( p_dec, "out of memory" );
+        vlc_object_release( p_dec );
         return NULL;
     }
     p_dec->p_owner->b_own_thread = true;
@@ -485,7 +482,8 @@ static decoder_t * CreateDecoder( input_thread_t *p_input,
     /* decoder fifo */
     if( ( p_dec->p_owner->p_fifo = block_FifoNew() ) == NULL )
     {
-        msg_Err( p_dec, "out of memory" );
+        free( p_dec->p_owner );
+        vlc_object_release( p_dec );
         return NULL;
     }
 
@@ -621,20 +619,30 @@ static inline void DecoderUpdatePreroll( int64_t *pi_preroll, const block_t *p )
 }
 static void DecoderDecodeAudio( decoder_t *p_dec, block_t *p_block )
 {
-    input_thread_t *p_input = p_dec->p_owner->p_input;
-    const int i_rate = p_block->i_rate;
-    aout_buffer_t *p_aout_buf;
+    input_thread_t  *p_input = p_dec->p_owner->p_input;
+    const int       i_rate = p_block->i_rate;
+    aout_buffer_t   *p_aout_buf;
 
     while( (p_aout_buf = p_dec->pf_decode_audio( p_dec, &p_block )) )
     {
+        aout_instance_t *p_aout = p_dec->p_owner->p_aout;
+        aout_input_t    *p_aout_input = p_dec->p_owner->p_aout_input;
+
+        if( p_dec->b_die )
+        {
+            /* It prevent freezing VLC in case of broken decoder */
+            aout_DecDeleteBuffer( p_aout, p_aout_input, p_aout_buf );
+            if( p_block )
+                block_Release( p_block );
+            break;
+        }
         vlc_mutex_lock( &p_input->p->counters.counters_lock );
         stats_UpdateInteger( p_dec, p_input->p->counters.p_decoded_audio, 1, NULL );
         vlc_mutex_unlock( &p_input->p->counters.counters_lock );
 
         if( p_aout_buf->start_date < p_dec->p_owner->i_preroll_end )
         {
-            aout_DecDeleteBuffer( p_dec->p_owner->p_aout,
-                                  p_dec->p_owner->p_aout_input, p_aout_buf );
+            aout_DecDeleteBuffer( p_aout, p_aout_input, p_aout_buf );
             continue;
         }
 
@@ -644,9 +652,7 @@ static void DecoderDecodeAudio( decoder_t *p_dec, block_t *p_block )
             msg_Dbg( p_dec, "End of audio preroll" );
             p_dec->p_owner->i_preroll_end = -1;
         }
-        aout_DecPlay( p_dec->p_owner->p_aout,
-                      p_dec->p_owner->p_aout_input,
-                      p_aout_buf, i_rate );
+        aout_DecPlay( p_aout, p_aout_input, p_aout_buf, i_rate );
     }
 }
 static void DecoderGetCc( decoder_t *p_dec, decoder_t *p_dec_cc )
@@ -827,25 +833,35 @@ static void optimize_video_pts( decoder_t *p_dec )
 static void DecoderDecodeVideo( decoder_t *p_dec, block_t *p_block )
 {
     input_thread_t *p_input = p_dec->p_owner->p_input;
-    picture_t *p_pic;
+    picture_t      *p_pic;
 
     while( (p_pic = p_dec->pf_decode_video( p_dec, &p_block )) )
     {
+        vout_thread_t  *p_vout = p_dec->p_owner->p_vout;
+        if( p_dec->b_die )
+        {
+            /* It prevent freezing VLC in case of broken decoder */
+            VoutDisplayedPicture( p_vout, p_pic );
+            if( p_block )
+                block_Release( p_block );
+            break;
+        }
+
         vlc_mutex_lock( &p_input->p->counters.counters_lock );
         stats_UpdateInteger( p_dec, p_input->p->counters.p_decoded_video, 1, NULL );
         vlc_mutex_unlock( &p_input->p->counters.counters_lock );
 
         if( p_pic->date < p_dec->p_owner->i_preroll_end )
         {
-            VoutDisplayedPicture( p_dec->p_owner->p_vout, p_pic );
+            VoutDisplayedPicture( p_vout, p_pic );
             continue;
         }
 
         if( p_dec->p_owner->i_preroll_end > 0 )
         {
             msg_Dbg( p_dec, "End of video preroll" );
-            if( p_dec->p_owner->p_vout )
-                VoutFlushPicture( p_dec->p_owner->p_vout );
+            if( p_vout )
+                VoutFlushPicture( p_vout );
             /* */
             p_dec->p_owner->i_preroll_end = -1;
         }
@@ -853,12 +869,11 @@ static void DecoderDecodeVideo( decoder_t *p_dec, block_t *p_block )
         if( ( !p_dec->p_owner->p_packetizer || !p_dec->p_owner->p_packetizer->pf_get_cc ) && p_dec->pf_get_cc )
             DecoderGetCc( p_dec, p_dec );
 
-        vout_DatePicture( p_dec->p_owner->p_vout, p_pic,
-                          p_pic->date );
+        vout_DatePicture( p_vout, p_pic, p_pic->date );
 
         optimize_video_pts( p_dec );
 
-        vout_DisplayPicture( p_dec->p_owner->p_vout, p_pic );
+        vout_DisplayPicture( p_vout, p_pic );
     }
 }