Force a correct size of the dialog at start.

[vlc] / src / input / decoder.c

diff --git a/src/input/decoder.c b/src/input/decoder.c
index ce171b8c26e902c777803a4b309a0e069617f45d..a00b4c8944a21215e50a4657f8e075eee86d666a 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;
     }
 
@@ -627,6 +625,13 @@ static void DecoderDecodeAudio( decoder_t *p_dec, block_t *p_block )
 
     while( (p_aout_buf = p_dec->pf_decode_audio( p_dec, &p_block )) )
     {
+        if( p_dec->b_die )
+        {
+            /* It prevent freezing VLC in case of broken decoder */
+            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 );
@@ -738,6 +743,7 @@ static void optimize_video_pts( decoder_t *p_dec )
     vout_thread_t * p_vout = p_dec->p_owner->p_vout;
     input_thread_private_t * p_priv = p_input->p;
 
+    /* Enable with --auto-adjust-pts-delay */
     if( !p_priv->pts_adjust.auto_adjust ) return;
 
     for( i = 0; i < I_RENDERPICTURES; i++ )
@@ -759,7 +765,14 @@ static void optimize_video_pts( decoder_t *p_dec )
      * This first draft is way to simple, and we can't say if the
      * algo will converge. It's also full of constants.
      * But this simple algo allows to reduce the latency
-     * to the minimum. */
+     * to the minimum.
+     * The whole point of this, is to bypass the pts_delay set
+     * by the access but also the delay arbitraly set by
+     * the remote server.
+     * Actually the remote server's muxer may set up a
+     * pts<->dts delay in the muxed stream. That is
+     * why we may end up in having a negative pts_delay,
+     * to compensate that artificial delay. */
     mtime_t buffer_size = youngest_pict->date - oldest_pict->date;
     int64_t pts_slide = 0;
     if( buffer_size < 10000 )
@@ -823,6 +836,14 @@ static void DecoderDecodeVideo( decoder_t *p_dec, block_t *p_block )
 
     while( (p_pic = p_dec->pf_decode_video( p_dec, &p_block )) )
     {
+        if( p_dec->b_die )
+        {
+            /* It prevent freezing VLC in case of broken decoder */
+            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 );