X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Finput%2Finput_dec.c;h=0ee1d03a661c38eec0c00f8199cf512c4739dec3;hb=4dec9682f6b5b0b6ed2d5187f4652cb680f39000;hp=eb53c053311c62eab0b84924ac7166b376b9c6e2;hpb=d0c9b47957ec825d43aba1b27202bba5170c0d08;p=vlc diff --git a/src/input/input_dec.c b/src/input/input_dec.c index eb53c05331..0ee1d03a66 100644 --- a/src/input/input_dec.c +++ b/src/input/input_dec.c @@ -1,8 +1,8 @@ /***************************************************************************** * input_dec.c: Functions for the management of decoders ***************************************************************************** - * Copyright (C) 1999, 2000 VideoLAN - * $Id: input_dec.c,v 1.13 2001/07/18 14:21:00 massiot Exp $ + * Copyright (C) 1999-2001 VideoLAN + * $Id: input_dec.c,v 1.60 2003/04/13 20:00:21 fenrir Exp $ * * Authors: Christophe Massiot * @@ -10,7 +10,7 @@ * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the @@ -24,32 +24,106 @@ /***************************************************************************** * Preamble *****************************************************************************/ -#include "defs.h" - #include #include /* memcpy(), memset() */ -#include /* off_t */ -#include "config.h" -#include "common.h" -#include "threads.h" -#include "mtime.h" -#include "intf_msg.h" +#include #include "stream_control.h" #include "input_ext-dec.h" #include "input_ext-intf.h" #include "input_ext-plugins.h" +static decoder_fifo_t * CreateDecoderFifo( input_thread_t *, + es_descriptor_t * ); +static void DeleteDecoderFifo( decoder_fifo_t * ); + /***************************************************************************** * input_RunDecoder: spawns a new decoder thread *****************************************************************************/ -vlc_thread_t input_RunDecoder( decoder_capabilities_t * p_decoder, - void * p_data ) +decoder_fifo_t * input_RunDecoder( input_thread_t * p_input, + es_descriptor_t * p_es ) { - return( p_decoder->pf_create_thread( p_data ) ); + char *psz_sout; + decoder_fifo_t *p_fifo; + int i_priority; + + /* Create the decoder configuration structure */ + p_fifo = CreateDecoderFifo( p_input, p_es ); + + if( p_fifo == NULL ) + { + msg_Err( p_input, "could not create decoder fifo" ); + return NULL; + } + + p_fifo->p_module = NULL; + /* If we are in sout mode, search for packetizer module */ + psz_sout = config_GetPsz( p_input, "sout" ); + if( !p_es->b_force_decoder && psz_sout != NULL && *psz_sout != 0 ) + { + vlc_bool_t b_sout = VLC_TRUE; + + if( p_es->i_cat == AUDIO_ES ) + { + b_sout = config_GetInt( p_input, "sout-audio" ); + } + else if( p_es->i_cat == VIDEO_ES ) + { + b_sout = config_GetInt( p_input, "sout-video" ); + } + + if( b_sout ) + { + p_fifo->p_module = + module_Need( p_fifo, "packetizer", "$packetizer" ); + } + } + else + { + /* default Get a suitable decoder module */ + p_fifo->p_module = module_Need( p_fifo, "decoder", "$codec" ); + } + + if( psz_sout ) + { + free( psz_sout ); + } + + if( p_fifo->p_module == NULL ) + { + msg_Err( p_fifo, "no suitable decoder module for fourcc `%4.4s'.\nVLC probably does not support this sound or video format.", + (char*)&p_fifo->i_fourcc ); + DeleteDecoderFifo( p_fifo ); + vlc_object_destroy( p_fifo ); + return NULL; + } + + if ( p_es->i_cat == AUDIO_ES ) + { + i_priority = VLC_THREAD_PRIORITY_AUDIO; + } + else + { + i_priority = VLC_THREAD_PRIORITY_VIDEO; + } + + /* Spawn the decoder thread */ + if( vlc_thread_create( p_fifo, "decoder", p_fifo->pf_run, + i_priority, VLC_FALSE ) ) + { + msg_Err( p_fifo, "cannot spawn decoder thread \"%s\"", + p_fifo->p_module->psz_object_name ); + module_Unneed( p_fifo, p_fifo->p_module ); + return NULL; + } + + p_input->stream.b_changed = 1; + + return p_fifo; } + /***************************************************************************** * input_EndDecoder: kills a decoder thread and waits until it's finished *****************************************************************************/ @@ -74,25 +148,23 @@ void input_EndDecoder( input_thread_t * p_input, es_descriptor_t * p_es ) /* Waiting for the thread to exit */ /* I thought that unlocking was better since thread join can be long * but it actually creates late pictures and freezes --stef */ -// vlc_mutex_unlock( &p_input->stream.stream_lock ); - vlc_thread_join( p_es->thread_id ); -// vlc_mutex_lock( &p_input->stream.stream_lock ); + /* vlc_mutex_unlock( &p_input->stream.stream_lock ); */ + vlc_thread_join( p_es->p_decoder_fifo ); + /* vlc_mutex_lock( &p_input->stream.stream_lock ); */ - /* Freeing all packets still in the decoder fifo. */ - while( !DECODER_FIFO_ISEMPTY( *p_es->p_decoder_fifo ) ) - { - p_es->p_decoder_fifo->pf_delete_pes( - p_es->p_decoder_fifo->p_packets_mgt, - DECODER_FIFO_START( *p_es->p_decoder_fifo ) ); - DECODER_FIFO_INCSTART( *p_es->p_decoder_fifo ); - } + /* Delete decoder configuration */ + DeleteDecoderFifo( p_es->p_decoder_fifo ); - /* Destroy the lock and cond */ - vlc_cond_destroy( &p_es->p_decoder_fifo->data_wait ); - vlc_mutex_destroy( &p_es->p_decoder_fifo->data_lock ); + /* Unneed module */ + module_Unneed( p_es->p_decoder_fifo, p_es->p_decoder_fifo->p_module ); + + /* Delete the fifo */ + vlc_object_destroy( p_es->p_decoder_fifo ); - free( p_es->p_decoder_fifo ); + /* Tell the input there is no more decoder */ p_es->p_decoder_fifo = NULL; + + p_input->stream.b_changed = 1; } /***************************************************************************** @@ -104,35 +176,71 @@ void input_DecodePES( decoder_fifo_t * p_decoder_fifo, pes_packet_t * p_pes ) { vlc_mutex_lock( &p_decoder_fifo->data_lock ); - if( !DECODER_FIFO_ISFULL( *p_decoder_fifo ) ) + p_pes->p_next = NULL; + *p_decoder_fifo->pp_last = p_pes; + p_decoder_fifo->pp_last = &p_pes->p_next; + p_decoder_fifo->i_depth++; + + /* Warn the decoder that it's got work to do. */ + vlc_cond_signal( &p_decoder_fifo->data_wait ); + vlc_mutex_unlock( &p_decoder_fifo->data_lock ); +} + +/***************************************************************************** + * Create a NULL packet for padding in case of a data loss + *****************************************************************************/ +void input_NullPacket( input_thread_t * p_input, + es_descriptor_t * p_es ) +{ + data_packet_t * p_pad_data; + pes_packet_t * p_pes; + + if( (p_pad_data = input_NewPacketForce( p_input->p_method_data, + PADDING_PACKET_SIZE)) == NULL ) { - p_decoder_fifo->buffer[p_decoder_fifo->i_end] = p_pes; - DECODER_FIFO_INCEND( *p_decoder_fifo ); + msg_Err( p_input, "no new packet" ); + p_input->b_error = 1; + return; + } + + memset( p_pad_data->p_payload_start, 0, PADDING_PACKET_SIZE ); + p_pad_data->b_discard_payload = 1; + p_pes = p_es->p_pes; - /* Warn the decoder that it's got work to do. */ - vlc_cond_signal( &p_decoder_fifo->data_wait ); + if( p_pes != NULL ) + { + p_pes->b_discontinuity = 1; + p_pes->p_last->p_next = p_pad_data; + p_pes->p_last = p_pad_data; + p_pes->i_nb_data++; } else { - /* The FIFO is full !!! This should not happen. */ - p_decoder_fifo->pf_delete_pes( p_decoder_fifo->p_packets_mgt, - p_pes ); - intf_ErrMsg( "PES trashed - decoder fifo full !" ); + if( (p_pes = input_NewPES( p_input->p_method_data )) == NULL ) + { + msg_Err( p_input, "no PES packet" ); + p_input->b_error = 1; + return; + } + + p_pes->i_rate = p_input->stream.control.i_rate; + p_pes->p_first = p_pes->p_last = p_pad_data; + p_pes->i_nb_data = 1; + p_pes->b_discontinuity = 1; + input_DecodePES( p_es->p_decoder_fifo, p_pes ); } - vlc_mutex_unlock( &p_decoder_fifo->data_lock ); } /***************************************************************************** * input_EscapeDiscontinuity: send a NULL packet to the decoders *****************************************************************************/ -void input_EscapeDiscontinuity( input_thread_t * p_input, - pgrm_descriptor_t * p_pgrm ) +void input_EscapeDiscontinuity( input_thread_t * p_input ) { - int i_es, i; + unsigned int i_es, i; - for( i_es = 0; i_es < p_pgrm->i_es_number; i_es++ ) + for( i_es = 0; i_es < p_input->stream.i_selected_es_number; i_es++ ) { - es_descriptor_t * p_es = p_pgrm->pp_es[i_es]; + es_descriptor_t * p_es = p_input->stream.pp_selected_es[i_es]; if( p_es->p_decoder_fifo != NULL ) { @@ -149,24 +257,84 @@ void input_EscapeDiscontinuity( input_thread_t * p_input, *****************************************************************************/ void input_EscapeAudioDiscontinuity( input_thread_t * p_input ) { - int i_pgrm, i_es, i; + unsigned int i_es, i; - for( i_pgrm = 0; i_pgrm < p_input->stream.i_pgrm_number; i_pgrm++ ) + for( i_es = 0; i_es < p_input->stream.i_selected_es_number; i_es++ ) { - pgrm_descriptor_t * p_pgrm = p_input->stream.pp_programs[i_pgrm]; + es_descriptor_t * p_es = p_input->stream.pp_selected_es[i_es]; - for( i_es = 0; i_es < p_pgrm->i_es_number; i_es++ ) + if( p_es->p_decoder_fifo != NULL && p_es->i_cat == AUDIO_ES ) { - es_descriptor_t * p_es = p_pgrm->pp_es[i_es]; - - if( p_es->p_decoder_fifo != NULL && p_es->b_audio ) + for( i = 0; i < PADDING_PACKET_NUMBER; i++ ) { - for( i = 0; i < PADDING_PACKET_NUMBER; i++ ) - { - input_NullPacket( p_input, p_es ); - } + input_NullPacket( p_input, p_es ); } } } } +/***************************************************************************** + * CreateDecoderFifo: create a decoder_fifo_t + *****************************************************************************/ +static decoder_fifo_t * CreateDecoderFifo( input_thread_t * p_input, + es_descriptor_t * p_es ) +{ + decoder_fifo_t * p_fifo; + + /* Decoder FIFO */ + p_fifo = vlc_object_create( p_input, VLC_OBJECT_DECODER ); + if( p_fifo == NULL ) + { + msg_Err( p_input, "out of memory" ); + return NULL; + } + + /* Select a new ES */ + INSERT_ELEM( p_input->stream.pp_selected_es, + p_input->stream.i_selected_es_number, + p_input->stream.i_selected_es_number, + p_es ); + + /* Initialize the p_fifo structure */ + vlc_mutex_init( p_input, &p_fifo->data_lock ); + vlc_cond_init( p_input, &p_fifo->data_wait ); + p_es->p_decoder_fifo = p_fifo; + + p_fifo->i_id = p_es->i_id; + p_fifo->i_fourcc = p_es->i_fourcc; + p_fifo->p_demux_data = p_es->p_demux_data; + p_fifo->p_waveformatex = p_es->p_waveformatex; + p_fifo->p_bitmapinfoheader = p_es->p_bitmapinfoheader; + p_fifo->p_stream_ctrl = &p_input->stream.control; + p_fifo->p_sout = p_input->stream.p_sout; + + p_fifo->p_first = NULL; + p_fifo->pp_last = &p_fifo->p_first; + p_fifo->i_depth = 0; + p_fifo->b_die = p_fifo->b_error = 0; + p_fifo->p_packets_mgt = p_input->p_method_data; + + vlc_object_attach( p_fifo, p_input ); + + return p_fifo; +} + +/***************************************************************************** + * DeleteDecoderFifo: destroy a decoder_fifo_t + *****************************************************************************/ +static void DeleteDecoderFifo( decoder_fifo_t * p_fifo ) +{ + vlc_object_detach( p_fifo ); + + msg_Dbg( p_fifo, "killing decoder for 0x%x, fourcc `%4.4s', %d PES in FIFO", + p_fifo->i_id, (char*)&p_fifo->i_fourcc, p_fifo->i_depth ); + + /* Free all packets still in the decoder fifo. */ + input_DeletePES( p_fifo->p_packets_mgt, + p_fifo->p_first ); + + /* Destroy the lock and cond */ + vlc_cond_destroy( &p_fifo->data_wait ); + vlc_mutex_destroy( &p_fifo->data_lock ); +} +