git.sesse.net Git - vlc/blob - src/input/decoder.c

   1 /*****************************************************************************
   2  * decoder.c: Functions for the management of decoders
   3  *****************************************************************************
   4  * Copyright (C) 1999-2004 the VideoLAN team
   5  * $Id$
   6  *
   7  * Authors: Christophe Massiot <massiot@via.ecp.fr>
   8  *          Gildas Bazin <gbazin@videolan.org>
   9  *          Laurent Aimar <fenrir@via.ecp.fr>
  10  *
  11  * This program is free software; you can redistribute it and/or modify
  12  * it under the terms of the GNU General Public License as published by
  13  * the Free Software Foundation; either version 2 of the License, or
  14  * (at your option) any later version.
  15  *
  16  * This program is distributed in the hope that it will be useful,
  17  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  18  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  19  * GNU General Public License for more details.
  20  *
  21  * You should have received a copy of the GNU General Public License
  22  * along with this program; if not, write to the Free Software
  23  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  24  *****************************************************************************/
  25
  26 /*****************************************************************************
  27  * Preamble
  28  *****************************************************************************/
  29 #ifdef HAVE_CONFIG_H
  30 # include "config.h"
  31 #endif
  32 #include <assert.h>
  33
  34 #include <vlc_common.h>
  35
  36 #include <vlc_block.h>
  37 #include <vlc_vout.h>
  38 #include <vlc_aout.h>
  39 #include <vlc_sout.h>
  40 #include <vlc_codec.h>
  41 #include <vlc_osd.h>
  42
  43 #include <vlc_interface.h>
  44 #include "audio_output/aout_internal.h"
  45 #include "stream_output/stream_output.h"
  46 #include "input_internal.h"
  47
  48 static decoder_t * CreateDecoder( input_thread_t *, es_format_t *, int );
  49 static void        DeleteDecoder( decoder_t * );
  50
  51 static int         DecoderThread( decoder_t * );
  52 static int         DecoderDecode( decoder_t * p_dec, block_t *p_block );
  53
  54 /* Buffers allocation callbacks for the decoders */
  55 static aout_buffer_t *aout_new_buffer( decoder_t *, int );
  56 static void aout_del_buffer( decoder_t *, aout_buffer_t * );
  57
  58 static picture_t *vout_new_buffer( decoder_t * );
  59 static void vout_del_buffer( decoder_t *, picture_t * );
  60 static void vout_link_picture( decoder_t *, picture_t * );
  61 static void vout_unlink_picture( decoder_t *, picture_t * );
  62
  63 static subpicture_t *spu_new_buffer( decoder_t * );
  64 static void spu_del_buffer( decoder_t *, subpicture_t * );
  65
  66 static es_format_t null_es_format;
  67
  68 struct decoder_owner_sys_t
  69 {
  70     bool      b_own_thread;
  71
  72     int64_t         i_preroll_end;
  73
  74     input_thread_t  *p_input;
  75
  76     aout_instance_t *p_aout;
  77     aout_input_t    *p_aout_input;
  78
  79     vout_thread_t   *p_vout;
  80
  81     vout_thread_t   *p_spu_vout;
  82     int              i_spu_channel;
  83
  84     sout_instance_t         *p_sout;
  85     sout_packetizer_input_t *p_sout_input;
  86
  87     /* Some decoders require already packetized data (ie. not truncated) */
  88     decoder_t *p_packetizer;
  89
  90     /* Current format in use by the output */
  91     video_format_t video;
  92     audio_format_t audio;
  93     es_format_t    sout;
  94
  95     /* fifo */
  96     block_fifo_t *p_fifo;
  97
  98     /* CC */
  99     bool b_cc_supported;
 100     vlc_mutex_t lock_cc;
 101     bool pb_cc_present[4];
 102     decoder_t *pp_cc[4];
 103 };
 104
 105 /* */
 106 static void DecoderUnsupportedCodec( decoder_t *p_dec, vlc_fourcc_t codec )
 107 {
 108     msg_Err( p_dec, "no suitable decoder module for fourcc `%4.4s'.\n"
 109              "VLC probably does not support this sound or video format.",
 110              (char*)&codec );
 111     intf_UserFatal( p_dec, false, _("No suitable decoder module"),
 112                     _("VLC does not support the audio or video format \"%4.4s\". "
 113                       "Unfortunately there is no way for you to fix this."), (char*)&codec );
 114 }
 115
 116 /* decoder_GetInputAttachment:
 117  */
 118 input_attachment_t *decoder_GetInputAttachment( decoder_t *p_dec,
 119                                                 const char *psz_name )
 120 {
 121     input_attachment_t *p_attachment;
 122     if( input_Control( p_dec->p_owner->p_input, INPUT_GET_ATTACHMENT, &p_attachment, psz_name ) )
 123         return NULL;
 124     return p_attachment;
 125 }
 126 /* decoder_GetInputAttachments:
 127  */
 128 int decoder_GetInputAttachments( decoder_t *p_dec,
 129                                  input_attachment_t ***ppp_attachment,
 130                                  int *pi_attachment )
 131 {
 132     return input_Control( p_dec->p_owner->p_input, INPUT_GET_ATTACHMENTS,
 133                           ppp_attachment, pi_attachment );
 134 }
 135 /* decoder_GetDisplayDate:
 136  */
 137 mtime_t decoder_GetDisplayDate( decoder_t *p_dec, mtime_t i_ts )
 138 {
 139     VLC_UNUSED(p_dec);
 140     return i_ts;
 141 }
 142
 143 /**
 144  * Spawns a new decoder thread
 145  *
 146  * \param p_input the input thread
 147  * \param p_es the es descriptor
 148  * \return the spawned decoder object
 149  */
 150 decoder_t *input_DecoderNew( input_thread_t *p_input,
 151                              es_format_t *fmt, bool b_force_decoder )
 152 {
 153     decoder_t   *p_dec = NULL;
 154     vlc_value_t val;
 155
 156 #ifndef ENABLE_SOUT
 157     (void)b_force_decoder;
 158 #else
 159     /* If we are in sout mode, search for packetizer module */
 160     if( p_input->p->p_sout && !b_force_decoder )
 161     {
 162         /* Create the decoder configuration structure */
 163         p_dec = CreateDecoder( p_input, fmt, VLC_OBJECT_PACKETIZER );
 164         if( p_dec == NULL )
 165         {
 166             msg_Err( p_input, "could not create packetizer" );
 167             intf_UserFatal( p_input, false, _("Streaming / Transcoding failed"),
 168                             _("VLC could not open the packetizer module.") );
 169             return NULL;
 170         }
 171     }
 172     else
 173 #endif
 174     {
 175         /* Create the decoder configuration structure */
 176         p_dec = CreateDecoder( p_input, fmt, VLC_OBJECT_DECODER );
 177         if( p_dec == NULL )
 178         {
 179             msg_Err( p_input, "could not create decoder" );
 180             intf_UserFatal( p_input, false, _("Streaming / Transcoding failed"),
 181                             _("VLC could not open the decoder module.") );
 182             return NULL;
 183         }
 184     }
 185
 186     if( !p_dec->p_module )
 187     {
 188         DecoderUnsupportedCodec( p_dec, fmt->i_codec );
 189
 190         DeleteDecoder( p_dec );
 191         vlc_object_release( p_dec );
 192         return NULL;
 193     }
 194
 195     if( p_input->p->p_sout && p_input->p->input.b_can_pace_control &&
 196         !b_force_decoder )
 197     {
 198         msg_Dbg( p_input, "stream out mode -> no decoder thread" );
 199         p_dec->p_owner->b_own_thread = false;
 200     }
 201     else
 202     {
 203         var_Get( p_input, "minimize-threads", &val );
 204         p_dec->p_owner->b_own_thread = !val.b_bool;
 205     }
 206
 207     if( p_dec->p_owner->b_own_thread )
 208     {
 209         int i_priority;
 210         if( fmt->i_cat == AUDIO_ES )
 211             i_priority = VLC_THREAD_PRIORITY_AUDIO;
 212         else
 213             i_priority = VLC_THREAD_PRIORITY_VIDEO;
 214
 215         /* Spawn the decoder thread */
 216         if( vlc_thread_create( p_dec, "decoder", DecoderThread,
 217                                i_priority, false ) )
 218         {
 219             msg_Err( p_dec, "cannot spawn decoder thread" );
 220             module_Unneed( p_dec, p_dec->p_module );
 221             DeleteDecoder( p_dec );
 222             vlc_object_release( p_dec );
 223             return NULL;
 224         }
 225     }
 226
 227     return p_dec;
 228 }
 229
 230 /**
 231  * Kills a decoder thread and waits until it's finished
 232  *
 233  * \param p_input the input thread
 234  * \param p_es the es descriptor
 235  * \return nothing
 236  */
 237 void input_DecoderDelete( decoder_t *p_dec )
 238 {
 239     vlc_object_kill( p_dec );
 240
 241     if( p_dec->p_owner->b_own_thread )
 242     {
 243         /* Make sure the thread leaves the function by
 244          * sending it an empty block. */
 245         block_t *p_block = block_New( p_dec, 0 );
 246         input_DecoderDecode( p_dec, p_block );
 247
 248         vlc_thread_join( p_dec );
 249
 250         /* Don't module_Unneed() here because of the dll loader that wants
 251          * close() in the same thread than open()/decode() */
 252     }
 253     else
 254     {
 255         /* Flush */
 256         input_DecoderDecode( p_dec, NULL );
 257
 258         module_Unneed( p_dec, p_dec->p_module );
 259     }
 260
 261     /* */
 262     if( p_dec->p_owner->b_cc_supported )
 263     {
 264         int i;
 265         for( i = 0; i < 4; i++ )
 266             input_DecoderSetCcState( p_dec, false, i );
 267     }
 268
 269     /* Delete decoder configuration */
 270     DeleteDecoder( p_dec );
 271
 272     /* Delete the decoder */
 273     vlc_object_release( p_dec );
 274 }
 275
 276 /**
 277  * Put a block_t in the decoder's fifo.
 278  *
 279  * \param p_dec the decoder object
 280  * \param p_block the data block
 281  */
 282 void input_DecoderDecode( decoder_t * p_dec, block_t *p_block )
 283 {
 284     if( p_dec->p_owner->b_own_thread )
 285     {
 286         if( p_dec->p_owner->p_input->p->b_out_pace_control )
 287         {
 288             /* FIXME !!!!! */
 289             while( !p_dec->b_die && !p_dec->b_error &&
 290                    block_FifoCount( p_dec->p_owner->p_fifo ) > 10 )
 291             {
 292                 msleep( 1000 );
 293             }
 294         }
 295         else if( block_FifoSize( p_dec->p_owner->p_fifo ) > 50000000 /* 50 MB */ )
 296         {
 297             /* FIXME: ideally we would check the time amount of data
 298              * in the fifo instead of its size. */
 299             msg_Warn( p_dec, "decoder/packetizer fifo full (data not "
 300                       "consumed quickly enough), resetting fifo!" );
 301             block_FifoEmpty( p_dec->p_owner->p_fifo );
 302         }
 303
 304         block_FifoPut( p_dec->p_owner->p_fifo, p_block );
 305     }
 306     else
 307     {
 308         if( p_dec->b_error || (p_block && p_block->i_buffer <= 0) )
 309         {
 310             if( p_block ) block_Release( p_block );
 311         }
 312         else
 313         {
 314             DecoderDecode( p_dec, p_block );
 315         }
 316     }
 317 }
 318
 319 void input_DecoderDiscontinuity( decoder_t * p_dec, bool b_flush )
 320 {
 321     block_t *p_null;
 322
 323     /* Empty the fifo */
 324     if( p_dec->p_owner->b_own_thread && b_flush )
 325         block_FifoEmpty( p_dec->p_owner->p_fifo );
 326
 327     /* Send a special block */
 328     p_null = block_New( p_dec, 128 );
 329     p_null->i_flags |= BLOCK_FLAG_DISCONTINUITY;
 330     /* FIXME check for p_packetizer or b_packitized from es_format_t of input ? */
 331     if( p_dec->p_owner->p_packetizer && b_flush )
 332         p_null->i_flags |= BLOCK_FLAG_CORRUPTED;
 333     memset( p_null->p_buffer, 0, p_null->i_buffer );
 334
 335     input_DecoderDecode( p_dec, p_null );
 336 }
 337
 338 bool input_DecoderEmpty( decoder_t * p_dec )
 339 {
 340     if( p_dec->p_owner->b_own_thread
 341      && block_FifoCount( p_dec->p_owner->p_fifo ) > 0 )
 342     {
 343         return false;
 344     }
 345     return true;
 346 }
 347
 348 void input_DecoderIsCcPresent( decoder_t *p_dec, bool pb_present[4] )
 349 {
 350     int i;
 351
 352     vlc_mutex_lock( &p_dec->p_owner->lock_cc );
 353     for( i = 0; i < 4; i++ )
 354         pb_present[i] =  p_dec->p_owner->pb_cc_present[i];
 355     vlc_mutex_unlock( &p_dec->p_owner->lock_cc );
 356 }
 357 int input_DecoderSetCcState( decoder_t *p_dec, bool b_decode, int i_channel )
 358 {
 359     decoder_owner_sys_t *p_owner = p_dec->p_owner;
 360
 361     //msg_Warn( p_dec, "input_DecoderSetCcState: %d @%d", b_decode, i_channel );
 362
 363     if( i_channel < 0 || i_channel >= 4 || !p_owner->pb_cc_present[i_channel] )
 364         return VLC_EGENERIC;
 365
 366     if( b_decode )
 367     {
 368         static const vlc_fourcc_t fcc[4] = {
 369             VLC_FOURCC('c', 'c', '1', ' '),
 370             VLC_FOURCC('c', 'c', '2', ' '),
 371             VLC_FOURCC('c', 'c', '3', ' '),
 372             VLC_FOURCC('c', 'c', '4', ' '),
 373         };
 374         decoder_t *p_cc;
 375         es_format_t fmt;
 376
 377         es_format_Init( &fmt, SPU_ES, fcc[i_channel] );
 378         p_cc = CreateDecoder( p_owner->p_input, &fmt, VLC_OBJECT_DECODER );
 379         if( !p_cc )
 380         {
 381             msg_Err( p_dec, "could not create decoder" );
 382             intf_UserFatal( p_dec, false, _("Streaming / Transcoding failed"),
 383                             _("VLC could not open the decoder module.") );
 384             return VLC_EGENERIC;
 385         }
 386         else if( !p_cc->p_module )
 387         {
 388             DecoderUnsupportedCodec( p_dec, fcc[i_channel] );
 389             DeleteDecoder( p_cc );
 390             vlc_object_release( p_cc );
 391             return VLC_EGENERIC;
 392         }
 393
 394         vlc_mutex_lock( &p_owner->lock_cc );
 395         p_dec->p_owner->pp_cc[i_channel] = p_cc;
 396         vlc_mutex_unlock( &p_owner->lock_cc );
 397     }
 398     else
 399     {
 400         decoder_t *p_cc;
 401
 402         vlc_mutex_lock( &p_owner->lock_cc );
 403         p_cc = p_dec->p_owner->pp_cc[i_channel];
 404         p_dec->p_owner->pp_cc[i_channel] = NULL;
 405         vlc_mutex_unlock( &p_dec->p_owner->lock_cc );
 406
 407         if( p_cc )
 408         {
 409             vlc_object_kill( p_cc );
 410             module_Unneed( p_cc, p_cc->p_module );
 411             DeleteDecoder( p_cc );
 412             vlc_object_release( p_cc );
 413         }
 414     }
 415     return VLC_SUCCESS;
 416 }
 417 int input_DecoderGetCcState( decoder_t *p_dec, bool *pb_decode, int i_channel )
 418 {
 419     decoder_owner_sys_t *p_owner = p_dec->p_owner;
 420
 421     *pb_decode = false;
 422     if( i_channel < 0 || i_channel >= 4 || !p_owner->pb_cc_present[i_channel] )
 423         return VLC_EGENERIC;
 424
 425     vlc_mutex_lock( &p_owner->lock_cc );
 426     *pb_decode = p_dec->p_owner->pp_cc[i_channel] != NULL;
 427     vlc_mutex_unlock( &p_dec->p_owner->lock_cc );
 428     return VLC_EGENERIC;
 429 }
 430
 431 /**
 432  * Create a decoder object
 433  *
 434  * \param p_input the input thread
 435  * \param p_es the es descriptor
 436  * \param i_object_type Object type as define in include/vlc_objects.h
 437  * \return the decoder object
 438  */
 439 static decoder_t * CreateDecoder( input_thread_t *p_input,
 440                                   es_format_t *fmt, int i_object_type )
 441 {
 442     decoder_t *p_dec;
 443     decoder_owner_sys_t *p_owner;
 444     int i;
 445
 446     p_dec = vlc_object_create( p_input, i_object_type );
 447     if( p_dec == NULL )
 448     {
 449         msg_Err( p_input, "out of memory" );
 450         return NULL;
 451     }
 452
 453     p_dec->pf_decode_audio = 0;
 454     p_dec->pf_decode_video = 0;
 455     p_dec->pf_decode_sub = 0;
 456     p_dec->pf_get_cc = 0;
 457     p_dec->pf_packetize = 0;
 458
 459     /* Initialize the decoder fifo */
 460     p_dec->p_module = NULL;
 461
 462     memset( &null_es_format, 0, sizeof(es_format_t) );
 463     es_format_Copy( &p_dec->fmt_in, fmt );
 464     es_format_Copy( &p_dec->fmt_out, &null_es_format );
 465
 466     /* Allocate our private structure for the decoder */
 467     p_dec->p_owner = p_owner = malloc( sizeof( decoder_owner_sys_t ) );
 468     if( p_dec->p_owner == NULL )
 469     {
 470         msg_Err( p_dec, "out of memory" );
 471         return NULL;
 472     }
 473     p_dec->p_owner->b_own_thread = true;
 474     p_dec->p_owner->i_preroll_end = -1;
 475     p_dec->p_owner->p_input = p_input;
 476     p_dec->p_owner->p_aout = NULL;
 477     p_dec->p_owner->p_aout_input = NULL;
 478     p_dec->p_owner->p_vout = NULL;
 479     p_dec->p_owner->p_spu_vout = NULL;
 480     p_dec->p_owner->i_spu_channel = 0;
 481     p_dec->p_owner->p_sout = p_input->p->p_sout;
 482     p_dec->p_owner->p_sout_input = NULL;
 483     p_dec->p_owner->p_packetizer = NULL;
 484
 485     /* decoder fifo */
 486     if( ( p_dec->p_owner->p_fifo = block_FifoNew() ) == NULL )
 487     {
 488         msg_Err( p_dec, "out of memory" );
 489         return NULL;
 490     }
 491
 492     /* Set buffers allocation callbacks for the decoders */
 493     p_dec->pf_aout_buffer_new = aout_new_buffer;
 494     p_dec->pf_aout_buffer_del = aout_del_buffer;
 495     p_dec->pf_vout_buffer_new = vout_new_buffer;
 496     p_dec->pf_vout_buffer_del = vout_del_buffer;
 497     p_dec->pf_picture_link    = vout_link_picture;
 498     p_dec->pf_picture_unlink  = vout_unlink_picture;
 499     p_dec->pf_spu_buffer_new  = spu_new_buffer;
 500     p_dec->pf_spu_buffer_del  = spu_del_buffer;
 501
 502     vlc_object_attach( p_dec, p_input );
 503
 504     /* Find a suitable decoder/packetizer module */
 505     if( i_object_type == VLC_OBJECT_DECODER )
 506         p_dec->p_module = module_Need( p_dec, "decoder", "$codec", 0 );
 507     else
 508         p_dec->p_module = module_Need( p_dec, "packetizer", "$packetizer", 0 );
 509
 510     /* Check if decoder requires already packetized data */
 511     if( i_object_type == VLC_OBJECT_DECODER &&
 512         p_dec->b_need_packetized && !p_dec->fmt_in.b_packetized )
 513     {
 514         p_dec->p_owner->p_packetizer =
 515             vlc_object_create( p_input, VLC_OBJECT_PACKETIZER );
 516         if( p_dec->p_owner->p_packetizer )
 517         {
 518             es_format_Copy( &p_dec->p_owner->p_packetizer->fmt_in,
 519                             &p_dec->fmt_in );
 520
 521             es_format_Copy( &p_dec->p_owner->p_packetizer->fmt_out,
 522                             &null_es_format );
 523
 524             vlc_object_attach( p_dec->p_owner->p_packetizer, p_input );
 525
 526             p_dec->p_owner->p_packetizer->p_module =
 527                 module_Need( p_dec->p_owner->p_packetizer,
 528                              "packetizer", "$packetizer", 0 );
 529
 530             if( !p_dec->p_owner->p_packetizer->p_module )
 531             {
 532                 es_format_Clean( &p_dec->p_owner->p_packetizer->fmt_in );
 533                 vlc_object_detach( p_dec->p_owner->p_packetizer );
 534                 vlc_object_release( p_dec->p_owner->p_packetizer );
 535             }
 536         }
 537     }
 538
 539     /* Copy ourself the input replay gain */
 540     if( fmt->i_cat == AUDIO_ES )
 541     {
 542         for( i = 0; i < AUDIO_REPLAY_GAIN_MAX; i++ )
 543         {
 544             if( !p_dec->fmt_out.audio_replay_gain.pb_peak[i] )
 545             {
 546                 p_dec->fmt_out.audio_replay_gain.pb_peak[i] = fmt->audio_replay_gain.pb_peak[i];
 547                 p_dec->fmt_out.audio_replay_gain.pf_peak[i] = fmt->audio_replay_gain.pf_peak[i];
 548             }
 549             if( !p_dec->fmt_out.audio_replay_gain.pb_gain[i] )
 550             {
 551                 p_dec->fmt_out.audio_replay_gain.pb_gain[i] = fmt->audio_replay_gain.pb_gain[i];
 552                 p_dec->fmt_out.audio_replay_gain.pf_gain[i] = fmt->audio_replay_gain.pf_gain[i];
 553             }
 554         }
 555     }
 556     /* */
 557     p_owner->b_cc_supported = false;
 558     if( i_object_type == VLC_OBJECT_DECODER )
 559     {
 560         if( p_owner->p_packetizer && p_owner->p_packetizer->pf_get_cc )
 561             p_owner->b_cc_supported = true;
 562         if( p_dec->pf_get_cc )
 563             p_owner->b_cc_supported = true;
 564     }
 565
 566     vlc_mutex_init( &p_owner->lock_cc );
 567     for( i = 0; i < 4; i++ )
 568     {
 569         p_owner->pb_cc_present[i] = false;
 570         p_owner->pp_cc[i] = NULL;
 571     }
 572     return p_dec;
 573 }
 574
 575 /**
 576  * The decoding main loop
 577  *
 578  * \param p_dec the decoder
 579  * \return 0
 580  */
 581 static int DecoderThread( decoder_t * p_dec )
 582 {
 583     block_t *p_block;
 584
 585     /* The decoder's main loop */
 586     while( !p_dec->b_die && !p_dec->b_error )
 587     {
 588         if( ( p_block = block_FifoGet( p_dec->p_owner->p_fifo ) ) == NULL )
 589         {
 590             p_dec->b_error = 1;
 591             break;
 592         }
 593         if( DecoderDecode( p_dec, p_block ) != VLC_SUCCESS )
 594         {
 595             break;
 596         }
 597     }
 598
 599     while( !p_dec->b_die )
 600     {
 601         /* Trash all received PES packets */
 602         p_block = block_FifoGet( p_dec->p_owner->p_fifo );
 603         if( p_block ) block_Release( p_block );
 604     }
 605
 606     /* We do it here because of the dll loader that wants close() in the
 607      * same thread than open()/decode() */
 608     module_Unneed( p_dec, p_dec->p_module );
 609
 610     return 0;
 611 }
 612
 613 static inline void DecoderUpdatePreroll( int64_t *pi_preroll, const block_t *p )
 614 {
 615     if( p->i_flags & (BLOCK_FLAG_PREROLL|BLOCK_FLAG_DISCONTINUITY) )
 616         *pi_preroll = INT64_MAX;
 617     else if( p->i_pts > 0 )
 618         *pi_preroll = __MIN( *pi_preroll, p->i_pts );
 619     else if( p->i_dts > 0 )
 620         *pi_preroll = __MIN( *pi_preroll, p->i_dts );
 621 }
 622 static void DecoderDecodeAudio( decoder_t *p_dec, block_t *p_block )
 623 {
 624     input_thread_t *p_input = p_dec->p_owner->p_input;
 625     const int i_rate = p_block->i_rate;
 626     aout_buffer_t *p_aout_buf;
 627
 628     while( (p_aout_buf = p_dec->pf_decode_audio( p_dec, &p_block )) )
 629     {
 630         vlc_mutex_lock( &p_input->p->counters.counters_lock );
 631         stats_UpdateInteger( p_dec, p_input->p->counters.p_decoded_audio, 1, NULL );
 632         vlc_mutex_unlock( &p_input->p->counters.counters_lock );
 633
 634         if( p_aout_buf->start_date < p_dec->p_owner->i_preroll_end )
 635         {
 636             aout_DecDeleteBuffer( p_dec->p_owner->p_aout,
 637                                   p_dec->p_owner->p_aout_input, p_aout_buf );
 638             continue;
 639         }
 640
 641         if( p_dec->p_owner->i_preroll_end > 0 )
 642         {
 643             /* FIXME TODO flush audio output (don't know how to do that) */
 644             msg_Dbg( p_dec, "End of audio preroll" );
 645             p_dec->p_owner->i_preroll_end = -1;
 646         }
 647         aout_DecPlay( p_dec->p_owner->p_aout,
 648                       p_dec->p_owner->p_aout_input,
 649                       p_aout_buf, i_rate );
 650     }
 651 }
 652 static void DecoderGetCc( decoder_t *p_dec, decoder_t *p_dec_cc )
 653 {
 654     block_t *p_cc;
 655     bool pb_present[4];
 656     int i;
 657     int i_cc_decoder;
 658
 659     assert( p_dec_cc->pf_get_cc != NULL );
 660
 661     /* Do not try retreiving CC if not wanted (sout) or cannot be retreived */
 662     if( !p_dec->p_owner->b_cc_supported )
 663         return;
 664
 665     p_cc = p_dec_cc->pf_get_cc( p_dec_cc, pb_present );
 666     if( !p_cc )
 667         return;
 668
 669     vlc_mutex_lock( &p_dec->p_owner->lock_cc );
 670     for( i = 0, i_cc_decoder = 0; i < 4; i++ )
 671     {
 672         p_dec->p_owner->pb_cc_present[i] |= pb_present[i];
 673         if( p_dec->p_owner->pp_cc[i] )
 674             i_cc_decoder++;
 675     }
 676
 677     for( i = 0; i < 4; i++ )
 678     {
 679         if( !p_dec->p_owner->pp_cc[i] )
 680             continue;
 681
 682         if( i_cc_decoder > 1 )
 683             DecoderDecode( p_dec->p_owner->pp_cc[i], block_Duplicate( p_cc ) );
 684         else
 685             DecoderDecode( p_dec->p_owner->pp_cc[i], p_cc );
 686         i_cc_decoder--;
 687     }
 688     vlc_mutex_unlock( &p_dec->p_owner->lock_cc );
 689 }
 690 static void VoutDisplayedPicture( vout_thread_t *p_vout, picture_t *p_pic )
 691 {
 692     vlc_mutex_lock( &p_vout->picture_lock );
 693
 694     if( p_pic->i_status == READY_PICTURE )
 695     {
 696         /* Grr cannot destroy ready picture by myself so be sure vout won't like it */
 697         p_pic->date = 1;
 698     }
 699     else if( p_pic->i_refcount > 0 )
 700     {
 701         p_pic->i_status = DISPLAYED_PICTURE;
 702     }
 703     else
 704     {
 705         p_pic->i_status = DESTROYED_PICTURE;
 706         p_vout->i_heap_size--;
 707     }
 708
 709     vlc_mutex_unlock( &p_vout->picture_lock );
 710 }
 711 static void VoutFlushPicture( vout_thread_t *p_vout )
 712 {
 713     int i;
 714     vlc_mutex_lock( &p_vout->picture_lock );
 715     for( i = 0; i < p_vout->render.i_pictures; i++ )
 716     {
 717         picture_t *p_pic = p_vout->render.pp_picture[i];
 718
 719         if( p_pic->i_status == READY_PICTURE ||
 720             p_pic->i_status == DISPLAYED_PICTURE )
 721         {
 722             /* We cannot change picture status if it is in READY_PICTURE state,
 723              * Just make sure they won't be displayed */
 724             p_pic->date = 1;
 725         }
 726     }
 727     vlc_mutex_unlock( &p_vout->picture_lock );
 728 }
 729
 730
 731 static void optimize_video_pts( decoder_t *p_dec )
 732 {
 733     picture_t * oldest_pict = NULL;
 734     picture_t * youngest_pict = NULL;
 735     int i;
 736
 737     input_thread_t * p_input = p_dec->p_owner->p_input;
 738     vout_thread_t * p_vout = p_dec->p_owner->p_vout;
 739     input_thread_private_t * p_priv = p_input->p;
 740
 741     if( !p_priv->pts_adjust.auto_adjust ) return;
 742
 743     for( i = 0; i < I_RENDERPICTURES; i++ )
 744     {
 745         picture_t * pic = PP_RENDERPICTURE[i];
 746         if( pic->i_status != READY_PICTURE )
 747             continue;
 748
 749         if( !oldest_pict || pic->date < oldest_pict->date )
 750             oldest_pict = pic;
 751         if( !youngest_pict || pic->date > youngest_pict->date )
 752             youngest_pict = pic;
 753     }
 754
 755     if( !youngest_pict || !oldest_pict )
 756         return;
 757
 758     /* Try to find if we can reduce the pts
 759      * This first draft is way to simple, and we can't say if the
 760      * algo will converge. It's also full of constants.
 761      * But this simple algo allows to reduce the latency
 762      * to the minimum. */
 763     mtime_t buffer_size = youngest_pict->date - oldest_pict->date;
 764     int64_t pts_slide = 0;
 765     if( buffer_size < 10000 )
 766     {
 767         if( p_priv->pts_adjust.i_num_faulty > 10 )
 768         {
 769             pts_slide = __MAX(p_input->i_pts_delay *3 / 2, 10000);
 770             p_priv->pts_adjust.i_num_faulty = 0;
 771         }
 772         if( p_priv->pts_adjust.to_high )
 773         {
 774             p_priv->pts_adjust.to_high = !p_priv->pts_adjust.to_high;
 775             p_priv->pts_adjust.i_num_faulty = 0;
 776         }
 777         p_priv->pts_adjust.i_num_faulty++;
 778     }
 779     else if( buffer_size > 100000 )
 780     {
 781         if( p_priv->pts_adjust.i_num_faulty > 25 )
 782         {
 783             pts_slide = -buffer_size/2;
 784             p_priv->pts_adjust.i_num_faulty = 0;
 785         }
 786         if( p_priv->pts_adjust.to_high )
 787         {
 788             p_priv->pts_adjust.to_high = !p_priv->pts_adjust.to_high;
 789             p_priv->pts_adjust.i_num_faulty = 0;
 790         }
 791         p_priv->pts_adjust.i_num_faulty++;
 792     }
 793     if( pts_slide )
 794     {
 795         mtime_t origi_delay = p_input->i_pts_delay;
 796
 797         p_input->i_pts_delay += pts_slide;
 798
 799         /* Don't play with the pts delay for more than -2<->3sec */
 800         if( p_input->i_pts_delay < -2000000 )
 801             p_input->i_pts_delay = -2000000;
 802         else if( p_input->i_pts_delay > 3000000 )
 803             p_input->i_pts_delay = 3000000;
 804         pts_slide = p_input->i_pts_delay - origi_delay;
 805
 806         msg_Dbg( p_input, "Sliding the pts by %dms pts delay at %dms picture buffer was %dms",
 807             (int)pts_slide/1000, (int)p_input->i_pts_delay/1000, (int)buffer_size/1000);
 808
 809         vlc_mutex_lock( &p_vout->picture_lock );
 810         /* Slide all the picture */
 811         for( i = 0; i < I_RENDERPICTURES; i++ )
 812             PP_RENDERPICTURE[i]->date += pts_slide;
 813         /* FIXME: slide aout/spu */
 814         vlc_mutex_unlock( &p_vout->picture_lock );
 815
 816     }
 817 }
 818
 819 static void DecoderDecodeVideo( decoder_t *p_dec, block_t *p_block )
 820 {
 821     input_thread_t *p_input = p_dec->p_owner->p_input;
 822     picture_t *p_pic;
 823
 824     while( (p_pic = p_dec->pf_decode_video( p_dec, &p_block )) )
 825     {
 826         vlc_mutex_lock( &p_input->p->counters.counters_lock );
 827         stats_UpdateInteger( p_dec, p_input->p->counters.p_decoded_video, 1, NULL );
 828         vlc_mutex_unlock( &p_input->p->counters.counters_lock );
 829
 830         if( p_pic->date < p_dec->p_owner->i_preroll_end )
 831         {
 832             VoutDisplayedPicture( p_dec->p_owner->p_vout, p_pic );
 833             continue;
 834         }
 835
 836         if( p_dec->p_owner->i_preroll_end > 0 )
 837         {
 838             msg_Dbg( p_dec, "End of video preroll" );
 839             if( p_dec->p_owner->p_vout )
 840                 VoutFlushPicture( p_dec->p_owner->p_vout );
 841             /* */
 842             p_dec->p_owner->i_preroll_end = -1;
 843         }
 844
 845         if( ( !p_dec->p_owner->p_packetizer || !p_dec->p_owner->p_packetizer->pf_get_cc ) && p_dec->pf_get_cc )
 846             DecoderGetCc( p_dec, p_dec );
 847
 848         vout_DatePicture( p_dec->p_owner->p_vout, p_pic,
 849                           p_pic->date );
 850
 851         optimize_video_pts( p_dec );
 852
 853         vout_DisplayPicture( p_dec->p_owner->p_vout, p_pic );
 854     }
 855 }
 856
 857 /**
 858  * Decode a block
 859  *
 860  * \param p_dec the decoder object
 861  * \param p_block the block to decode
 862  * \return VLC_SUCCESS or an error code
 863  */
 864 static int DecoderDecode( decoder_t *p_dec, block_t *p_block )
 865 {
 866     decoder_owner_sys_t *p_sys = (decoder_owner_sys_t *)p_dec->p_owner;
 867     const int i_rate = p_block ? p_block->i_rate : INPUT_RATE_DEFAULT;
 868
 869     if( p_block && p_block->i_buffer <= 0 )
 870     {
 871         block_Release( p_block );
 872         return VLC_SUCCESS;
 873     }
 874
 875 #ifdef ENABLE_SOUT
 876     if( p_dec->i_object_type == VLC_OBJECT_PACKETIZER )
 877     {
 878         block_t *p_sout_block;
 879
 880         while( ( p_sout_block =
 881                      p_dec->pf_packetize( p_dec, p_block ? &p_block : 0 ) ) )
 882         {
 883             if( !p_dec->p_owner->p_sout_input )
 884             {
 885                 es_format_Copy( &p_dec->p_owner->sout, &p_dec->fmt_out );
 886
 887                 p_dec->p_owner->sout.i_group = p_dec->fmt_in.i_group;
 888                 p_dec->p_owner->sout.i_id = p_dec->fmt_in.i_id;
 889                 if( p_dec->fmt_in.psz_language )
 890                 {
 891                     if( p_dec->p_owner->sout.psz_language )
 892                         free( p_dec->p_owner->sout.psz_language );
 893                     p_dec->p_owner->sout.psz_language =
 894                         strdup( p_dec->fmt_in.psz_language );
 895                 }
 896
 897                 p_dec->p_owner->p_sout_input =
 898                     sout_InputNew( p_dec->p_owner->p_sout,
 899                                    &p_dec->p_owner->sout );
 900
 901                 if( p_dec->p_owner->p_sout_input == NULL )
 902                 {
 903                     msg_Err( p_dec, "cannot create packetizer output (%4.4s)",
 904                              (char *)&p_dec->p_owner->sout.i_codec );
 905                     p_dec->b_error = true;
 906
 907                     while( p_sout_block )
 908                     {
 909                         block_t *p_next = p_sout_block->p_next;
 910                         block_Release( p_sout_block );
 911                         p_sout_block = p_next;
 912                     }
 913                     break;
 914                 }
 915             }
 916
 917             while( p_sout_block )
 918             {
 919                 block_t *p_next = p_sout_block->p_next;
 920
 921                 p_sout_block->p_next = NULL;
 922                 p_sout_block->i_rate = i_rate;
 923
 924                 sout_InputSendBuffer( p_dec->p_owner->p_sout_input,
 925                                       p_sout_block );
 926
 927                 p_sout_block = p_next;
 928             }
 929
 930             /* For now it's enough, as only sout impact on this flag */
 931             if( p_dec->p_owner->p_sout->i_out_pace_nocontrol > 0 &&
 932                 p_dec->p_owner->p_input->p->b_out_pace_control )
 933             {
 934                 msg_Dbg( p_dec, "switching to sync mode" );
 935                 p_dec->p_owner->p_input->p->b_out_pace_control = false;
 936             }
 937             else if( p_dec->p_owner->p_sout->i_out_pace_nocontrol <= 0 &&
 938                      !p_dec->p_owner->p_input->p->b_out_pace_control )
 939             {
 940                 msg_Dbg( p_dec, "switching to async mode" );
 941                 p_dec->p_owner->p_input->p->b_out_pace_control = true;
 942             }
 943         }
 944     }
 945     else
 946 #endif
 947     if( p_dec->fmt_in.i_cat == AUDIO_ES )
 948     {
 949         if( p_block )
 950             DecoderUpdatePreroll( &p_dec->p_owner->i_preroll_end, p_block );
 951
 952         if( p_dec->p_owner->p_packetizer )
 953         {
 954             block_t *p_packetized_block;
 955             decoder_t *p_packetizer = p_dec->p_owner->p_packetizer;
 956
 957             while( (p_packetized_block =
 958                     p_packetizer->pf_packetize( p_packetizer, p_block ? &p_block : NULL )) )
 959             {
 960                 if( p_packetizer->fmt_out.i_extra && !p_dec->fmt_in.i_extra )
 961                 {
 962                     es_format_Clean( &p_dec->fmt_in );
 963                     es_format_Copy( &p_dec->fmt_in, &p_packetizer->fmt_out );
 964                 }
 965
 966                 while( p_packetized_block )
 967                 {
 968                     block_t *p_next = p_packetized_block->p_next;
 969                     p_packetized_block->p_next = NULL;
 970                     p_packetized_block->i_rate = i_rate;
 971
 972                     DecoderDecodeAudio( p_dec, p_packetized_block );
 973
 974                     p_packetized_block = p_next;
 975                 }
 976             }
 977         }
 978         else if( p_block )
 979         {
 980             DecoderDecodeAudio( p_dec, p_block );
 981         }
 982     }
 983     else if( p_dec->fmt_in.i_cat == VIDEO_ES )
 984     {
 985         if( p_block )
 986             DecoderUpdatePreroll( &p_dec->p_owner->i_preroll_end, p_block );
 987
 988         if( p_dec->p_owner->p_packetizer )
 989         {
 990             block_t *p_packetized_block;
 991             decoder_t *p_packetizer = p_dec->p_owner->p_packetizer;
 992
 993             while( (p_packetized_block =
 994                     p_packetizer->pf_packetize( p_packetizer, p_block ? &p_block : NULL )) )
 995             {
 996                 if( p_packetizer->fmt_out.i_extra && !p_dec->fmt_in.i_extra )
 997                 {
 998                     es_format_Clean( &p_dec->fmt_in );
 999                     es_format_Copy( &p_dec->fmt_in, &p_packetizer->fmt_out );
1000                 }
1001                 if( p_packetizer->pf_get_cc )
1002                     DecoderGetCc( p_dec, p_packetizer );
1003
1004                 while( p_packetized_block )
1005                 {
1006                     block_t *p_next = p_packetized_block->p_next;
1007                     p_packetized_block->p_next = NULL;
1008                     p_packetized_block->i_rate = i_rate;
1009
1010                     DecoderDecodeVideo( p_dec, p_packetized_block );
1011
1012                     p_packetized_block = p_next;
1013                 }
1014             }
1015         }
1016         else if( p_block )
1017         {
1018             DecoderDecodeVideo( p_dec, p_block );
1019         }
1020     }
1021     else if( p_dec->fmt_in.i_cat == SPU_ES )
1022     {
1023         input_thread_t *p_input = p_dec->p_owner->p_input;
1024         vout_thread_t *p_vout;
1025         subpicture_t *p_spu;
1026
1027         if( p_block )
1028             DecoderUpdatePreroll( &p_dec->p_owner->i_preroll_end, p_block );
1029
1030         while( (p_spu = p_dec->pf_decode_sub( p_dec, p_block ? &p_block : NULL ) ) )
1031         {
1032             vlc_mutex_lock( &p_input->p->counters.counters_lock );
1033             stats_UpdateInteger( p_dec, p_input->p->counters.p_decoded_sub, 1, NULL );
1034             vlc_mutex_unlock( &p_input->p->counters.counters_lock );
1035
1036             p_vout = vlc_object_find( p_dec, VLC_OBJECT_VOUT, FIND_ANYWHERE );
1037             if( p_vout && p_sys->p_spu_vout == p_vout )
1038             {
1039                 /* Prerool does not work very well with subtitle */
1040                 if( p_spu->i_start < p_dec->p_owner->i_preroll_end &&
1041                     ( p_spu->i_stop <= 0 || p_spu->i_stop < p_dec->p_owner->i_preroll_end ) )
1042                     spu_DestroySubpicture( p_vout->p_spu, p_spu );
1043                 else
1044                     spu_DisplaySubpicture( p_vout->p_spu, p_spu );
1045             }
1046             else
1047             {
1048                 msg_Warn( p_dec, "no vout found, leaking subpicture" );
1049             }
1050             if( p_vout )
1051                 vlc_object_release( p_vout );
1052         }
1053     }
1054     else
1055     {
1056         msg_Err( p_dec, "unknown ES format" );
1057         p_dec->b_error = 1;
1058     }
1059
1060     return p_dec->b_error ? VLC_EGENERIC : VLC_SUCCESS;
1061 }
1062
1063 /**
1064  * Destroys a decoder object
1065  *
1066  * \param p_dec the decoder object
1067  * \return nothing
1068  */
1069 static void DeleteDecoder( decoder_t * p_dec )
1070 {
1071     msg_Dbg( p_dec, "killing decoder fourcc `%4.4s', %u PES in FIFO",
1072              (char*)&p_dec->fmt_in.i_codec,
1073              (unsigned)block_FifoCount( p_dec->p_owner->p_fifo ) );
1074
1075     /* Free all packets still in the decoder fifo. */
1076     block_FifoEmpty( p_dec->p_owner->p_fifo );
1077     block_FifoRelease( p_dec->p_owner->p_fifo );
1078
1079     /* Cleanup */
1080     if( p_dec->p_owner->p_aout_input )
1081         aout_DecDelete( p_dec->p_owner->p_aout, p_dec->p_owner->p_aout_input );
1082     if( p_dec->p_owner->p_aout )
1083     {
1084         vlc_object_release( p_dec->p_owner->p_aout );
1085         p_dec->p_owner->p_aout = NULL;
1086     }
1087     if( p_dec->p_owner->p_vout )
1088     {
1089         int i_pic;
1090
1091 #define p_pic p_dec->p_owner->p_vout->render.pp_picture[i_pic]
1092         /* Hack to make sure all the the pictures are freed by the decoder */
1093         for( i_pic = 0; i_pic < p_dec->p_owner->p_vout->render.i_pictures;
1094              i_pic++ )
1095         {
1096             if( p_pic->i_status == RESERVED_PICTURE )
1097                 vout_DestroyPicture( p_dec->p_owner->p_vout, p_pic );
1098             if( p_pic->i_refcount > 0 )
1099                 vout_UnlinkPicture( p_dec->p_owner->p_vout, p_pic );
1100         }
1101 #undef p_pic
1102
1103         /* We are about to die. Reattach video output to p_vlc. */
1104         vout_Request( p_dec, p_dec->p_owner->p_vout, 0 );
1105     }
1106
1107 #ifdef ENABLE_SOUT
1108     if( p_dec->p_owner->p_sout_input )
1109     {
1110         sout_InputDelete( p_dec->p_owner->p_sout_input );
1111         es_format_Clean( &p_dec->p_owner->sout );
1112     }
1113 #endif
1114
1115     if( p_dec->fmt_in.i_cat == SPU_ES )
1116     {
1117         vout_thread_t *p_vout;
1118
1119         p_vout = vlc_object_find( p_dec, VLC_OBJECT_VOUT, FIND_ANYWHERE );
1120         if( p_vout )
1121         {
1122             spu_Control( p_vout->p_spu, SPU_CHANNEL_CLEAR,
1123                          p_dec->p_owner->i_spu_channel );
1124             vlc_object_release( p_vout );
1125         }
1126     }
1127
1128     es_format_Clean( &p_dec->fmt_in );
1129     es_format_Clean( &p_dec->fmt_out );
1130
1131     if( p_dec->p_owner->p_packetizer )
1132     {
1133         module_Unneed( p_dec->p_owner->p_packetizer,
1134                        p_dec->p_owner->p_packetizer->p_module );
1135         es_format_Clean( &p_dec->p_owner->p_packetizer->fmt_in );
1136         es_format_Clean( &p_dec->p_owner->p_packetizer->fmt_out );
1137         vlc_object_detach( p_dec->p_owner->p_packetizer );
1138         vlc_object_release( p_dec->p_owner->p_packetizer );
1139     }
1140
1141     vlc_mutex_destroy( &p_dec->p_owner->lock_cc );
1142
1143     vlc_object_detach( p_dec );
1144
1145     free( p_dec->p_owner );
1146 }
1147
1148 /*****************************************************************************
1149  * Buffers allocation callbacks for the decoders
1150  *****************************************************************************/
1151 static aout_buffer_t *aout_new_buffer( decoder_t *p_dec, int i_samples )
1152 {
1153     decoder_owner_sys_t *p_sys = (decoder_owner_sys_t *)p_dec->p_owner;
1154     aout_buffer_t *p_buffer;
1155
1156     if( p_sys->p_aout_input != NULL &&
1157         ( p_dec->fmt_out.audio.i_rate != p_sys->audio.i_rate ||
1158           p_dec->fmt_out.audio.i_original_channels !=
1159               p_sys->audio.i_original_channels ||
1160           p_dec->fmt_out.audio.i_bytes_per_frame !=
1161               p_sys->audio.i_bytes_per_frame ) )
1162     {
1163         /* Parameters changed, restart the aout */
1164         aout_DecDelete( p_sys->p_aout, p_sys->p_aout_input );
1165         p_sys->p_aout_input = NULL;
1166     }
1167
1168     if( p_sys->p_aout_input == NULL )
1169     {
1170         audio_sample_format_t format;
1171         int i_force_dolby = config_GetInt( p_dec, "force-dolby-surround" );
1172
1173         p_dec->fmt_out.audio.i_format = p_dec->fmt_out.i_codec;
1174         p_sys->audio = p_dec->fmt_out.audio;
1175
1176         memcpy( &format, &p_sys->audio, sizeof( audio_sample_format_t ) );
1177         if ( i_force_dolby && (format.i_original_channels&AOUT_CHAN_PHYSMASK)
1178                                     == (AOUT_CHAN_LEFT|AOUT_CHAN_RIGHT) )
1179         {
1180             if ( i_force_dolby == 1 )
1181             {
1182                 format.i_original_channels = format.i_original_channels |
1183                                              AOUT_CHAN_DOLBYSTEREO;
1184             }
1185             else /* i_force_dolby == 2 */
1186             {
1187                 format.i_original_channels = format.i_original_channels &
1188                                              ~AOUT_CHAN_DOLBYSTEREO;
1189             }
1190         }
1191
1192         p_sys->p_aout_input =
1193             aout_DecNew( p_dec, &p_sys->p_aout, &format, &p_dec->fmt_out.audio_replay_gain );
1194         if( p_sys->p_aout_input == NULL )
1195         {
1196             msg_Err( p_dec, "failed to create audio output" );
1197             p_dec->b_error = true;
1198             return NULL;
1199         }
1200         p_dec->fmt_out.audio.i_bytes_per_frame =
1201             p_sys->audio.i_bytes_per_frame;
1202     }
1203
1204     p_buffer = aout_DecNewBuffer( p_sys->p_aout_input, i_samples );
1205
1206     return p_buffer;
1207 }
1208
1209 static void aout_del_buffer( decoder_t *p_dec, aout_buffer_t *p_buffer )
1210 {
1211     aout_DecDeleteBuffer( p_dec->p_owner->p_aout,
1212                           p_dec->p_owner->p_aout_input, p_buffer );
1213 }
1214
1215 static picture_t *vout_new_buffer( decoder_t *p_dec )
1216 {
1217     decoder_owner_sys_t *p_sys = (decoder_owner_sys_t *)p_dec->p_owner;
1218     picture_t *p_pic;
1219
1220     if( p_sys->p_vout == NULL ||
1221         p_dec->fmt_out.video.i_width != p_sys->video.i_width ||
1222         p_dec->fmt_out.video.i_height != p_sys->video.i_height ||
1223         p_dec->fmt_out.video.i_chroma != p_sys->video.i_chroma ||
1224         p_dec->fmt_out.video.i_aspect != p_sys->video.i_aspect )
1225     {
1226         if( !p_dec->fmt_out.video.i_width ||
1227             !p_dec->fmt_out.video.i_height )
1228         {
1229             /* Can't create a new vout without display size */
1230             return NULL;
1231         }
1232
1233         if( !p_dec->fmt_out.video.i_visible_width ||
1234             !p_dec->fmt_out.video.i_visible_height )
1235         {
1236             if( p_dec->fmt_in.video.i_visible_width &&
1237                 p_dec->fmt_in.video.i_visible_height )
1238             {
1239                 p_dec->fmt_out.video.i_visible_width =
1240                     p_dec->fmt_in.video.i_visible_width;
1241                 p_dec->fmt_out.video.i_visible_height =
1242                     p_dec->fmt_in.video.i_visible_height;
1243             }
1244             else
1245             {
1246                 p_dec->fmt_out.video.i_visible_width =
1247                     p_dec->fmt_out.video.i_width;
1248                 p_dec->fmt_out.video.i_visible_height =
1249                     p_dec->fmt_out.video.i_height;
1250             }
1251         }
1252
1253         if( p_dec->fmt_out.video.i_visible_height == 1088 &&
1254             var_CreateGetBool( p_dec, "hdtv-fix" ) )
1255         {
1256             p_dec->fmt_out.video.i_visible_height = 1080;
1257             p_dec->fmt_out.video.i_sar_num *= 135;
1258             p_dec->fmt_out.video.i_sar_den *= 136;
1259             msg_Warn( p_dec, "Fixing broken HDTV stream (display_height=1088)");
1260         }
1261
1262         if( !p_dec->fmt_out.video.i_sar_num ||
1263             !p_dec->fmt_out.video.i_sar_den )
1264         {
1265             p_dec->fmt_out.video.i_sar_num = p_dec->fmt_out.video.i_aspect *
1266               p_dec->fmt_out.video.i_visible_height;
1267
1268             p_dec->fmt_out.video.i_sar_den = VOUT_ASPECT_FACTOR *
1269               p_dec->fmt_out.video.i_visible_width;
1270         }
1271
1272         vlc_ureduce( &p_dec->fmt_out.video.i_sar_num,
1273                      &p_dec->fmt_out.video.i_sar_den,
1274                      p_dec->fmt_out.video.i_sar_num,
1275                      p_dec->fmt_out.video.i_sar_den, 50000 );
1276
1277         p_dec->fmt_out.video.i_chroma = p_dec->fmt_out.i_codec;
1278         p_sys->video = p_dec->fmt_out.video;
1279
1280         p_sys->p_vout = vout_Request( p_dec, p_sys->p_vout,
1281                                       &p_dec->fmt_out.video );
1282         if( p_sys->p_vout == NULL )
1283         {
1284             msg_Err( p_dec, "failed to create video output" );
1285             p_dec->b_error = true;
1286             return NULL;
1287         }
1288
1289         if( p_sys->video.i_rmask )
1290             p_sys->p_vout->render.i_rmask = p_sys->video.i_rmask;
1291         if( p_sys->video.i_gmask )
1292             p_sys->p_vout->render.i_gmask = p_sys->video.i_gmask;
1293         if( p_sys->video.i_bmask )
1294             p_sys->p_vout->render.i_bmask = p_sys->video.i_bmask;
1295     }
1296
1297     /* Get a new picture */
1298     while( !(p_pic = vout_CreatePicture( p_sys->p_vout, 0, 0, 0 ) ) )
1299     {
1300         int i_pic, i_ready_pic = 0;
1301
1302         if( p_dec->b_die || p_dec->b_error )
1303         {
1304             return NULL;
1305         }
1306
1307 #define p_pic p_dec->p_owner->p_vout->render.pp_picture[i_pic]
1308         /* Check the decoder doesn't leak pictures */
1309         for( i_pic = 0; i_pic < p_dec->p_owner->p_vout->render.i_pictures;
1310              i_pic++ )
1311         {
1312             if( p_pic->i_status == READY_PICTURE )
1313             {
1314                 if( i_ready_pic++ > 0 ) break;
1315                 else continue;
1316             }
1317
1318             if( p_pic->i_status != DISPLAYED_PICTURE &&
1319                 p_pic->i_status != RESERVED_PICTURE &&
1320                 p_pic->i_status != READY_PICTURE ) break;
1321
1322             if( !p_pic->i_refcount && p_pic->i_status != RESERVED_PICTURE )
1323                 break;
1324         }
1325         if( i_pic == p_dec->p_owner->p_vout->render.i_pictures )
1326         {
1327             msg_Err( p_dec, "decoder is leaking pictures, resetting the heap" );
1328
1329             /* Just free all the pictures */
1330             for( i_pic = 0; i_pic < p_dec->p_owner->p_vout->render.i_pictures;
1331                  i_pic++ )
1332             {
1333                 if( p_pic->i_status == RESERVED_PICTURE )
1334                     vout_DestroyPicture( p_dec->p_owner->p_vout, p_pic );
1335                 if( p_pic->i_refcount > 0 )
1336                 vout_UnlinkPicture( p_dec->p_owner->p_vout, p_pic );
1337             }
1338         }
1339 #undef p_pic
1340
1341         msleep( VOUT_OUTMEM_SLEEP );
1342     }
1343
1344     return p_pic;
1345 }
1346
1347 static void vout_del_buffer( decoder_t *p_dec, picture_t *p_pic )
1348 {
1349     VoutDisplayedPicture( p_dec->p_owner->p_vout, p_pic );
1350 }
1351
1352 static void vout_link_picture( decoder_t *p_dec, picture_t *p_pic )
1353 {
1354     vout_LinkPicture( p_dec->p_owner->p_vout, p_pic );
1355 }
1356
1357 static void vout_unlink_picture( decoder_t *p_dec, picture_t *p_pic )
1358 {
1359     vout_UnlinkPicture( p_dec->p_owner->p_vout, p_pic );
1360 }
1361
1362 static subpicture_t *spu_new_buffer( decoder_t *p_dec )
1363 {
1364     decoder_owner_sys_t *p_sys = (decoder_owner_sys_t *)p_dec->p_owner;
1365     vout_thread_t *p_vout = NULL;
1366     subpicture_t *p_subpic;
1367     int i_attempts = 30;
1368
1369     while( i_attempts-- )
1370     {
1371         if( p_dec->b_die || p_dec->b_error ) break;
1372
1373         p_vout = vlc_object_find( p_dec, VLC_OBJECT_VOUT, FIND_ANYWHERE );
1374         if( p_vout ) break;
1375
1376         msleep( VOUT_DISPLAY_DELAY );
1377     }
1378
1379     if( !p_vout )
1380     {
1381         msg_Warn( p_dec, "no vout found, dropping subpicture" );
1382         return NULL;
1383     }
1384
1385     if( p_sys->p_spu_vout != p_vout )
1386     {
1387         spu_Control( p_vout->p_spu, SPU_CHANNEL_REGISTER,
1388                      &p_sys->i_spu_channel );
1389         p_sys->p_spu_vout = p_vout;
1390     }
1391
1392     p_subpic = spu_CreateSubpicture( p_vout->p_spu );
1393     if( p_subpic )
1394     {
1395         p_subpic->i_channel = p_sys->i_spu_channel;
1396     }
1397
1398     vlc_object_release( p_vout );
1399
1400     return p_subpic;
1401 }
1402
1403 static void spu_del_buffer( decoder_t *p_dec, subpicture_t *p_subpic )
1404 {
1405     decoder_owner_sys_t *p_sys = (decoder_owner_sys_t *)p_dec->p_owner;
1406     vout_thread_t *p_vout = NULL;
1407
1408     p_vout = vlc_object_find( p_dec, VLC_OBJECT_VOUT, FIND_ANYWHERE );
1409     if( !p_vout || p_sys->p_spu_vout != p_vout )
1410     {
1411         if( p_vout )
1412             vlc_object_release( p_vout );
1413         msg_Warn( p_dec, "no vout found, leaking subpicture" );
1414         return;
1415     }
1416
1417     spu_DestroySubpicture( p_vout->p_spu, p_subpic );
1418
1419     vlc_object_release( p_vout );
1420 }
1421