mirror of
https://github.com/videolan/vlc.git
synced 2024-12-02 22:33:27 +08:00
et paf ! n'a pu les sales fichiers .new
This commit is contained in:
Sam Hocevar
parent
85ae4a075d
commit
f6cca5c7e8
@ -1,74 +0,0 @@
|
||||
/*****************************************************************************
|
||||
* video_decoder.h : video decoder thread
|
||||
* (c)1999 VideoLAN
|
||||
*****************************************************************************
|
||||
*****************************************************************************
|
||||
* Requires:
|
||||
* "config.h"
|
||||
* "common.h"
|
||||
* "mtime.h"
|
||||
* "vlc_thread.h"
|
||||
* "input.h"
|
||||
* "video.h"
|
||||
* "video_output.h"
|
||||
* "decoder_fifo.h"
|
||||
*****************************************************************************/
|
||||
|
||||
/*****************************************************************************
|
||||
* vdec_thread_t: video decoder thread descriptor
|
||||
*****************************************************************************
|
||||
* ??
|
||||
*****************************************************************************/
|
||||
typedef struct vdec_thread_s
|
||||
{
|
||||
/* Thread properties and locks */
|
||||
boolean_t b_die; /* `die' flag */
|
||||
boolean_t b_run; /* `run' flag */
|
||||
boolean_t b_error; /* `error' flag */
|
||||
boolean_t b_active; /* `active' flag */
|
||||
vlc_thread_t thread_id; /* id for thread functions */
|
||||
|
||||
/* Thread configuration */
|
||||
/* ?? */
|
||||
/*??*/
|
||||
// int *pi_status;
|
||||
|
||||
/* idct iformations */
|
||||
dctelem_t p_pre_idct[64*64];
|
||||
|
||||
/* Input properties */
|
||||
struct vpar_thread_s * p_vpar; /* video_parser thread */
|
||||
|
||||
/* Lookup tables */
|
||||
//#ifdef MPEG2_COMPLIANT
|
||||
u8 pi_crop_buf[VDEC_CROPRANGE];
|
||||
u8 * pi_crop;
|
||||
//#endif
|
||||
|
||||
#ifdef STATS
|
||||
/* Statistics */
|
||||
count_t c_loops; /* number of loops */
|
||||
count_t c_idle_loops; /* number of idle loops */
|
||||
count_t c_decoded_pictures; /* number of pictures decoded */
|
||||
count_t c_decoded_i_pictures; /* number of I pictures decoded */
|
||||
count_t c_decoded_p_pictures; /* number of P pictures decoded */
|
||||
count_t c_decoded_b_pictures; /* number of B pictures decoded */
|
||||
#endif
|
||||
} vdec_thread_t;
|
||||
|
||||
/*****************************************************************************
|
||||
* Function pointers
|
||||
*****************************************************************************/
|
||||
typedef void (*f_addb_t)( vdec_thread_t *, dctelem_t*, yuv_data_t*, int );
|
||||
|
||||
/*****************************************************************************
|
||||
* Prototypes
|
||||
*****************************************************************************/
|
||||
struct vpar_thread_s;
|
||||
|
||||
/* Thread management functions */
|
||||
vdec_thread_t * vdec_CreateThread ( struct vpar_thread_s *p_vpar /*, int *pi_status */ );
|
||||
void vdec_DestroyThread ( vdec_thread_t *p_vdec /*, int *pi_status */ );
|
||||
void vdec_AddBlock( vdec_thread_t *, dctelem_t*, yuv_data_t*, int );
|
||||
void vdec_CopyBlock( vdec_thread_t *, dctelem_t*, yuv_data_t*, int );
|
||||
void vdec_DummyBlock( vdec_thread_t *, dctelem_t*, yuv_data_t*, int );
|
||||
@ -1,93 +0,0 @@
|
||||
/*******************************************************************************
|
||||
* vlc.h: all headers
|
||||
* (c)1998 VideoLAN
|
||||
*******************************************************************************
|
||||
* This header includes all vlc .h headers and depending headers. A source file
|
||||
* including it would also be able to use any of the structures of the project.
|
||||
* Note that functions or system headers specific to the file itself are not
|
||||
* included.
|
||||
*******************************************************************************
|
||||
* required headers:
|
||||
* none
|
||||
*******************************************************************************/
|
||||
|
||||
/* System headers */
|
||||
#include <errno.h>
|
||||
#include <fcntl.h>
|
||||
#include <getopt.h>
|
||||
#include <signal.h>
|
||||
#include <stdarg.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <unistd.h>
|
||||
|
||||
#include <arpa/inet.h>
|
||||
|
||||
#include <net/if.h>
|
||||
|
||||
#include <netinet/in.h>
|
||||
|
||||
#include <sys/ioctl.h>
|
||||
#include <sys/shm.h>
|
||||
#include <sys/soundcard.h>
|
||||
#include <sys/uio.h>
|
||||
|
||||
#include <X11/Xlib.h>
|
||||
#include <X11/Xutil.h>
|
||||
#include <X11/Xatom.h>
|
||||
#include <X11/extensions/XShm.h>
|
||||
#include <X11/extensions/xf86dga.h>
|
||||
|
||||
|
||||
|
||||
/* Common headers */
|
||||
#include "config.h"
|
||||
#include "common.h"
|
||||
#include "mtime.h"
|
||||
#include "vlc_thread.h"
|
||||
#include "netutils.h"
|
||||
#include "debug.h"
|
||||
#include "intf_msg.h"
|
||||
|
||||
/* Input */
|
||||
#include "input.h"
|
||||
#include "input_psi.h"
|
||||
#include "input_pcr.h"
|
||||
#include "input_netlist.h"
|
||||
#include "input_vlan.h"
|
||||
#include "decoder_fifo.h"
|
||||
#include "input_file.h"
|
||||
#include "input_network.h"
|
||||
#include "input_ctrl.h"
|
||||
|
||||
/* Audio */
|
||||
#include "audio_output.h"
|
||||
#include "audio_decoder.h"
|
||||
#include "ac3_decoder.h"
|
||||
|
||||
/* Video */
|
||||
#include "video.h"
|
||||
#include "video_output.h"
|
||||
|
||||
#include "vdec_idct.h"
|
||||
#include "video_decoder.h"
|
||||
#include "vdec_motion.h"
|
||||
|
||||
#include "vpar_blocks.h"
|
||||
#include "vpar_headers.h"
|
||||
#include "video_fifo.h"
|
||||
#include "vpar_synchro.h"
|
||||
#include "video_parser.h"
|
||||
|
||||
|
||||
/* Interface */
|
||||
#include "intf_cmd.h"
|
||||
#include "intf_ctrl.h"
|
||||
#include "intf_sys.h"
|
||||
#include "intf_console.h"
|
||||
#include "interface.h"
|
||||
|
||||
#include "main.h"
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,282 +0,0 @@
|
||||
/*******************************************************************************
|
||||
* input_ctrl.c: Decodeur control
|
||||
* (c)1999 VideoLAN
|
||||
*******************************************************************************
|
||||
* Control the extraction and the decoding of the programs elements carried in
|
||||
* a stream.
|
||||
*******************************************************************************/
|
||||
|
||||
/*******************************************************************************
|
||||
* Preamble
|
||||
*******************************************************************************/
|
||||
|
||||
#include "vlc.h"
|
||||
|
||||
#if 0
|
||||
#include <errno.h>
|
||||
#include <sys/uio.h> /* iovec */
|
||||
#include <stdlib.h> /* atoi(), malloc(), free() */
|
||||
#include <string.h>
|
||||
#include <stdio.h>
|
||||
#include <unistd.h>
|
||||
|
||||
#include <X11/Xlib.h>
|
||||
#include <X11/extensions/XShm.h>
|
||||
#include <sys/soundcard.h>
|
||||
#include <netinet/in.h> /* ntohs */
|
||||
|
||||
#include "common.h"
|
||||
#include "config.h"
|
||||
#include "mtime.h"
|
||||
#include "vlc_thread.h"
|
||||
#include "intf_msg.h"
|
||||
#include "debug.h"
|
||||
|
||||
#include "input.h"
|
||||
#include "input_netlist.h"
|
||||
|
||||
#include "decoder_fifo.h"
|
||||
|
||||
#include "audio_output.h"
|
||||
#include "audio_dsp.h"
|
||||
#include "audio_decoder.h"
|
||||
|
||||
#include "video.h"
|
||||
#include "video_output.h"
|
||||
#include "video_decoder.h"
|
||||
#endif
|
||||
|
||||
/******************************************************************************
|
||||
* input_AddPgrmElem: Start the extraction and the decoding of a program element
|
||||
******************************************************************************
|
||||
* Add the element given by its PID in the list of PID to extract and spawn
|
||||
* the decoding thread.
|
||||
* This function only modifies the table of selected es, but must NOT modify
|
||||
* the table of ES itself.
|
||||
******************************************************************************/
|
||||
int input_AddPgrmElem( input_thread_t *p_input, int i_current_id )
|
||||
{
|
||||
int i_es_loop, i_selected_es_loop;
|
||||
|
||||
/* Since this function is intended to be called by interface, lock the
|
||||
* elementary stream structure. */
|
||||
vlc_mutex_lock( &p_input->es_lock );
|
||||
|
||||
/* Find out which PID we need. */
|
||||
for( i_es_loop = 0; i_es_loop < INPUT_MAX_ES; i_es_loop++ )
|
||||
{
|
||||
if( p_input->p_es[i_es_loop].i_id == i_current_id )
|
||||
{
|
||||
if( p_input->p_es[i_es_loop].p_dec != NULL )
|
||||
{
|
||||
/* We already have a decoder for that PID. */
|
||||
vlc_mutex_unlock( &p_input->es_lock );
|
||||
intf_ErrMsg("input error: PID %d already selected\n",
|
||||
i_current_id);
|
||||
return( -1 );
|
||||
}
|
||||
|
||||
intf_DbgMsg("Requesting selection of PID %d\n",
|
||||
i_current_id);
|
||||
|
||||
/* Find a free spot in pp_selected_es. */
|
||||
for( i_selected_es_loop = 0; p_input->pp_selected_es[i_selected_es_loop] != NULL
|
||||
&& i_selected_es_loop < INPUT_MAX_SELECTED_ES; i_selected_es_loop++ );
|
||||
|
||||
if( i_selected_es_loop == INPUT_MAX_SELECTED_ES )
|
||||
{
|
||||
/* array full */
|
||||
vlc_mutex_unlock( &p_input->es_lock );
|
||||
intf_ErrMsg("input error: MAX_SELECTED_ES reached: try increasing it in config.h\n");
|
||||
return( -1 );
|
||||
}
|
||||
|
||||
/* Don't decode PSI streams ! */
|
||||
if( p_input->p_es[i_es_loop].b_psi )
|
||||
{
|
||||
intf_ErrMsg("input_error: trying to decode PID %d which is the one of a PSI\n", i_current_id);
|
||||
vlc_mutex_unlock( &p_input->es_lock );
|
||||
return( -1 );
|
||||
}
|
||||
else
|
||||
{
|
||||
/* Spawn the decoder. */
|
||||
switch( p_input->p_es[i_es_loop].i_type )
|
||||
{
|
||||
case AC3_AUDIO_ES:
|
||||
/* Spawn ac3 thread */
|
||||
if ( ((ac3dec_thread_t *)(p_input->p_es[i_es_loop].p_dec) =
|
||||
ac3dec_CreateThread(p_input)) == NULL )
|
||||
{
|
||||
intf_ErrMsg( "Could not start ac3 decoder\n" );
|
||||
vlc_mutex_unlock( &p_input->es_lock );
|
||||
return( -1 );
|
||||
}
|
||||
break;
|
||||
|
||||
case MPEG1_AUDIO_ES:
|
||||
case MPEG2_AUDIO_ES:
|
||||
/* Spawn audio thread. */
|
||||
if( ((adec_thread_t*)(p_input->p_es[i_es_loop].p_dec) =
|
||||
adec_CreateThread( p_input )) == NULL )
|
||||
{
|
||||
intf_ErrMsg("Could not start audio decoder\n");
|
||||
vlc_mutex_unlock( &p_input->es_lock );
|
||||
return( -1 );
|
||||
}
|
||||
break;
|
||||
|
||||
case MPEG1_VIDEO_ES:
|
||||
case MPEG2_VIDEO_ES:
|
||||
/* Spawn video thread. */
|
||||
/* Les 2 pointeurs NULL ne doivent pas etre NULL sinon on segfault !!!! */
|
||||
if( ((vpar_thread_t*)(p_input->p_es[i_es_loop].p_dec) =
|
||||
vpar_CreateThread( p_input )) == NULL )
|
||||
{
|
||||
intf_ErrMsg("Could not start video parser\n");
|
||||
vlc_mutex_unlock( &p_input->es_lock );
|
||||
return( -1 );
|
||||
}
|
||||
break;
|
||||
|
||||
default:
|
||||
/* That should never happen. */
|
||||
intf_DbgMsg("input error: unknown stream type (0x%.2x)\n",
|
||||
p_input->p_es[i_es_loop].i_type);
|
||||
vlc_mutex_unlock( &p_input->es_lock );
|
||||
return( -1 );
|
||||
break;
|
||||
}
|
||||
|
||||
/* Initialise the demux */
|
||||
p_input->p_es[i_es_loop].p_pes_packet = NULL;
|
||||
p_input->p_es[i_es_loop].i_continuity_counter = 0xFF;
|
||||
p_input->p_es[i_es_loop].b_random = 0;
|
||||
|
||||
/* Mark stream to be demultiplexed. */
|
||||
intf_DbgMsg("Stream %d added in %d\n", i_current_id, i_selected_es_loop);
|
||||
p_input->pp_selected_es[i_selected_es_loop] = &p_input->p_es[i_es_loop];
|
||||
vlc_mutex_unlock( &p_input->es_lock );
|
||||
return( 0 );
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* We haven't found this PID in the current stream. */
|
||||
vlc_mutex_unlock( &p_input->es_lock );
|
||||
intf_ErrMsg("input error: can't find PID %d\n", i_current_id);
|
||||
return( -1 );
|
||||
}
|
||||
|
||||
/******************************************************************************
|
||||
* input_DelPgrmElem: Stop the decoding of a program element
|
||||
******************************************************************************
|
||||
* Stop the extraction of the element given by its PID and kill the associated
|
||||
* decoder thread
|
||||
* This function only modifies the table of selected es, but must NOT modify
|
||||
* the table of ES itself.
|
||||
******************************************************************************/
|
||||
int input_DelPgrmElem( input_thread_t *p_input, int i_current_id )
|
||||
{
|
||||
int i_selected_es_loop, i_last_selected;
|
||||
|
||||
/* Since this function is intended to be called by interface, lock the
|
||||
structure. */
|
||||
vlc_mutex_lock( &p_input->es_lock );
|
||||
|
||||
/* Find out which PID we need. */
|
||||
for( i_selected_es_loop = 0; i_selected_es_loop < INPUT_MAX_SELECTED_ES;
|
||||
i_selected_es_loop++ )
|
||||
{
|
||||
if( p_input->pp_selected_es[i_selected_es_loop] )
|
||||
{
|
||||
if( p_input->pp_selected_es[i_selected_es_loop]->i_id == i_current_id )
|
||||
{
|
||||
if( !(p_input->pp_selected_es[i_selected_es_loop]->p_dec) )
|
||||
{
|
||||
/* We don't have a decoder for that PID. */
|
||||
vlc_mutex_unlock( &p_input->es_lock );
|
||||
intf_ErrMsg("input error: PID %d already deselected\n",
|
||||
i_current_id);
|
||||
return( -1 );
|
||||
}
|
||||
|
||||
intf_DbgMsg("input debug: requesting termination of PID %d\n",
|
||||
i_current_id);
|
||||
|
||||
/* Cancel the decoder. */
|
||||
switch( p_input->pp_selected_es[i_selected_es_loop]->i_type )
|
||||
{
|
||||
case AC3_AUDIO_ES:
|
||||
ac3dec_DestroyThread( (ac3dec_thread_t *)(p_input->pp_selected_es[i_selected_es_loop]->p_dec) );
|
||||
break;
|
||||
|
||||
case MPEG1_AUDIO_ES:
|
||||
case MPEG2_AUDIO_ES:
|
||||
adec_DestroyThread( (adec_thread_t*)(p_input->pp_selected_es[i_selected_es_loop]->p_dec) );
|
||||
break;
|
||||
|
||||
case MPEG1_VIDEO_ES:
|
||||
case MPEG2_VIDEO_ES:
|
||||
vpar_DestroyThread( (vpar_thread_t*)(p_input->pp_selected_es[i_selected_es_loop]->p_dec) /*, NULL */ );
|
||||
break;
|
||||
}
|
||||
|
||||
/* Unmark stream. */
|
||||
p_input->pp_selected_es[i_selected_es_loop]->p_dec = NULL;
|
||||
|
||||
/* Find last selected stream. */
|
||||
for( i_last_selected = i_selected_es_loop;
|
||||
p_input->pp_selected_es[i_last_selected]
|
||||
&& i_last_selected < INPUT_MAX_SELECTED_ES;
|
||||
i_last_selected++ );
|
||||
|
||||
/* Exchange streams. */
|
||||
p_input->pp_selected_es[i_selected_es_loop] =
|
||||
p_input->pp_selected_es[i_last_selected];
|
||||
p_input->pp_selected_es[i_last_selected] = NULL;
|
||||
|
||||
vlc_mutex_unlock( &p_input->es_lock );
|
||||
return( 0 );
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* We haven't found this PID in the current stream. */
|
||||
vlc_mutex_unlock( &p_input->es_lock );
|
||||
intf_ErrMsg("input error: can't find PID %d\n", i_current_id);
|
||||
return( -1 );
|
||||
}
|
||||
|
||||
|
||||
|
||||
/******************************************************************************
|
||||
* input_IsElemRecv: Test if an element given by its PID is currently received
|
||||
******************************************************************************
|
||||
* Cannot return the position of the es in the pp_selected_es, for it can
|
||||
* change once we have released the lock
|
||||
******************************************************************************/
|
||||
boolean_t input_IsElemRecv( input_thread_t *p_input, int i_id )
|
||||
{
|
||||
boolean_t b_is_recv = 0;
|
||||
int i_index = 0;
|
||||
|
||||
/* Since this function is intended to be called by interface, lock the
|
||||
structure. */
|
||||
vlc_mutex_lock( &p_input->es_lock );
|
||||
|
||||
/* Scan the table */
|
||||
while( i_index < INPUT_MAX_SELECTED_ES && !p_input->pp_selected_es[i_index] )
|
||||
{
|
||||
if( p_input->pp_selected_es[i_index]->i_id == i_id )
|
||||
{
|
||||
b_is_recv = 1;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
/* Unlock the structure */
|
||||
vlc_mutex_unlock( &p_input->es_lock );
|
||||
|
||||
return( b_is_recv );
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user