+ p_vout = input_resource_HoldVout( p_owner->p_resource );
+ if( p_vout && p_owner->p_spu_vout == p_vout )
+ {
+ /* Preroll does not work very well with subtitle */
+ if( p_spu->i_start > VLC_TS_INVALID &&
+ p_spu->i_start < p_owner->i_preroll_end &&
+ ( p_spu->i_stop <= VLC_TS_INVALID || p_spu->i_stop < p_owner->i_preroll_end ) )
+ {
+ subpicture_Delete( p_spu );
+ }
+ else
+ {
+ DecoderPlaySpu( p_dec, p_spu );
+ }
+ }
+ else
+ {
+ subpicture_Delete( p_spu );
+ }
+ if( p_vout )
+ vlc_object_release( p_vout );
+ }
+
+ if( b_flush && p_owner->p_spu_vout )
+ {
+ p_vout = input_resource_HoldVout( p_owner->p_resource );
+
+ if( p_vout && p_owner->p_spu_vout == p_vout )
+ vout_FlushSubpictureChannel( p_vout, p_owner->i_spu_channel );
+
+ if( p_vout )
+ vlc_object_release( p_vout );
+ }
+}
+
+/* */
+static void DecoderProcessOnFlush( decoder_t *p_dec )
+{
+ decoder_owner_sys_t *p_owner = p_dec->p_owner;
+
+ vlc_mutex_lock( &p_owner->lock );
+
+ if( p_owner->b_flushing )
+ {
+ p_owner->b_flushing = false;
+ vlc_cond_signal( &p_owner->wait_acknowledge );
+ }
+ vlc_mutex_unlock( &p_owner->lock );
+}
+
+/**
+ * Decode a block
+ *
+ * \param p_dec the decoder object
+ * \param p_block the block to decode
+ * \return VLC_SUCCESS or an error code
+ */
+static void DecoderProcess( decoder_t *p_dec, block_t *p_block )
+{
+ decoder_owner_sys_t *p_owner = (decoder_owner_sys_t *)p_dec->p_owner;
+ const bool b_flush_request = p_block && (p_block->i_flags & BLOCK_FLAG_CORE_FLUSH);
+
+ if( p_dec->b_error )
+ {
+ if( p_block )
+ block_Release( p_block );
+ goto flush;
+ }
+
+ if( p_block && p_block->i_buffer <= 0 )
+ {
+ assert( !b_flush_request );
+ block_Release( p_block );
+ return;
+ }
+
+#ifdef ENABLE_SOUT
+ if( p_owner->b_packetizer )
+ {
+ if( p_block )
+ p_block->i_flags &= ~BLOCK_FLAG_CORE_PRIVATE_MASK;
+
+ DecoderProcessSout( p_dec, p_block );
+ }
+ else
+#endif
+ {
+ bool b_flush = false;
+
+ if( p_block )
+ {
+ const bool b_flushing = p_owner->i_preroll_end == INT64_MAX;
+ DecoderUpdatePreroll( &p_owner->i_preroll_end, p_block );
+
+ b_flush = !b_flushing && b_flush_request;
+
+ p_block->i_flags &= ~BLOCK_FLAG_CORE_PRIVATE_MASK;
+ }
+
+ if( p_dec->fmt_out.i_cat == AUDIO_ES )
+ {
+ DecoderProcessAudio( p_dec, p_block, b_flush );
+ }
+ else if( p_dec->fmt_out.i_cat == VIDEO_ES )
+ {
+ DecoderProcessVideo( p_dec, p_block, b_flush );
+ }
+ else if( p_dec->fmt_out.i_cat == SPU_ES )
+ {
+ DecoderProcessSpu( p_dec, p_block, b_flush );
+ }
+ else
+ {
+ msg_Err( p_dec, "unknown ES format" );
+ p_dec->b_error = true;
+ }
+ }
+
+ /* */
+flush:
+ if( b_flush_request )
+ DecoderProcessOnFlush( p_dec );
+}
+
+
+/**
+ * The decoding main loop
+ *
+ * \param p_dec the decoder
+ */
+static void *DecoderThread( void *p_data )
+{
+ decoder_t *p_dec = (decoder_t *)p_data;
+ decoder_owner_sys_t *p_owner = p_dec->p_owner;
+
+ /* The decoder's main loop */
+ for( ;; )
+ {
+ block_t *p_block;
+
+ vlc_fifo_Lock( p_owner->p_fifo );
+ vlc_fifo_CleanupPush( p_owner->p_fifo );
+
+ vlc_cond_signal( &p_owner->wait_acknowledge );
+ vlc_cond_signal( &p_owner->wait_fifo );
+
+ while( vlc_fifo_IsEmpty( p_owner->p_fifo ) )
+ {
+ if( p_owner->b_draining )
+ { /* We have emptied the FIFO and there is a pending request to
+ * drain. Pass p_block = NULL to decoder just once. */
+ p_owner->b_draining = false;
+ break;
+ }
+
+ p_owner->b_idle = true;
+ vlc_fifo_Wait( p_owner->p_fifo );
+ /* Make sure there is no cancellation point other than this one^^.
+ * If you need one, be sure to push cleanup of p_block. */
+ p_owner->b_idle = false;
+ }
+
+ p_block = vlc_fifo_DequeueUnlocked( p_owner->p_fifo );
+ vlc_cleanup_run();
+
+ int canc = vlc_savecancel();
+ DecoderProcess( p_dec, p_block );
+ vlc_restorecancel( canc );
+ }
+ return NULL;
+}
+
+/**
+ * Create a decoder object
+ *
+ * \param p_input the input thread
+ * \param p_es the es descriptor
+ * \param b_packetizer instead of a decoder
+ * \return the decoder object
+ */
+static decoder_t * CreateDecoder( vlc_object_t *p_parent,
+ input_thread_t *p_input,
+ const es_format_t *fmt, bool b_packetizer,
+ input_resource_t *p_resource,
+ sout_instance_t *p_sout )
+{
+ decoder_t *p_dec;
+ decoder_owner_sys_t *p_owner;
+ es_format_t null_es_format;
+
+ p_dec = vlc_custom_create( p_parent, sizeof( *p_dec ), "decoder" );
+ if( p_dec == NULL )
+ return NULL;
+
+ p_dec->pf_decode_audio = NULL;
+ p_dec->pf_decode_video = NULL;
+ p_dec->pf_decode_sub = NULL;
+ p_dec->pf_get_cc = NULL;
+ p_dec->pf_packetize = NULL;
+
+ /* Initialize the decoder */
+ p_dec->p_module = NULL;
+
+ memset( &null_es_format, 0, sizeof(es_format_t) );
+ es_format_Copy( &p_dec->fmt_in, fmt );
+ es_format_Copy( &p_dec->fmt_out, &null_es_format );
+
+ p_dec->p_description = NULL;
+
+ /* Allocate our private structure for the decoder */
+ p_dec->p_owner = p_owner = malloc( sizeof( decoder_owner_sys_t ) );
+ if( unlikely(p_owner == NULL) )
+ {
+ vlc_object_release( p_dec );
+ return NULL;
+ }
+ p_owner->i_preroll_end = VLC_TS_INVALID;
+ p_owner->i_last_rate = INPUT_RATE_DEFAULT;
+ p_owner->p_input = p_input;
+ p_owner->p_resource = p_resource;
+ p_owner->p_aout = NULL;
+ p_owner->p_vout = NULL;
+ p_owner->p_spu_vout = NULL;
+ p_owner->i_spu_channel = 0;
+ p_owner->i_spu_order = 0;
+ p_owner->p_sout = p_sout;
+ p_owner->p_sout_input = NULL;
+ p_owner->p_packetizer = NULL;
+ p_owner->b_packetizer = b_packetizer;
+ es_format_Init( &p_owner->fmt, UNKNOWN_ES, 0 );
+
+ /* decoder fifo */
+ p_owner->p_fifo = block_FifoNew();
+ if( unlikely(p_owner->p_fifo == NULL) )
+ {
+ free( p_owner );
+ vlc_object_release( p_dec );
+ return NULL;
+ }
+
+ /* Set buffers allocation callbacks for the decoders */
+ p_dec->pf_aout_format_update = aout_update_format;
+ p_dec->pf_vout_format_update = vout_update_format;
+ p_dec->pf_vout_buffer_new = vout_new_buffer;
+ p_dec->pf_spu_buffer_new = spu_new_buffer;
+ /* */
+ p_dec->pf_get_attachments = DecoderGetInputAttachments;
+ p_dec->pf_get_display_date = DecoderGetDisplayDate;
+ p_dec->pf_get_display_rate = DecoderGetDisplayRate;
+
+ /* Find a suitable decoder/packetizer module */
+ if( !b_packetizer )
+ p_dec->p_module = module_need( p_dec, "decoder", "$codec", false );
+ else
+ p_dec->p_module = module_need( p_dec, "packetizer", "$packetizer", false );
+
+ /* Check if decoder requires already packetized data */
+ if( !b_packetizer &&
+ p_dec->b_need_packetized && !p_dec->fmt_in.b_packetized )
+ {
+ p_owner->p_packetizer =
+ vlc_custom_create( p_parent, sizeof( decoder_t ), "packetizer" );
+ if( p_owner->p_packetizer )
+ {
+ es_format_Copy( &p_owner->p_packetizer->fmt_in,
+ &p_dec->fmt_in );
+
+ es_format_Copy( &p_owner->p_packetizer->fmt_out,
+ &null_es_format );
+
+ p_owner->p_packetizer->p_module =
+ module_need( p_owner->p_packetizer,
+ "packetizer", "$packetizer", false );
+
+ if( !p_owner->p_packetizer->p_module )
+ {
+ es_format_Clean( &p_owner->p_packetizer->fmt_in );
+ vlc_object_release( p_owner->p_packetizer );
+ p_owner->p_packetizer = NULL;
+ }
+ }
+ }
+
+ /* Copy ourself the input replay gain */
+ if( fmt->i_cat == AUDIO_ES )
+ {
+ for( unsigned i = 0; i < AUDIO_REPLAY_GAIN_MAX; i++ )