+ p_dec->fmt_in.subs.dvb.i_id = p_dvbs->i_id;
+ }
+ }
+
+ p_dec->fmt_in.i_cat = p_es->i_cat;
+ p_dec->fmt_in.i_codec = p_es->i_fourcc;
+
+ p_dec->fmt_out = null_es_format;
+
+ /* Allocate our private structure for the decoder */
+ p_dec->p_owner = (decoder_owner_sys_t*)malloc(sizeof(decoder_owner_sys_t));
+ if( p_dec->p_owner == NULL )
+ {
+ msg_Err( p_dec, "out of memory" );
+ return NULL;
+ }
+ p_dec->p_owner->b_own_thread = VLC_TRUE;
+ p_dec->p_owner->p_aout = NULL;
+ p_dec->p_owner->p_aout_input = NULL;
+ p_dec->p_owner->p_vout = NULL;
+ p_dec->p_owner->p_sout = p_input->stream.p_sout;
+ p_dec->p_owner->p_sout_input = NULL;
+ p_dec->p_owner->p_es_descriptor = p_es;
+ /* decoder fifo */
+ if( ( p_dec->p_owner->p_fifo = block_FifoNew( p_dec ) ) == NULL )
+ {
+ msg_Err( p_dec, "out of memory" );
+ return NULL;
+ }
+ p_dec->p_owner->p_method_data = p_input->p_method_data;
+
+ /* Set buffers allocation callbacks for the decoders */
+ p_dec->pf_aout_buffer_new = aout_new_buffer;
+ p_dec->pf_aout_buffer_del = aout_del_buffer;
+ p_dec->pf_vout_buffer_new = vout_new_buffer;
+ p_dec->pf_vout_buffer_del = vout_del_buffer;
+ p_dec->pf_picture_link = vout_link_picture;
+ p_dec->pf_picture_unlink = vout_unlink_picture;
+
+ vlc_object_attach( p_dec, p_input );
+
+ return p_dec;
+}
+
+/**
+ * The decoding main loop
+ *
+ * \param p_dec the decoder
+ * \return 0
+ */
+static int DecoderThread( decoder_t * p_dec )
+{
+ block_t *p_block;
+
+ /* The decoder's main loop */
+ while( !p_dec->b_die && !p_dec->b_error )
+ {
+ if( ( p_block = block_FifoGet( p_dec->p_owner->p_fifo ) ) == NULL )
+ {
+ p_dec->b_error = 1;
+ break;
+ }
+ if( p_block->i_buffer <= 0 )
+ {
+ block_Release( p_block );
+ continue;
+ }
+ if( DecoderDecode( p_dec, p_block ) )
+ {
+ break;
+ }
+ }
+
+ while( !p_dec->b_die )
+ {
+ /* Trash all received PES packets */
+ p_block = block_FifoGet( p_dec->p_owner->p_fifo );
+ if( p_block )
+ {
+ block_Release( p_block );
+ }
+ }
+
+ /* XXX We do it here because of dll loader that want close in the
+ * same thread than open/decode */
+ /* Unneed module */
+ module_Unneed( p_dec, p_dec->p_module );
+
+ return 0;
+}
+
+/**
+ * Decode a block
+ *
+ * \param p_dec the decoder object
+ * \param p_block the block to decode
+ * \return VLC_SUCCESS or an error code
+ */
+static int DecoderDecode( decoder_t *p_dec, block_t *p_block )
+{
+ if( p_block->i_buffer <= 0 )
+ {
+ block_Release( p_block );
+ return VLC_SUCCESS;
+ }
+
+ if( p_dec->i_object_type == VLC_OBJECT_PACKETIZER )
+ {
+ block_t *p_sout_block;
+
+ while( (p_sout_block = p_dec->pf_packetize( p_dec, &p_block )) )
+ {
+ if( !p_dec->p_owner->p_sout_input )
+ {
+ es_format_Copy( &p_dec->p_owner->sout, &p_dec->fmt_out );
+ if( p_dec->p_owner->p_es_descriptor->p_pgrm )
+ {
+ p_dec->p_owner->sout.i_group =
+ p_dec->p_owner->p_es_descriptor->p_pgrm->i_number;
+ }
+ p_dec->p_owner->sout.i_id = p_dec->p_owner->p_es_descriptor->i_id - 1;
+ if( p_dec->fmt_in.psz_language )
+ {
+ p_dec->p_owner->sout.psz_language = strdup( p_dec->fmt_in.psz_language );
+ }
+
+ p_dec->p_owner->p_sout_input =
+ sout_InputNew( p_dec->p_owner->p_sout, &p_dec->p_owner->sout );
+
+ if( p_dec->p_owner->p_sout_input == NULL )
+ {
+ msg_Err( p_dec, "cannot create packetizer output" );
+ p_dec->b_error = VLC_TRUE;
+
+ while( p_sout_block )
+ {
+ block_t *p_next = p_sout_block->p_next;
+ block_Release( p_sout_block );
+ p_sout_block = p_next;
+ }
+ break;
+ }
+ }
+
+ while( p_sout_block )
+ {
+ block_t *p_next = p_sout_block->p_next;
+ sout_buffer_t *p_sout_buffer;
+
+ p_sout_buffer =
+ sout_BufferNew( p_dec->p_owner->p_sout_input->p_sout,
+ p_sout_block->i_buffer );
+ if( p_sout_buffer == NULL )
+ {
+ msg_Err( p_dec, "cannot get sout buffer" );
+ break;
+ }
+
+ memcpy( p_sout_buffer->p_buffer, p_sout_block->p_buffer,
+ p_sout_block->i_buffer );
+
+ p_sout_buffer->i_pts = p_sout_block->i_pts;
+ p_sout_buffer->i_dts = p_sout_block->i_dts;
+ p_sout_buffer->i_length = p_sout_block->i_length;
+ p_sout_buffer->i_flags =
+ (p_sout_block->i_flags << SOUT_BUFFER_FLAGS_BLOCK_SHIFT)
+ & SOUT_BUFFER_FLAGS_BLOCK_MASK;
+
+ block_Release( p_sout_block );
+
+ sout_InputSendBuffer( p_dec->p_owner->p_sout_input, p_sout_buffer );
+
+ p_sout_block = p_next;
+ }
+ }
+ }
+ else if( p_dec->fmt_in.i_cat == AUDIO_ES )
+ {
+ aout_buffer_t *p_aout_buf;
+
+ while( (p_aout_buf = p_dec->pf_decode_audio( p_dec, &p_block )) )
+ {
+ aout_DecPlay( p_dec->p_owner->p_aout,
+ p_dec->p_owner->p_aout_input, p_aout_buf );
+ }
+ }
+ else if( p_dec->fmt_in.i_cat == VIDEO_ES )
+ {
+ picture_t *p_pic;
+
+ while( (p_pic = p_dec->pf_decode_video( p_dec, &p_block )) )
+ {
+ vout_DatePicture( p_dec->p_owner->p_vout, p_pic, p_pic->date );
+ vout_DisplayPicture( p_dec->p_owner->p_vout, p_pic );
+ }
+ }
+ else if( p_dec->fmt_in.i_cat == SPU_ES )
+ {
+ p_dec->pf_decode_sub( p_dec, &p_block );
+ }
+ else
+ {
+ msg_Err( p_dec, "unknown ES format" );
+ p_dec->b_error = 1;
+ }
+
+ return p_dec->b_error ? VLC_EGENERIC : VLC_SUCCESS;
+}
+
+/**
+ * Destroys a decoder object
+ *
+ * \param p_dec the decoder object
+ * \return nothing
+ */
+static void DeleteDecoder( decoder_t * p_dec )
+{
+ vlc_object_detach( p_dec );
+
+ msg_Dbg( p_dec,
+ "killing decoder fourcc `%4.4s', %d PES in FIFO",
+ (char*)&p_dec->fmt_in.i_codec,
+ p_dec->p_owner->p_fifo->i_depth );
+
+ /* Free all packets still in the decoder fifo. */
+ block_FifoEmpty( p_dec->p_owner->p_fifo );
+ block_FifoRelease( p_dec->p_owner->p_fifo );
+
+ /* Cleanup */
+ if( p_dec->p_owner->p_aout_input )
+ aout_DecDelete( p_dec->p_owner->p_aout, p_dec->p_owner->p_aout_input );
+
+ if( p_dec->p_owner->p_vout )
+ {
+ int i_pic;
+
+#define p_pic p_dec->p_owner->p_vout->render.pp_picture[i_pic]
+ /* Hack to make sure all the the pictures are freed by the decoder */
+ for( i_pic = 0; i_pic < p_dec->p_owner->p_vout->render.i_pictures;
+ i_pic++ )
+ {
+ if( p_pic->i_status == RESERVED_PICTURE )
+ vout_DestroyPicture( p_dec->p_owner->p_vout, p_pic );
+ if( p_pic->i_refcount > 0 )
+ vout_UnlinkPicture( p_dec->p_owner->p_vout, p_pic );
+ }
+#undef p_pic
+
+ /* We are about to die. Reattach video output to p_vlc. */
+ vout_Request( p_dec, p_dec->p_owner->p_vout, 0, 0, 0, 0 );
+ }
+
+ if( p_dec->p_owner->p_sout_input )
+ {
+ sout_InputDelete( p_dec->p_owner->p_sout_input );
+ if( p_dec->p_owner->sout.i_extra ) free(p_dec->p_owner->sout.p_extra);
+ }
+
+ if( p_dec->fmt_in.i_extra ) free( p_dec->fmt_in.p_extra );
+ if( p_dec->fmt_out.i_extra ) free( p_dec->fmt_out.p_extra );
+
+ free( p_dec->p_owner );