X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Finput%2Finput.c;h=e444286d9a4b244d7603e6a68d3432fea7ca55ee;hb=440f9992ee947ea5fd0debbf35fdd1011c6404b3;hp=bfcf8341be0c918423757456840269058de5e32e;hpb=b335e3b40fdbce2f99d7290d4a079e6c24ae3d88;p=vlc diff --git a/src/input/input.c b/src/input/input.c index bfcf8341be..e444286d9a 100644 --- a/src/input/input.c +++ b/src/input/input.c @@ -4,9 +4,9 @@ * decoders. ***************************************************************************** * Copyright (C) 1998, 1999, 2000 VideoLAN + * $Id: input.c,v 1.113 2001/05/30 17:03:12 sam Exp $ * * Authors: Christophe Massiot - * Benoît Steiner * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -28,80 +28,72 @@ *****************************************************************************/ #include "defs.h" -#include /* errno */ -#include /* on BSD, uio.h needs types.h */ -#include /* "input.h" */ -#include /* strerror() */ +#include +#include +#include +#include +#include +#include +#ifdef STRNCASECMP_IN_STRINGS_H +# include +#endif +#include -#include /* free() */ -#include /* ntohs() */ +/* WinSock Includes */ -#include "config.h" -#include "common.h" -#include "threads.h" -#include "mtime.h" -#include "intf_msg.h" -#include "plugins.h" -#include "debug.h" +#ifdef WIN32 +#include +#endif -#include "input.h" -#include "input_psi.h" -#include "input_pcr.h" -#include "input_netlist.h" -#include "decoder_fifo.h" -#include "input_file.h" -#include "input_network.h" -#include "audio_output.h" /* aout_thread_t */ +/* Network functions */ -#include "audio_decoder.h" /* audiodec_t (for audio_decoder_thread.h) */ -#include "audio_decoder_thread.h" /* adec_thread_t */ +#if !defined( SYS_BEOS ) && !defined( SYS_NTO ) && !defined( WIN32 ) +#include /* hostent ... */ +#include +#include +#include +#include +#include +#endif -#include "ac3_decoder.h" /* ac3dec_t (for ac3_decoder_thread.h) */ -#include "ac3_decoder_thread.h" /* ac3dec_thread_t */ +#ifdef STATS +# include +#endif -#include "lpcm_decoder.h" -#include "lpcm_decoder_thread.h" +#include "config.h" +#include "common.h" +#include "threads.h" +#include "mtime.h" +#include "netutils.h" +#include "modules.h" -#include "video.h" /* picture_t (for video_output.h) */ -#include "video_output.h" /* vout_thread_t */ +#include "intf_msg.h" +#include "intf_playlist.h" -#include "vdec_idct.h" /* dctelem_t (for video_parser.h) */ -#include "vdec_motion.h" /* f_motion_t (for video_parser.h) */ -#include "vpar_blocks.h" /* macroblock_t (for video_parser.h) */ -#include "vpar_headers.h" /* sequence_t (for video_parser.h) */ -#include "vpar_synchro.h" /* video_synchro_t (for video_parser.h) */ -#include "video_parser.h" /* vpar_thread_t */ +#include "stream_control.h" +#include "input_ext-intf.h" +#include "input_ext-dec.h" -#include "spu_decoder.h" /* spudec_thread_t */ +#include "input.h" +#include "interface.h" #include "main.h" + /***************************************************************************** * Local prototypes *****************************************************************************/ -static void RunThread ( input_thread_t *p_input ); -static void ErrorThread ( input_thread_t *p_input ); -static void EndThread ( input_thread_t *p_input ); - -static __inline__ int input_ReadPacket( input_thread_t *p_input ); -static __inline__ void input_SortPacket( input_thread_t *p_input, - ts_packet_t *ts_packet ); -static __inline__ void input_DemuxTS( input_thread_t *p_input, - ts_packet_t *ts_packet, - es_descriptor_t *es_descriptor ); -static __inline__ void input_DemuxPES( input_thread_t *p_input, - ts_packet_t *ts_packet, - es_descriptor_t *p_es_descriptor, - boolean_t b_unit_start, - boolean_t b_packet_lost ); -static __inline__ void input_ParsePES( input_thread_t *p_input, - es_descriptor_t *p_es_descriptor ); -static __inline__ void input_DemuxPSI( input_thread_t *p_input, - ts_packet_t *ts_packet, - es_descriptor_t *p_es_descriptor, - boolean_t b_unit_start, - boolean_t b_packet_lost ); +static void RunThread ( input_thread_t *p_input ); +static int InitThread ( input_thread_t *p_input ); +static void ErrorThread ( input_thread_t *p_input ); +static void DestroyThread ( input_thread_t *p_input ); +static void EndThread ( input_thread_t *p_input ); + +static void FileOpen ( input_thread_t *p_input ); +static void FileClose ( input_thread_t *p_input ); +static void NetworkOpen ( input_thread_t *p_input ); +static void NetworkClose ( input_thread_t *p_input ); /***************************************************************************** * input_CreateThread: creates a new input thread @@ -111,143 +103,85 @@ static __inline__ void input_DemuxPSI( input_thread_t *p_input, * If pi_status is NULL, then the function will block until the thread is ready. * If not, it will be updated using one of the THREAD_* constants. *****************************************************************************/ -input_thread_t *input_CreateThread ( int i_method, void *p_source, int i_port, - int i_vlan, p_vout_thread_t p_vout, - p_aout_thread_t p_aout, int *pi_status ) +input_thread_t *input_CreateThread ( playlist_item_t *p_item, int *pi_status ) { input_thread_t * p_input; /* thread descriptor */ int i_status; /* thread status */ - int i_index; /* index for tables initialization */ /* Allocate descriptor */ - intf_DbgMsg("\n"); p_input = (input_thread_t *)malloc( sizeof(input_thread_t) ); if( p_input == NULL ) { - intf_ErrMsg("error: %s\n", strerror(ENOMEM)); + intf_ErrMsg( "input error: can't allocate input thread (%s)", + strerror(errno) ); return( NULL ); } + /* Packets read once */ + p_input->i_read_once = INPUT_READ_ONCE; + /* Initialize thread properties */ p_input->b_die = 0; p_input->b_error = 0; + p_input->b_eof = 0; + + /* Set target */ + p_input->p_source = p_item->psz_name; + + /* I have never understood that stuff --Meuuh */ p_input->pi_status = (pi_status != NULL) ? pi_status : &i_status; *p_input->pi_status = THREAD_CREATE; - /* Initialize input method description */ - p_input->i_method = i_method; - p_input->p_source = p_source; - p_input->i_port = i_port; - p_input->i_vlan = i_vlan; - switch( i_method ) - { - case INPUT_METHOD_TS_FILE: /* file methods */ - p_input->p_Open = input_FileOpen; - p_input->p_Read = input_FileRead; - p_input->p_Close = input_FileClose; - break; - case INPUT_METHOD_TS_VLAN_BCAST: /* vlan network method */ - if( !p_main->b_vlans ) - { - intf_ErrMsg("error: vlans are not activated\n"); - free( p_input ); - return( NULL ); - } - /* ... pass through */ - case INPUT_METHOD_TS_UCAST: /* network methods */ - case INPUT_METHOD_TS_MCAST: - case INPUT_METHOD_TS_BCAST: - p_input->p_Open = input_NetworkOpen; - p_input->p_Read = input_NetworkRead; - p_input->p_Close = input_NetworkClose; - break; - default: - intf_ErrMsg("error: unknow input method\n"); - free( p_input ); - return( NULL ); - break; - } - /* Initialize stream description */ - for( i_index = 0; i_index < INPUT_MAX_ES; i_index++ ) - { - p_input->p_es[i_index].i_id = EMPTY_PID; - p_input->pp_selected_es[i_index] = NULL; - } - - /* Initialize default settings for spawned decoders */ - p_input->p_aout = p_aout; - p_input->p_vout = p_vout; - -#ifdef STATS - /* Initialize statistics */ - p_input->c_loops = 0; - p_input->c_bytes = 0; - p_input->c_payload_bytes = 0; - p_input->c_packets_read = 0; - p_input->c_packets_trashed = 0; + p_input->stream.i_es_number = 0; + p_input->stream.i_selected_es_number = 0; + p_input->stream.i_pgrm_number = 0; + p_input->stream.i_new_status = p_input->stream.i_new_rate = 0; + p_input->stream.i_mux_rate = 0; + + /* no stream, no area */ + p_input->stream.i_area_nb = 0; + p_input->stream.pp_areas = NULL; + p_input->stream.p_selected_area = NULL; + p_input->stream.p_new_area = NULL; + /* By default there is one areas in a stream */ + input_AddArea( p_input ); + p_input->stream.p_selected_area = p_input->stream.pp_areas[0]; + + /* Initialize stream control properties. */ + p_input->stream.control.i_status = PLAYING_S; + p_input->stream.control.i_rate = DEFAULT_RATE; + p_input->stream.control.b_mute = 0; + p_input->stream.control.b_bw = 0; + + /* Setup callbacks */ + p_input->pf_file_open = FileOpen; + p_input->pf_file_close = FileClose; +#if !defined( SYS_BEOS ) && !defined( SYS_NTO ) + p_input->pf_network_open = NetworkOpen; + p_input->pf_network_close = NetworkClose; #endif - /* Initialize PSI and PCR decoders */ - if( input_PsiInit( p_input ) ) - { - free( p_input ); - return( NULL ); - } - - if( input_PcrInit( p_input ) ) - { - input_PsiEnd( p_input ); - free( p_input ); - return( NULL ); - } - - /* Initialize netlists */ - if( input_NetlistInit( p_input ) ) - { - input_PsiEnd( p_input ); - input_PcrEnd( p_input ); - free( p_input ); - return( NULL ); - } - - intf_DbgMsg("configuration: method=%d, source=%s, port=%d, vlan=%d\n", - i_method, p_source, i_port, i_vlan ); - - /* Let the appropriate method open the socket. */ - if( p_input->p_Open( p_input ) ) - { - input_NetlistEnd( p_input ); - input_PsiEnd( p_input ); - input_PcrEnd( p_input ); - free( p_input ); - return( NULL ); - } - /* Create thread and set locks. */ - vlc_mutex_init( &p_input->netlist.lock ); - vlc_mutex_init( &p_input->programs_lock ); - vlc_mutex_init( &p_input->es_lock ); - if( vlc_thread_create(&p_input->thread_id, "input", (void *) RunThread, (void *) p_input) ) - { - intf_ErrMsg("error: %s\n", strerror(errno) ); - p_input->p_Close( p_input ); - input_NetlistEnd( p_input );; - input_PsiEnd( p_input ); - input_PcrEnd( p_input ); + vlc_mutex_init( &p_input->stream.stream_lock ); + vlc_cond_init( &p_input->stream.stream_wait ); + vlc_mutex_init( &p_input->stream.control.control_lock ); + if( vlc_thread_create( &p_input->thread_id, "input", (void *) RunThread, + (void *) p_input ) ) + { + intf_ErrMsg( "input error: can't create input thread (%s)", + strerror(errno) ); free( p_input ); return( NULL ); } - intf_Msg("Input initialized\n"); - /* If status is NULL, wait until the thread is created */ if( pi_status == NULL ) { do { msleep( THREAD_SLEEP ); - }while( (i_status != THREAD_READY) && (i_status != THREAD_ERROR) + } while( (i_status != THREAD_READY) && (i_status != THREAD_ERROR) && (i_status != THREAD_FATAL) ); if( i_status != THREAD_READY ) { @@ -273,1178 +207,588 @@ void input_DestroyThread( input_thread_t *p_input, int *pi_status ) /* Request thread destruction */ p_input->b_die = 1; + /* Make the thread exit of an eventual vlc_cond_wait() */ + vlc_mutex_lock( &p_input->stream.stream_lock ); + vlc_cond_signal( &p_input->stream.stream_wait ); + vlc_mutex_unlock( &p_input->stream.stream_lock ); + /* If status is NULL, wait until thread has been destroyed */ if( pi_status == NULL ) { do { msleep( THREAD_SLEEP ); - }while( (i_status != THREAD_OVER) && (i_status != THREAD_ERROR) - && (i_status != THREAD_FATAL) ); + } while ( (i_status != THREAD_OVER) && (i_status != THREAD_ERROR) + && (i_status != THREAD_FATAL) ); } } -#if 0 -/***************************************************************************** - * input_OpenAudioStream: open an audio stream - ***************************************************************************** - * This function spawns an audio decoder and plugs it on the audio output - * thread. - *****************************************************************************/ -int input_OpenAudioStream( input_thread_t *p_input, int i_id ) -{ - /* XXX?? */ -} - -/***************************************************************************** - * input_CloseAudioStream: close an audio stream - ***************************************************************************** - * This function destroys an audio decoder. - *****************************************************************************/ -void input_CloseAudioStream( input_thread_t *p_input, int i_id ) -{ - /* XXX?? */ -} - -/***************************************************************************** - * input_OpenVideoStream: open a video stream - ***************************************************************************** - * This function spawns a video decoder and plugs it on a video output thread. - *****************************************************************************/ -int input_OpenVideoStream( input_thread_t *p_input, - struct vout_thread_s *p_vout, struct video_cfg_s * p_cfg ) -{ - /* XXX?? */ -} - /***************************************************************************** - * input_CloseVideoStream: close a video stream - ***************************************************************************** - * This function destroys an video decoder. - *****************************************************************************/ -void input_CloseVideoStream( input_thread_t *p_input, int i_id ) -{ - /* XXX?? */ -} -#endif - -/* following functions are local */ - -/***************************************************************************** - * InitThread: initialize input thread - ***************************************************************************** - * This function is called from RunThread and performs the second step of the - * initialization. It returns 0 on success. Note that the thread's flag are not - * modified inside this function. - *****************************************************************************/ -static int InitThread( input_thread_t *p_input ) -{ - /* Mark thread as running and return */ - intf_DbgMsg("\n"); - *p_input->pi_status = THREAD_READY; - intf_DbgMsg("thread ready\n"); - return( 0 ); -} - -/***************************************************************************** - * input_DemuxPSI: + * RunThread: main thread loop ***************************************************************************** - * Notice that current ES state has been locked by input_SortPacket. - * (No more true, changed by benny - FIXME: See if it's ok, and definitely - * change the code ?? ) + * Thread in charge of processing the network packets and demultiplexing. *****************************************************************************/ -static __inline__ void input_DemuxPSI( input_thread_t *p_input, - ts_packet_t *p_ts_packet, - es_descriptor_t *p_es_descriptor, - boolean_t b_unit_start, - boolean_t b_packet_lost ) +static void RunThread( input_thread_t *p_input ) { - int i_data_offset; /* Offset of the interesting data in the TS packet */ - u16 i_data_length; /* Length of those data */ - //boolean_t b_first_section; /* another section in the TS packet ? */ + int i_error, i; - ASSERT(p_input); - ASSERT(p_ts_packet); - ASSERT(p_es_descriptor); + if( InitThread( p_input ) ) + { -#define p_psi (p_es_descriptor->p_psi_section) + /* If we failed, wait before we are killed, and exit */ + *p_input->pi_status = THREAD_ERROR; + p_input->b_error = 1; + ErrorThread( p_input ); + DestroyThread( p_input ); + return; + } - //intf_DbgMsg( "input debug: PSI demultiplexing %p (%p)\n", p_ts_packet, p_input); + /* initialization is completed */ + vlc_mutex_lock( &p_input->stream.stream_lock ); + p_input->stream.b_changed = 1; + vlc_mutex_unlock( &p_input->stream.stream_lock ); - //intf_DbgMsg( "Packet: %x %x %x %x %x %x %x %x %x %x %x %x %x %x %x %x %x %x %x %x %x (unit start: %d)\n", p_ts_packet->buffer[p_ts_packet->i_payload_start], p_ts_packet->buffer[p_ts_packet->i_payload_start+1], p_ts_packet->buffer[p_ts_packet->i_payload_start+2], p_ts_packet->buffer[p_ts_packet->i_payload_start+3], p_ts_packet->buffer[p_ts_packet->i_payload_start+4], p_ts_packet->buffer[p_ts_packet->i_payload_start+5], p_ts_packet->buffer[p_ts_packet->i_payload_start+6], p_ts_packet->buffer[p_ts_packet->i_payload_start+7], p_ts_packet->buffer[p_ts_packet->i_payload_start+8], p_ts_packet->buffer[p_ts_packet->i_payload_start+9], p_ts_packet->buffer[p_ts_packet->i_payload_start+10], p_ts_packet->buffer[p_ts_packet->i_payload_start+11], p_ts_packet->buffer[p_ts_packet->i_payload_start+12], p_ts_packet->buffer[p_ts_packet->i_payload_start+13], p_ts_packet->buffer[p_ts_packet->i_payload_start+14], p_ts_packet->buffer[p_ts_packet->i_payload_start+15], p_ts_packet->buffer[p_ts_packet->i_payload_start+16], p_ts_packet->buffer[p_ts_packet->i_payload_start+17], p_ts_packet->buffer[p_ts_packet->i_payload_start+18], p_ts_packet->buffer[p_ts_packet->i_payload_start+19], p_ts_packet->buffer[p_ts_packet->i_payload_start+20], b_unit_start); + while( !p_input->b_die && !p_input->b_error && !p_input->b_eof ) + { + data_packet_t * pp_packets[p_input->i_read_once]; +#ifdef STATS + p_input->c_loops++; +#endif - /* Try to find the beginning of the payload in the packet to initialise - * the do-while loop that follows -> Compute the i_data_offset variable: - * by default, the value is set so that we won't enter in the while loop. - * It will be set to a correct value if the data are not corrupted */ - i_data_offset = TS_PACKET_SIZE; + vlc_mutex_lock( &p_input->stream.stream_lock ); - /* Has the reassembly of a section already begun in a previous packet ? */ - if( p_psi->b_running_section ) - { - /* Was data lost since the last TS packet ? */ - if( b_packet_lost ) + if( p_input->stream.p_new_area ) { - /* Discard the packet and wait for the begining of a new one - * to resynch */ - p_psi->b_running_section = 0; - p_psi->i_current_position = 0; - intf_DbgMsg( "PSI section(s) discarded due to packet loss\n" ); + p_input->pf_set_area( p_input, p_input->stream.p_new_area ); + p_input->stream.p_new_area = NULL; } - else - { - /* The data that complete a previously began section are always at - * the beginning of the TS payload... */ - i_data_offset = p_ts_packet->i_payload_start; - /* ...Unless there is a pointer field, that we have to bypass */ - if( b_unit_start ) - i_data_offset++; - //intf_DbgMsg( "New part of the section received at offset %d\n", i_data_offset ); - } - } - /* We are looking for the beginning of a new section */ - else - { - if( b_unit_start ) - { - /* Get the offset at which the data for that section can be found - * The offset is stored in the pointer_field since we are - * interested in the first section of the TS packet. Note that - * the +1 is to bypass the pointer field */ - i_data_offset = p_ts_packet->i_payload_start + - p_ts_packet->buffer[p_ts_packet->i_payload_start] + 1; - //intf_DbgMsg( "New section beginning at offset %d in TS packet\n", i_data_offset ); - } - else - { - /* This may either mean that the TS is bad or that the packet - * contains the end of a section that had been discarded in a - * previous loop: trash the TS packet since we cannot do - * anything with those data: */ - p_psi->b_running_section = 0; - p_psi->i_current_position = 0; - intf_DbgMsg( "PSI packet discarded due to lack of synchronisation\n" ); - } - } - /* The section we will deal with during the first iteration of the - * following loop is the first one contained in the TS packet */ - // b_first_section = 1; - - /* Reassemble the pieces of sections contained in the TS packet and - * decode the sections that could have been completed. - * Stop when we reach the end of the packet or stuffing bytes */ - while( i_data_offset < TS_PACKET_SIZE && p_ts_packet->buffer[i_data_offset] != 0xFF ) - { - /* If the current section is a new one, reinit the data fields of - * the p_psi struct to start its decoding */ - if( !p_psi->b_running_section ) + if( p_input->stream.p_selected_area->i_seek != NO_SEEK ) { - /* Read the length of the new section */ - p_psi->i_length = (U16_AT(&p_ts_packet->buffer[i_data_offset+1]) & 0xFFF) + 3; - //intf_DbgMsg( "Section length %d\n", p_psi->i_length ); - if( p_psi->i_length > PSI_SECTION_SIZE ) + if( p_input->stream.b_seekable && p_input->pf_seek != NULL ) { - /* The TS packet is corrupted, stop here to avoid possible - * a seg fault */ - intf_DbgMsg( "PSI Section size is too big, aborting its reception\n" ); - break; + p_input->pf_seek( p_input, + p_input->stream.p_selected_area->i_seek ); + + for( i = 0; i < p_input->stream.i_pgrm_number; i++ ) + { + pgrm_descriptor_t * p_pgrm + = p_input->stream.pp_programs[i]; + /* Escape all decoders for the stream discontinuity they + * will encounter. */ + input_EscapeDiscontinuity( p_input, p_pgrm ); + + /* Reinitialize synchro. */ + p_pgrm->i_synchro_state = SYNCHRO_REINIT; + } } + p_input->stream.p_selected_area->i_seek = NO_SEEK; + } - /* Init the reassembly of that section */ - p_psi->b_running_section = 1; - p_psi->i_current_position = 0; + if( p_input->stream.p_removed_es ) + { + input_UnselectES( p_input, p_input->stream.p_removed_es ); + p_input->stream.p_removed_es = NULL; } - /* Compute the length of data related to the section in this TS packet */ - if( p_psi->i_length - p_psi->i_current_position > TS_PACKET_SIZE - i_data_offset) - i_data_length = TS_PACKET_SIZE - i_data_offset; - else - i_data_length = p_psi->i_length - p_psi->i_current_position; + if( p_input->stream.p_newly_selected_es ) + { + input_SelectES( p_input, p_input->stream.p_newly_selected_es ); + p_input->stream.p_newly_selected_es = NULL; + } - /* Copy those data in the section buffer */ - memcpy( &p_psi->buffer[p_psi->i_current_position], &p_ts_packet->buffer[i_data_offset], - i_data_length ); + vlc_mutex_unlock( &p_input->stream.stream_lock ); - /* Interesting data are now after the ones we copied, since no gap is - * allowed between 2 sections in a TS packets */ - i_data_offset += i_data_length; + i_error = p_input->pf_read( p_input, pp_packets ); - /* Decode the packet if it is now complete */ - if (p_psi->i_length == p_psi->i_current_position + i_data_length) + /* Demultiplex read packets. */ + for( i = 0; i < p_input->i_read_once && pp_packets[i] != NULL; i++ ) { - /* Packet is complete, decode it */ - //intf_DbgMsg( "SECTION COMPLETE: starting decoding of its data\n" ); - input_PsiDecode( p_input, p_psi ); - - /* Prepare the buffer to receive a new section */ - p_psi->i_current_position = 0; - p_psi->b_running_section = 0; - - /* The new section won't be the first anymore */ - //b_first_section = 0; + p_input->pf_demux( p_input, pp_packets[i] ); } - else + + if( i_error ) { - /* Prepare the buffer to receive the next part of the section */ - p_psi->i_current_position += i_data_length; - //intf_DbgMsg( "Section not complete, waiting for the end\n" ); + if( i_error == 1 ) + { + /* End of file - we do not set b_die because only the + * interface is allowed to do so. */ + intf_WarnMsg( 3, "input: EOF reached" ); + p_input->b_eof = 1; + } + else + { + p_input->b_error = 1; + } } + } - //intf_DbgMsg( "Must loop ? Next data offset: %d, stuffing: %d\n", - // i_data_offset, p_ts_packet->buffer[i_data_offset] ); + if( p_input->b_error || p_input->b_eof ) + { + ErrorThread( p_input ); } - /* Relase the TS packet, we don't need it anymore */ - input_NetlistFreeTS( p_input, p_ts_packet ); + EndThread( p_input ); + + DestroyThread( p_input ); -#undef p_psi + intf_DbgMsg("input: Thread end"); } /***************************************************************************** - * input_ParsePES - ***************************************************************************** - * Parse a finished PES packet and analyze its header. + * InitThread: init the input Thread *****************************************************************************/ -static __inline__ void input_ParsePES( input_thread_t *p_input, - es_descriptor_t *p_es_descriptor ) +static int InitThread( input_thread_t * p_input ) { - decoder_fifo_t * p_fifo; - u8 i_pes_header_size; - ts_packet_t * p_ts; - int i_ts_payload_size; - -#define p_pes (p_es_descriptor->p_pes_packet) +#ifdef STATS + /* Initialize statistics */ + p_input->c_loops = 0; + p_input->c_bytes = 0; + p_input->c_payload_bytes = 0; + p_input->c_packets_read = 0; + p_input->c_packets_trashed = 0; +#endif - //intf_DbgMsg("End of PES packet %p\n", p_pes); + p_input->p_input_module = module_Need( MODULE_CAPABILITY_INPUT, + (probedata_t *)p_input ); - /* First read the 6 header bytes common to all PES packets: - use them to test the PES validity */ - if( (p_pes->p_pes_header[0] || p_pes->p_pes_header[1] || - (p_pes->p_pes_header[2] != 1)) || - /* packet_start_code_prefix != 0x000001 */ - ((p_pes->i_pes_real_size) && - (p_pes->i_pes_real_size != p_pes->i_pes_size)) ) - /* PES_packet_length is set and != total received payload */ + if( p_input->p_input_module == NULL ) { - /* Trash the packet and set p_pes to NULL to be sure the next PES - packet will have its b_data_lost flag set */ - intf_DbgMsg("Corrupted PES packet (size doesn't match) : trashed\n"); - input_NetlistFreePES( p_input, p_pes ); - p_pes = NULL; - /* Stats XXX?? */ + intf_ErrMsg( "input error: no suitable input module for `%s'", + p_input->p_source ); + return( -1 ); } - else - { - /* The PES packet is valid. Check its type to test if it may - carry additional informations in a header extension */ - p_pes->i_stream_id = p_pes->p_pes_header[3]; - - switch( p_pes->i_stream_id ) - { - case 0xBE: /* Padding */ - case 0xBC: /* Program stream map */ - case 0xBF: /* Private stream 2 */ - case 0xB0: /* ECM */ - case 0xB1: /* EMM */ - case 0xFF: /* Program stream directory */ - case 0xF2: /* DSMCC stream */ - case 0xF8: /* ITU-T H.222.1 type E stream */ - /* The payload begins immediatly after the 6 bytes header, so - we have finished with the parsing */ - i_pes_header_size = 6; - break; - - default: - switch( p_pes->p_pes_header[8] & 0xc0 ) - { - case 0x80: /* MPEG2: 10xx xxxx */ - case 0x00: /* FIXME: This shouldn't be allowed !! */ - /* The PES header contains at least 3 more bytes: parse them */ - p_pes->b_data_alignment = p_pes->p_pes_header[6] & 0x04; - p_pes->b_has_pts = p_pes->p_pes_header[7] & 0x80; - i_pes_header_size = p_pes->p_pes_header[8] + 9; - - /* Now parse the optional header extensions (in the limit of - the 14 bytes */ - if( p_pes->b_has_pts ) - { - pcr_descriptor_t * p_pcr; - - p_pcr = p_input->p_pcr; - p_pes->i_pts = - ( ((mtime_t)(p_pes->p_pes_header[9] & 0x0E) << 29) | - (((mtime_t)U16_AT(p_pes->p_pes_header + 10) << 14) - (1 << 14)) | - ((mtime_t)U16_AT(p_pes->p_pes_header + 12) >> 1) ) * 300; - p_pes->i_pts /= 27; +#define f p_input->p_input_module->p_functions->input.functions.input + p_input->pf_init = f.pf_init; + p_input->pf_open = f.pf_open; + p_input->pf_close = f.pf_close; + p_input->pf_end = f.pf_end; + p_input->pf_read = f.pf_read; + p_input->pf_set_area = f.pf_set_area; + p_input->pf_demux = f.pf_demux; + p_input->pf_new_packet = f.pf_new_packet; + p_input->pf_new_pes = f.pf_new_pes; + p_input->pf_delete_packet = f.pf_delete_packet; + p_input->pf_delete_pes = f.pf_delete_pes; + p_input->pf_rewind = f.pf_rewind; + p_input->pf_seek = f.pf_seek; +#undef f + p_input->pf_open( p_input ); - if( p_pcr->i_synchro_state ) - { - switch( p_pcr->i_synchro_state ) - { - case SYNCHRO_NOT_STARTED: - p_pes->b_has_pts = 0; - break; - - case SYNCHRO_START: - p_pes->i_pts += p_pcr->delta_pcr; - p_pcr->delta_absolute = mdate() - p_pes->i_pts + INPUT_PTS_DELAY; - p_pes->i_pts += p_pcr->delta_absolute; - p_pcr->i_synchro_state = 0; - break; - - case SYNCHRO_REINIT: /* We skip a PES */ - p_pes->b_has_pts = 0; - p_pcr->i_synchro_state = SYNCHRO_START; - break; - } - } - else - { - p_pes->i_pts += p_pcr->delta_pcr + p_pcr->delta_absolute; - } - } - break; - - default: /* MPEG1 or some strange thing */ - /* since this isn't supported yet, we certainly gonna crash */ - intf_ErrMsg( "FIXME: unknown PES type %.2x\n", - p_pes->p_pes_header[8] ); - i_pes_header_size = 6; - break; - - } - break; - } + if( p_input->b_error ) + { + /* We barfed -- exit nicely */ + p_input->pf_close( p_input ); + module_Unneed( p_input->p_input_module ); + return( -1 ); + } - /* Now we've parsed the header, we just have to indicate in some - * specific TS packets where the PES payload begins (renumber - * i_payload_start), so that the decoders can find the beginning - * of their data right out of the box. */ - p_ts = p_pes->p_first_ts; - i_ts_payload_size = p_ts->i_payload_end - p_ts->i_payload_start; - while( i_pes_header_size > i_ts_payload_size ) - { - /* These packets are entirely filled by the PES header. */ - i_pes_header_size -= i_ts_payload_size; - p_ts->i_payload_start = p_ts->i_payload_end; - /* Go to the next TS packet: here we won't have to test it is - * not NULL because we trash the PES packets when packet lost - * occurs */ - p_ts = p_ts->p_next_ts; - i_ts_payload_size = p_ts->i_payload_end - p_ts->i_payload_start; - } - /* This last packet is partly header, partly payload. */ - p_ts->i_payload_start += i_pes_header_size; + p_input->pf_init( p_input ); + if( p_input->b_error ) + { + /* We barfed -- exit nicely */ + p_input->pf_close( p_input ); + module_Unneed( p_input->p_input_module ); + return( -1 ); + } - /* Now we can eventually put the PES packet in the decoder's - * PES fifo */ - switch( p_es_descriptor->i_type ) - { - case MPEG1_VIDEO_ES: - case MPEG2_VIDEO_ES: - p_fifo = &(((vpar_thread_t*)(p_es_descriptor->p_dec))->fifo); - break; - - case MPEG1_AUDIO_ES: - case MPEG2_AUDIO_ES: - p_fifo = &(((adec_thread_t*)(p_es_descriptor->p_dec))->fifo); - break; - - case AC3_AUDIO_ES: - p_fifo = &(((ac3dec_thread_t *)(p_es_descriptor->p_dec))->fifo); - break; - - case LPCM_AUDIO_ES: - p_fifo = &(((lpcmdec_thread_t *)(p_es_descriptor->p_dec))->fifo); - break; - - case DVD_SPU_ES: - /* we skip the first byte at the beginning of the - * subpicture payload, it only contains the SPU ID. */ - p_ts->i_payload_start++; - p_fifo = &(((spudec_thread_t *)(p_es_descriptor->p_dec))->fifo); - break; - - default: - /* This should never happen */ - intf_DbgMsg("Unknown stream type (%d, %d): PES trashed\n", - p_es_descriptor->i_id, p_es_descriptor->i_type); - p_fifo = NULL; - break; - } + *p_input->pi_status = THREAD_READY; - if( p_fifo != NULL ) - { - vlc_mutex_lock( &p_fifo->data_lock ); - if( DECODER_FIFO_ISFULL( *p_fifo ) ) - { - /* The FIFO is full !!! This should not happen. */ -#ifdef STATS - p_input->c_packets_trashed += p_pes->i_ts_packets; - p_es_descriptor->c_invalid_packets += p_pes->i_ts_packets; -#endif - input_NetlistFreePES( p_input, p_pes ); - intf_DbgMsg("PES trashed - fifo full ! (%d, %d)\n", - p_es_descriptor->i_id, p_es_descriptor->i_type); - } - else - { - //intf_DbgMsg("Putting %p into fifo %p/%d\n", - // p_pes, p_fifo, p_fifo->i_end); - p_fifo->buffer[p_fifo->i_end] = p_pes; - DECODER_FIFO_INCEND( *p_fifo ); + return( 0 ); +} - /* Warn the decoder that it's got work to do. */ - vlc_cond_signal( &p_fifo->data_wait ); - } - vlc_mutex_unlock( &p_fifo->data_lock ); - } - else - { - intf_DbgMsg("No fifo to receive PES %p: trash\n", p_pes); -#ifdef STATS - p_input->c_packets_trashed += p_pes->i_ts_packets; - p_es_descriptor->c_invalid_packets += p_pes->i_ts_packets; -#endif - input_NetlistFreePES( p_input, p_pes ); - } +/***************************************************************************** + * ErrorThread: RunThread() error loop + ***************************************************************************** + * This function is called when an error occured during thread main's loop. + *****************************************************************************/ +static void ErrorThread( input_thread_t *p_input ) +{ + while( !p_input->b_die ) + { + /* Sleep a while */ + msleep( INPUT_IDLE_SLEEP ); } -#undef p_pes } /***************************************************************************** - * input_DemuxPES: - ***************************************************************************** - * Gather a PES packet. + * EndThread: end the input thread *****************************************************************************/ -static __inline__ void input_DemuxPES( input_thread_t *p_input, - ts_packet_t *p_ts_packet, - es_descriptor_t *p_es_descriptor, - boolean_t b_unit_start, - boolean_t b_packet_lost ) +static void EndThread( input_thread_t * p_input ) { - int i_dummy; - pes_packet_t* p_last_pes; - ts_packet_t * p_ts; - int i_ts_payload_size; + int * pi_status; /* thread status */ + /* Store status */ + pi_status = p_input->pi_status; + *pi_status = THREAD_END; -#define p_pes (p_es_descriptor->p_pes_packet) +#ifdef STATS + { + struct tms cpu_usage; + times( &cpu_usage ); - ASSERT(p_input); - ASSERT(p_ts_packet); - ASSERT(p_es_descriptor); + intf_Msg("input stats: cpu usage (user: %d, system: %d)", + cpu_usage.tms_utime, cpu_usage.tms_stime); + } +#endif - //intf_DbgMsg("PES-demultiplexing %p (%p)\n", p_ts_packet, p_pes); + /* Free all ES and destroy all decoder threads */ + input_EndStream( p_input ); - /* If we lost data, discard the PES packet we are trying to reassemble - if any and wait for the beginning of a new one in order to synchronise - again */ - if( b_packet_lost && p_pes != NULL ) - { - intf_DbgMsg("PES %p trashed because of packet lost\n", p_pes); - input_NetlistFreePES( p_input, p_pes ); - p_pes = NULL; - } + /* Free demultiplexer's data */ + p_input->pf_end( p_input ); - /* If the TS packet contains the begining of a new PES packet, and if we - were reassembling a PES packet, then the PES should be complete now, - so parse its header and give it to the decoders */ - if( b_unit_start && p_pes != NULL ) - { - /* Parse the header. The header has a variable length, but in order - to improve the algorithm, we will read the 14 bytes we may be - interested in */ - - /* If this part of the header did not fit in the current TS packet, - copy the part of the header we are interested in to the - p_pes_header_save buffer. The buffer is dynamicly allocated if - needed so it's time expensive but this situation almost never - occurs. */ - p_ts = p_pes->p_first_ts; - i_ts_payload_size = p_ts->i_payload_end - p_ts->i_payload_start; - - if(i_ts_payload_size < PES_HEADER_SIZE) - { - intf_WarnMsg(3, "Code never tested encountered, WARNING ! (benny)\n"); - if( !p_pes->p_pes_header_save ) - { - p_pes->p_pes_header_save = malloc(PES_HEADER_SIZE); - } + /* Close stream */ + p_input->pf_close( p_input ); - i_dummy = 0; - do - { - memcpy( p_pes->p_pes_header_save + i_dummy, - &p_ts->buffer[p_ts->i_payload_start], - i_ts_payload_size); - i_dummy += i_ts_payload_size; + /* Release modules */ + module_Unneed( p_input->p_input_module ); - p_ts = p_ts->p_next_ts; - if(!p_ts) - { - /* The payload of the PES packet is shorter than the 14 bytes - we would read. This means that high packet lost occured - so the PES won't be useful for any decoder. Moreover, - this should never happen so we can trash the packet and - exit roughly without regrets */ - intf_DbgMsg("PES packet too short: trashed\n"); - input_NetlistFreePES( p_input, p_pes ); - p_pes = NULL; - /* XXX: Stats */ - return; - } +} - i_ts_payload_size = p_ts->i_payload_end - p_ts->i_payload_start; - } - while(i_ts_payload_size + i_dummy < PES_HEADER_SIZE); +/***************************************************************************** + * DestroyThread: destroy the input thread + *****************************************************************************/ +static void DestroyThread( input_thread_t * p_input ) +{ + int * pi_status; /* thread status */ + + /* Store status */ + pi_status = p_input->pi_status; - /* This last TS packet is partly header, partly payload, so just - copy the header part */ - memcpy(p_pes->p_pes_header_save + i_dummy, - &p_ts->buffer[p_ts->i_payload_start], - PES_HEADER_SIZE - i_dummy); + /* Destroy Mutex locks */ + vlc_mutex_destroy( &p_input->stream.control.control_lock ); + vlc_mutex_destroy( &p_input->stream.stream_lock ); + + /* Free input structure */ + free( p_input ); - /* The header must be read in the buffer not in any TS packet */ - p_pes->p_pes_header = p_pes->p_pes_header_save; + /* Update status */ + *pi_status = THREAD_OVER; +} - /* Get the PES size if defined */ - if( (i_dummy = U16_AT(p_pes->p_pes_header + 4)) ) - { - p_pes->i_pes_real_size = i_dummy + 6; - } - } +/***************************************************************************** + * FileOpen : open a file descriptor + *****************************************************************************/ +static void FileOpen( input_thread_t * p_input ) +{ + struct stat stat_info; + int i_stat; - /* Now we have the part of the PES header we were interested in: - p_pes_header and i_pes_real_size ; we can parse it */ - input_ParsePES( p_input, p_es_descriptor ); - } + char *psz_name = p_input->p_source; - /* If we are at the beginning of a new PES packet, we must fetch a new - PES buffer to begin with the reassembly of this PES packet. This is - also here that we can synchronise with the stream if we we lost - packets or if the decoder has just started */ - if( b_unit_start ) + /* FIXME: this code ought to be in the plugin so that code can + * be shared with the *_Probe function */ + if( ( i_stat = stat( psz_name, &stat_info ) ) == (-1) ) { - p_last_pes = p_pes; + int i_size = strlen( psz_name ); - /* Get a new one PES from the PES netlist. */ - if( (p_pes = input_NetlistGetPES( p_input )) == (NULL) ) + if( ( i_size > 4 ) + && !strncasecmp( psz_name, "dvd:", 4 ) ) { - /* PES netlist is empty ! */ - p_input->b_error = 1; + /* get rid of the 'dvd:' stuff and try again */ + psz_name += 4; + i_stat = stat( psz_name, &stat_info ); } - else + else if( ( i_size > 5 ) + && !strncasecmp( psz_name, "file:", 5 ) ) { - //intf_DbgMsg("New PES packet %p (first TS: %p)\n", p_pes, p_ts_packet); - - /* Init the PES fields so that the first TS packet could be - * correctly added to the PES packet (see below) */ - p_pes->p_first_ts = p_ts_packet; - p_pes->p_last_ts = NULL; - - /* If the last pes packet was null, this means that the - * synchronization was lost and so warn the decoder that he - * will have to find a way to recover */ - if( !p_last_pes ) - p_pes->b_data_loss = 1; - - /* Read the b_random_access flag status and then reinit it */ - p_pes->b_random_access = p_es_descriptor->b_random; - p_es_descriptor->b_random = 0; + /* get rid of the 'file:' stuff and try again */ + psz_name += 5; + i_stat = stat( psz_name, &stat_info ); } - /* If the PES header fits in the first TS packet, we can - * already set p_pes->p_pes_header, and in all cases we - * set p_pes->i_pes_real_size */ - if( p_ts_packet->i_payload_end - p_ts_packet->i_payload_start - >= PES_HEADER_SIZE ) + if( i_stat == (-1) ) { - p_pes->p_pes_header = &(p_ts_packet->buffer[p_ts_packet->i_payload_start]); - if( (i_dummy = U16_AT(p_pes->p_pes_header + 4)) ) - { - p_pes->i_pes_real_size = i_dummy + 6; - } + intf_ErrMsg( "input error: cannot stat() file `%s' (%s)", + psz_name, strerror(errno)); + p_input->b_error = 1; + return; } } + vlc_mutex_lock( &p_input->stream.stream_lock ); - /* If we are synchronized with the stream, and so if we are ready to - receive correctly the data, add the TS packet to the current PES - packet */ - if( p_pes != NULL ) - { - //intf_DbgMsg("Adding TS %p to PES %p\n", p_ts_packet, p_pes); - - /* Size of the payload carried in the TS packet */ - i_ts_payload_size = p_ts_packet->i_payload_end - - p_ts_packet->i_payload_start; - - /* Update the relations between the TS packets */ - p_ts_packet->p_prev_ts = p_pes->p_last_ts; - p_ts_packet->p_next_ts = NULL; - if( p_pes->i_ts_packets != 0 ) - { - /* Regarder si il serait pas plus efficace de ne creer que - * les liens precedent->suivant pour le moment, et les - * liens suivant->precedent quand le paquet est termine */ - /* Otherwise it is the first TS packet. */ - p_pes->p_last_ts->p_next_ts = p_ts_packet; - } - /* Now add the TS to the PES packet */ - p_pes->p_last_ts = p_ts_packet; - p_pes->i_ts_packets++; - p_pes->i_pes_size += i_ts_payload_size; + /* If we are here we can control the pace... */ + p_input->stream.b_pace_control = 1; - /* Stats */ -#ifdef STATS - i_dummy = p_ts_packet->i_payload_end - p_ts_packet->i_payload_start; - p_es_descriptor->c_payload_bytes += i_dummy; + if( S_ISREG(stat_info.st_mode) || S_ISCHR(stat_info.st_mode) + || S_ISBLK(stat_info.st_mode) ) + { + p_input->stream.b_seekable = 1; + p_input->stream.p_selected_area->i_size = stat_info.st_size; + } + else if( S_ISFIFO(stat_info.st_mode) +#if !defined( SYS_BEOS ) && !defined( WIN32 ) + || S_ISSOCK(stat_info.st_mode) #endif - - /* We can check if the packet is finished */ - if( p_pes->i_pes_size == p_pes->i_pes_real_size ) - { - /* The packet is finished, parse it */ - input_ParsePES( p_input, p_es_descriptor ); - - /* Tell the Demux we have parsed this PES, no need to redo it */ - p_pes = NULL; - } + ) + { + p_input->stream.b_seekable = 0; + p_input->stream.p_selected_area->i_size = 0; } else { - /* Since we don't use the TS packet to build a PES packet, we don't - need it anymore, so give it back to the netlist */ - //intf_DbgMsg("Trashing TS %p: no PES being build\n", p_ts_packet); - input_NetlistFreeTS( p_input, p_ts_packet ); + vlc_mutex_unlock( &p_input->stream.stream_lock ); + intf_ErrMsg( "input error: unknown file type for `%s'", + psz_name ); + p_input->b_error = 1; + return; + } + + p_input->stream.p_selected_area->i_tell = 0; + vlc_mutex_unlock( &p_input->stream.stream_lock ); + + intf_WarnMsg( 1, "input: opening file `%s'", p_input->p_source ); +#ifndef WIN32 + if( (p_input->i_handle = open( psz_name, + /*O_NONBLOCK | O_LARGEFILE*/0 )) == (-1) ) +#else + if( (p_input->i_handle = open( psz_name, O_BINARY + /*O_NONBLOCK | O_LARGEFILE*/ )) == (-1) ) +#endif + { + intf_ErrMsg( "input error: cannot open file (%s)", strerror(errno) ); + p_input->b_error = 1; + return; } -#undef p_pes } /***************************************************************************** - * input_DemuxTS: first step of demultiplexing: the TS header - ***************************************************************************** - * Stream must also only contain PES and PSI, so PID must have been filtered + * FileClose : close a file descriptor *****************************************************************************/ -static __inline__ void input_DemuxTS( input_thread_t *p_input, - ts_packet_t *p_ts_packet, - es_descriptor_t *p_es_descriptor ) +static void FileClose( input_thread_t * p_input ) { - int i_dummy; - boolean_t b_adaption; /* Adaption field is present */ - boolean_t b_payload; /* Packet carries payload */ - boolean_t b_unit_start; /* A PSI or a PES start in the packet */ - boolean_t b_trash = 0; /* Must the packet be trashed ? */ - boolean_t b_lost = 0; /* Was there a packet lost ? */ - - ASSERT(p_input); - ASSERT(p_ts_packet); - ASSERT(p_es_descriptor); + intf_WarnMsg( 1, "input: closing file `%s'", p_input->p_source ); + close( p_input->i_handle ); -#define p (p_ts_packet->buffer) + return; +} - //intf_DbgMsg("input debug: TS-demultiplexing packet %p, pid %d, number %d\n", - // p_ts_packet, U16_AT(&p[1]) & 0x1fff, p[3] & 0x0f); -#ifdef STATS - p_es_descriptor->c_packets++; - p_es_descriptor->c_bytes += TS_PACKET_SIZE; -#endif +#if !defined( SYS_BEOS ) && !defined( SYS_NTO ) +/***************************************************************************** + * NetworkOpen : open a network socket + *****************************************************************************/ +static void NetworkOpen( input_thread_t * p_input ) +{ + char *psz_server = NULL; + char *psz_broadcast = NULL; + int i_port = 0; + int i_opt; + struct sockaddr_in sock; - /* Extract flags values from TS common header. */ - b_unit_start = (p[1] & 0x40); - b_adaption = (p[3] & 0x20); - b_payload = (p[3] & 0x10); +#ifdef WIN32 + /* WinSock Library Init. */ + WSADATA Data; + int i_err = WSAStartup( MAKEWORD( 1, 1 ), &Data ); - /* Extract adaption field informations if any */ - if( !b_adaption ) + if( i_err ) { - /* We don't have any adaptation_field, so payload start immediately - after the 4 byte TS header */ - p_ts_packet->i_payload_start = 4; + intf_ErrMsg( "input: can't initiate WinSocks, error %i", i_err ); + return ; } - else +#endif + + /* Get the remote server */ + if( p_input->p_source != NULL ) { - /* p[4] is adaptation_field_length minus one */ - p_ts_packet->i_payload_start = 5 + p[4]; + psz_server = p_input->p_source; + + /* Skip the protocol name */ + while( *psz_server && *psz_server != ':' ) + { + psz_server++; + } + + /* Skip the "://" part */ + while( *psz_server && (*psz_server == ':' || *psz_server == '/') ) + { + psz_server++; + } - /* The adaption field can be limited to the adaptation_field_length byte, - so that there is nothing to do: skip this possibility */ - if( p[4] ) + /* Found a server name */ + if( *psz_server ) { - /* If the packet has both adaptation_field and payload, adaptation_field - cannot be more than 182 bytes long; if there is only an - adaptation_field, it must fill the next 183 bytes. */ - if( b_payload ? (p[4] > 182) : (p[4] != 183) ) + char *psz_port = psz_server; + + /* Skip the hostname part */ + while( *psz_port && *psz_port != ':' ) { - intf_DbgMsg("input debug: invalid TS adaptation field (%p)\n", - p_ts_packet); -#ifdef STATS - p_es_descriptor->c_invalid_packets++; -#endif - b_trash = 1; + psz_port++; } - /* No we are sure that the byte containing flags is present: read it */ - else + /* Found a port name */ + if( *psz_port ) { - /* discontinuity_indicator */ - if( p[5] & 0x80 ) - { - intf_DbgMsg("discontinuity_indicator encountered by TS demux " \ - "(position read: %d, saved: %d)\n", p[5] & 0x80, - p_es_descriptor->i_continuity_counter); + /* Replace ':' with '\0' */ + *psz_port = '\0'; + psz_port++; - /* If the PID carries the PCR, there will be a system time-base - discontinuity. We let the PCR decoder handle that. */ - p_es_descriptor->b_discontinuity = 1; - - /* There also may be a continuity_counter discontinuity: - resynchronise our counter with the one of the stream */ - p_es_descriptor->i_continuity_counter = (p[3] & 0x0f) - 1; + psz_broadcast = psz_port; + while( *psz_broadcast && *psz_broadcast != ':' ) + { + psz_broadcast++; } - /* random_access_indicator */ - p_es_descriptor->b_random |= p[5] & 0x40; - - /* If this is a PCR_PID, and this TS packet contains a PCR, - we pass it along to the PCR decoder. */ - if( (p_es_descriptor->b_pcr) && (p[5] & 0x10) ) + if( *psz_broadcast ) { - /* There should be a PCR field in the packet, check if the - adaption field is long enough to carry it */ - if( p[4] >= 7 ) + *psz_broadcast = '\0'; + psz_broadcast++; + while( *psz_broadcast && *psz_broadcast == ':' ) { - /* Call the PCR decoder */ - input_PcrDecode( p_input, p_es_descriptor, &p[6] ); + psz_broadcast++; } } - } - } - } + else + { + psz_broadcast = NULL; + } - /* Check the continuity of the stream. */ - i_dummy = ((p[3] & 0x0f) - p_es_descriptor->i_continuity_counter) & 0x0f; - if( i_dummy == 1 ) - { - /* Everything is ok, just increase our counter */ - p_es_descriptor->i_continuity_counter++; - } - else - { - if( !b_payload && i_dummy == 0 ) - { - /* This is a packet without payload, this is allowed by the draft - As there is nothing interesting in this packet (except PCR that - have already been handled), we can trash the packet. */ - intf_DbgMsg("Packet without payload received by TS demux\n"); - b_trash = 1; - } - else if( i_dummy <= 0 ) - { - /* Duplicate packet: mark it as being to be trashed. */ - intf_DbgMsg("Duplicate packet received by TS demux\n"); - b_trash = 1; - } - else if( p_es_descriptor->i_continuity_counter == 0xFF ) - { - /* This means that the packet is the first one we receive for this - ES since the continuity counter ranges between 0 and 0x0F - excepts when it has been initialized by the input: Init the - counter to the correct value. */ - intf_DbgMsg("First packet for PID %d received by TS demux\n", - p_es_descriptor->i_id); - p_es_descriptor->i_continuity_counter = (p[3] & 0x0f); + /* port before broadcast address */ + if( *psz_port != ':' ) + { + i_port = atoi( psz_port ); + } + } } else { - /* This can indicate that we missed a packet or that the - continuity_counter wrapped and we received a dup packet: as we - don't know, do as if we missed a packet to be sure to recover - from this situation */ - intf_DbgMsg("Packet lost by TS demux: current %d, packet %d\n", - p_es_descriptor->i_continuity_counter & 0x0f, - p[3] & 0x0f); - b_lost = 1; - p_es_descriptor->i_continuity_counter = p[3] & 0x0f; + psz_server = NULL; } } - /* Trash the packet if it has no payload or if it is bad */ - if( b_trash ) + /* Check that we got a valid server */ + if( psz_server == NULL ) { - input_NetlistFreeTS( p_input, p_ts_packet ); -#ifdef STATS - p_input->c_packets_trashed++; -#endif - } - else - { - if( p_es_descriptor->b_psi ) - { - /* The payload contains PSI tables */ - input_DemuxPSI( p_input, p_ts_packet, p_es_descriptor, - b_unit_start, b_lost ); - } - else - { - /* The payload carries a PES stream */ - input_DemuxPES( p_input, p_ts_packet, p_es_descriptor, - b_unit_start, b_lost ); - } + psz_server = main_GetPszVariable( INPUT_SERVER_VAR, + INPUT_SERVER_DEFAULT ); } -#undef p -} - -/***************************************************************************** - * input_SortPacket: find out whether we need that packet - *****************************************************************************/ -static __inline__ void input_SortPacket( input_thread_t *p_input, - ts_packet_t *p_ts_packet ) -{ - int i_current_pid; - int i_es_loop; - - /* Verify that sync_byte, error_indicator and scrambling_control are - what we expected. */ - if( !(p_ts_packet->buffer[0] == 0x47) || (p_ts_packet->buffer[1] & 0x80) || - (p_ts_packet->buffer[3] & 0xc0) ) + /* Check that we got a valid port */ + if( i_port == 0 ) { - intf_DbgMsg("input debug: invalid TS header (%p)\n", p_ts_packet); + i_port = main_GetIntVariable( INPUT_PORT_VAR, INPUT_PORT_DEFAULT ); } - else - { - /* Get the PID of the packet. Note that ntohs is needed, for endianness - purposes (see man page). */ - i_current_pid = U16_AT(&p_ts_packet->buffer[1]) & 0x1fff; - - //intf_DbgMsg("input debug: pid %d received (%p)\n", - // i_current_pid, p_ts_packet); - /* Lock current ES state. */ - vlc_mutex_lock( &p_input->es_lock ); - - /* Verify that we actually want this PID. */ - for( i_es_loop = 0; i_es_loop < INPUT_MAX_SELECTED_ES; i_es_loop++ ) + if( psz_broadcast == NULL ) + { + /* Are we broadcasting ? */ + if( main_GetIntVariable( INPUT_BROADCAST_VAR, + INPUT_BROADCAST_DEFAULT ) ) { - if( p_input->pp_selected_es[i_es_loop] != NULL) - { - if( (*p_input->pp_selected_es[i_es_loop]).i_id - == i_current_pid ) - { - /* Don't need the lock anymore, since the value pointed - out by p_input->pp_selected_es[i_es_loop] can only be - modified from inside the input_thread (by the PSI - decoder): interface thread is only allowed to modify - the pp_selected_es table */ - vlc_mutex_unlock( &p_input->es_lock ); - - /* We're interested. Pass it to the demultiplexer. */ - input_DemuxTS( p_input, p_ts_packet, - p_input->pp_selected_es[i_es_loop] ); - return; - } - } - else - { - /* pp_selected_es should not contain any hole. */ - break; - } + psz_broadcast = main_GetPszVariable( INPUT_BCAST_ADDR_VAR, + INPUT_BCAST_ADDR_DEFAULT ); + } + else + { + psz_broadcast = NULL; } - vlc_mutex_unlock( &p_input->es_lock ); - } - - /* We weren't interested in receiving this packet. Give it back to the - netlist. */ - //intf_DbgMsg("SortPacket: freeing unwanted TS %p (pid %d)\n", p_ts_packet, - // U16_AT(&p_ts_packet->buffer[1]) & 0x1fff); - input_NetlistFreeTS( p_input, p_ts_packet ); -#ifdef STATS - p_input->c_packets_trashed++; -#endif -} - -/***************************************************************************** - * input_ReadPacket: reads a packet from the network or the file - *****************************************************************************/ -static __inline__ int input_ReadPacket( input_thread_t *p_input ) -{ - int i_base_index; /* index of the first free iovec */ - int i_current_index; - int i_packet_size; -#ifdef INPUT_LIFO_TS_NETLIST - int i_meanwhile_released; - int i_currently_removed; -#endif - ts_packet_t * p_ts_packet; - - /* In this function, we only care about the TS netlist. PES netlist - * is for the demultiplexer. */ -#ifdef INPUT_LIFO_TS_NETLIST - i_base_index = p_input->netlist.i_ts_index; - - /* Verify that we still have packets in the TS netlist */ - if( (INPUT_MAX_TS + INPUT_TS_READ_ONCE - 1 - p_input->netlist.i_ts_index) <= INPUT_TS_READ_ONCE ) - { - intf_ErrMsg("input error: TS netlist is empty !\n"); - return( -1 ); - } - -#else /* FIFO netlist */ - i_base_index = p_input->netlist.i_ts_start; - if( p_input->netlist.i_ts_start + INPUT_TS_READ_ONCE -1 > INPUT_MAX_TS ) - { - /* The netlist is split in 2 parts. We must gather them to consolidate - the FIFO (we make the loop easily in having the same iovec at the far - end and in the beginning of netlist_free). - That's why the netlist is (INPUT_MAX_TS +1) + (INPUT_TS_READ_ONCE -1) - large. */ - memcpy( p_input->netlist.p_ts_free + INPUT_MAX_TS + 1, - p_input->netlist.p_ts_free, - (p_input->netlist.i_ts_start + INPUT_TS_READ_ONCE - 1 - INPUT_MAX_TS) - * sizeof(struct iovec) ); - } - - /* Verify that we still have packets in the TS netlist */ - if( ((p_input->netlist.i_ts_end -1 - p_input->netlist.i_ts_start) & INPUT_MAX_TS) <= INPUT_TS_READ_ONCE ) - { - intf_ErrMsg("input error: TS netlist is empty !\n"); - return( -1 ); } -#endif /* FIFO netlist */ - /* Scatter read the buffer. */ - i_packet_size = (*p_input->p_Read)( p_input, - &p_input->netlist.p_ts_free[i_base_index], - INPUT_TS_READ_ONCE ); - if( i_packet_size == (-1) ) - { -#if 0 - intf_DbgMsg("Read packet %d %p %d %d\n", i_base_index, - &p_input->netlist.p_ts_free[i_base_index], - p_input->netlist.i_ts_start, - p_input->netlist.i_ts_end); -#endif - intf_ErrMsg("input error: readv() failed (%s)\n", strerror(errno)); - return( -1 ); - } + intf_WarnMsg( 2, "input: server: %s port: %d broadcast: %s", + psz_server, i_port, psz_broadcast ); - if( i_packet_size == 0 ) + /* Open a SOCK_DGRAM (UDP) socket, in the AF_INET domain, automatic (0) + * protocol */ + p_input->i_handle = socket( AF_INET, SOCK_DGRAM, 0 ); + if( p_input->i_handle == -1 ) { - /* No packet has been received, so stop here. */ - return( 0 ); + intf_ErrMsg("input error: can't create socket : %s", strerror(errno)); + p_input->b_error = 1; + return; } - /* Demultiplex the TS packets (1..INPUT_TS_READ_ONCE) received. */ - for( i_current_index = i_base_index; - (i_packet_size -= TS_PACKET_SIZE) >= 0; - i_current_index++ ) + /* We may want to reuse an already used socket */ + i_opt = 1; + if( setsockopt( p_input->i_handle, SOL_SOCKET, SO_REUSEADDR, + &i_opt, sizeof( i_opt ) ) == -1 ) { - /* BTW, something REALLY bad could happen if we receive packets with - a wrong size. */ - p_ts_packet = (ts_packet_t*)(p_input->netlist.p_ts_free[i_current_index].iov_base); - /* Don't cry :-), we are allowed to do that cast, because initially, - our buffer was malloc'ed with sizeof(ts_packet_t) */ - - /* Find out if we need this packet and demultiplex. */ - input_SortPacket( p_input /* for current PIDs and netlist */, - p_ts_packet); + intf_ErrMsg( "input error: can't configure socket (SO_REUSEADDR: %s)", + strerror(errno)); + close( p_input->i_handle ); + p_input->b_error = 1; + return; } - if( i_packet_size > 0 ) + /* Increase the receive buffer size to 1/2MB (8Mb/s during 1/2s) to avoid + * packet loss caused by scheduling problems */ + i_opt = 0x80000; + if( setsockopt( p_input->i_handle, SOL_SOCKET, SO_RCVBUF, + &i_opt, sizeof( i_opt ) ) == -1 ) { - intf_ErrMsg("input error: wrong size\n"); - return( -1 ); + intf_ErrMsg( "input error: can't configure socket (SO_RCVBUF: %s)", + strerror(errno)); + close( p_input->i_handle ); + p_input->b_error = 1; + return; } - /* Remove the TS packets we have just filled from the netlist */ -#ifdef INPUT_LIFO_TS_NETLIST - /* We need to take a lock here while we're calculating index positions. */ - vlc_mutex_lock( &p_input->netlist.lock ); - - i_meanwhile_released = i_base_index - p_input->netlist.i_ts_index; - if( i_meanwhile_released ) + /* Build the local socket */ + if ( network_BuildLocalAddr( &sock, i_port, psz_broadcast ) == -1 ) { - /* That's where it becomes funny :-). Since we didn't take locks for - efficiency reasons, other threads (including ourselves, with - input_DemuxPacket) might have released packets to the netlist. - So we have to copy these iovec where they should go. - - BTW, that explains why the TS netlist is - (INPUT_MAX_TS +1) + (TS_READ_ONCE -1) large. */ - - i_currently_removed = i_current_index - i_base_index; - if( i_meanwhile_released < i_currently_removed ) - { - /* Copy all iovecs in that case */ - memcpy( &p_input->netlist.p_ts_free[p_input->netlist.i_ts_index] - + i_currently_removed, - &p_input->netlist.p_ts_free[p_input->netlist.i_ts_index], - i_meanwhile_released * sizeof(struct iovec) ); - } - else - { - /* We have fewer places than items, so we only move - i_currently_removed of them. */ - memcpy( &p_input->netlist.p_ts_free[i_base_index], - &p_input->netlist.p_ts_free[p_input->netlist.i_ts_index], - i_currently_removed * sizeof(struct iovec) ); - } - - /* Update i_netlist_index with the information gathered above. */ - p_input->netlist.i_ts_index += i_currently_removed; + intf_ErrMsg( "input error: can't build local address" ); + close( p_input->i_handle ); + p_input->b_error = 1; + return; } - else + + /* Bind it */ + if( bind( p_input->i_handle, (struct sockaddr *)&sock, + sizeof( sock ) ) < 0 ) { - /* Nothing happened. */ - p_input->netlist.i_ts_index = i_current_index; - } - - vlc_mutex_unlock( &p_input->netlist.lock ); - -#else /* FIFO netlist */ - /* & is modulo ; that's where we make the loop. */ - p_input->netlist.i_ts_start = i_current_index & INPUT_MAX_TS; -#endif - -#ifdef STATS - p_input->c_packets_read += i_current_index - i_base_index; - p_input->c_bytes += (i_current_index - i_base_index) * TS_PACKET_SIZE; -#endif - return( 0 ); -} - -/***************************************************************************** - * RunThread: main thread loop - ***************************************************************************** - * Thread in charge of processing the network packets and demultiplexing. - *****************************************************************************/ -static void RunThread( input_thread_t *p_input ) -{ - /* - * Initialize thread and free configuration - */ - p_input->b_error = InitThread( p_input ); - if( p_input->b_error ) - { - free( p_input ); /* destroy descriptor */ + intf_ErrMsg("input error: can't bind socket (%s)", strerror(errno)); + close( p_input->i_handle ); + p_input->b_error = 1; return; } - /* - * Main loop - */ - intf_DbgMsg("\n"); - while( !p_input->b_die && !p_input->b_error ) + /* Build socket for remote connection */ + if ( network_BuildRemoteAddr( &sock, psz_server ) == -1 ) { - /* Scatter read the UDP packet from the network or the file. */ - if( (input_ReadPacket( p_input )) == (-1) ) - { - /* FIXME??: Normally, a thread can't kill itself, but we don't have - * any method in case of an error condition ... */ - p_input->b_error = 1; - } - -#ifdef STATS - p_input->c_loops++; -#endif + intf_ErrMsg( "input error: can't build remote address" ); + close( p_input->i_handle ); + p_input->b_error = 1; + return; } - /* - * Error loop - */ - if( p_input->b_error ) + /* And connect it ... should we really connect ? */ + if( connect( p_input->i_handle, (struct sockaddr *) &sock, + sizeof( sock ) ) == (-1) ) { - ErrorThread( p_input ); + intf_ErrMsg( "input error: can't connect socket, %s", + strerror(errno) ); + close( p_input->i_handle ); + p_input->b_error = 1; + return; } - /* End of thread */ - EndThread( p_input ); - intf_DbgMsg("thread end\n"); -} + /* We can't pace control, but FIXME : bug in meuuh's code to sync PCR + * with the server. */ + p_input->stream.b_pace_control = 0; + p_input->stream.b_seekable = 0; - -/***************************************************************************** - * ErrorThread: RunThread() error loop - ***************************************************************************** - * This function is called when an error occured during thread main's loop. - *****************************************************************************/ -static void ErrorThread( input_thread_t *p_input ) -{ - /* Wait until a `die' order */ - intf_DbgMsg("\n"); - while( !p_input->b_die ) - { - /* Sleep a while */ - msleep( VOUT_IDLE_SLEEP ); - } + intf_WarnMsg( 3, "input: successfully opened network mode" ); + + return; } /***************************************************************************** - * EndThread: end the input thread + * NetworkClose : close a network socket *****************************************************************************/ -static void EndThread( input_thread_t * p_input ) +static void NetworkClose( input_thread_t * p_input ) { - int * pi_status; /* threas status */ - int i_es_loop; /* es index */ + close( p_input->i_handle ); - /* Store status */ - intf_DbgMsg("\n"); - pi_status = p_input->pi_status; - *pi_status = THREAD_END; - - /* Close input method */ - p_input->p_Close( p_input ); - - /* Destroy all decoder threads */ - for( i_es_loop = 0; - (i_es_loop < INPUT_MAX_ES) && (p_input->pp_selected_es[i_es_loop] != NULL) ; - i_es_loop++ ) - { - switch( p_input->pp_selected_es[i_es_loop]->i_type ) - { - case MPEG1_VIDEO_ES: - case MPEG2_VIDEO_ES: - vpar_DestroyThread( (vpar_thread_t*)(p_input->pp_selected_es[i_es_loop]->p_dec) /*, NULL */ ); - break; - case MPEG1_AUDIO_ES: - case MPEG2_AUDIO_ES: - adec_DestroyThread( (adec_thread_t*)(p_input->pp_selected_es[i_es_loop]->p_dec) ); - break; - case AC3_AUDIO_ES: - ac3dec_DestroyThread( (ac3dec_thread_t *)(p_input->pp_selected_es[i_es_loop]->p_dec) ); - break; - case LPCM_AUDIO_ES: - lpcmdec_DestroyThread((lpcmdec_thread_t *)(p_input->pp_selected_es[i_es_loop]->p_dec) ); - break; - case DVD_SPU_ES: - spudec_DestroyThread( (spudec_thread_t *)(p_input->pp_selected_es[i_es_loop]->p_dec) ); - break; - case 0: - /* Special streams for the PSI decoder, PID 0 and 1 */ - break; -#ifdef DEBUG - default: - intf_DbgMsg("error: unknown decoder type %d\n", p_input->pp_selected_es[i_es_loop]->i_type ); - break; +#ifdef WIN32 + WSACleanup(); #endif - } - } - - input_NetlistEnd( p_input ); /* clean netlist */ - input_PsiEnd( p_input ); /* clean PSI information */ - input_PcrEnd( p_input ); /* clean PCR information */ - free( p_input ); /* free input_thread structure */ - /* Update status */ - *pi_status = THREAD_OVER; } +#endif