-/*******************************************************************************
+/*****************************************************************************
* video_parser.c : video parser thread
- * (c)1999 VideoLAN
- *******************************************************************************/
-
-/* ?? passer en terminate/destroy avec les signaux supplémentaires */
-
-/*******************************************************************************
+ *****************************************************************************
+ * Copyright (C) 1999, 2000 VideoLAN
+ *
+ * Authors:
+ *
+ * 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
+ * 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 GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *****************************************************************************/
+
+/* FIXME: passer en terminate/destroy avec les signaux supplémentaires ?? */
+
+/*****************************************************************************
* Preamble
- *******************************************************************************/
-#include <errno.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <string.h>
-#include <sys/uio.h>
+ *****************************************************************************/
+#include <stdlib.h> /* malloc(), free() */
+#include <unistd.h> /* getpid() */
+#include <sys/types.h> /* on BSD, uio.h needs types.h */
+#include <sys/uio.h> /* "input.h" */
+#include "threads.h"
#include "config.h"
#include "common.h"
#include "mtime.h"
-#include "vlc_thread.h"
+#include "plugins.h"
#include "intf_msg.h"
-#include "debug.h" /* ?? temporaire, requis par netlist.h */
+#include "debug.h" /* XXX?? temporaire, requis par netlist.h */
#include "input.h"
#include "input_netlist.h"
static void ErrorThread ( vpar_thread_t *p_vpar );
static void EndThread ( vpar_thread_t *p_vpar );
-/*******************************************************************************
+/*****************************************************************************
* vpar_CreateThread: create a generic parser thread
- *******************************************************************************
+ *****************************************************************************
* This function creates a new video parser thread, and returns a pointer
* to its description. On error, it returns NULL.
* Following configuration properties are used:
- * ??
- *******************************************************************************/
+ * XXX??
+ *****************************************************************************/
#include "main.h"
#include "interface.h"
extern main_t* p_main;
p_vpar->bit_stream.fifo.buffer = 0;
p_vpar->bit_stream.fifo.i_available = 0;
-/* FIXME !!!! */
+/* FIXME !!!!?? */
p_vpar->p_vout = p_main->p_intf->p_vout;
/* Spawn the video parser thread */
return( p_vpar );
}
-/*******************************************************************************
+/*****************************************************************************
* vpar_DestroyThread: destroy a generic parser thread
- *******************************************************************************
+ *****************************************************************************
* Destroy a terminated thread. This function will return 0 if the thread could
* be destroyed, and non 0 else. The last case probably means that the thread
* was still active, and another try may succeed.
- *******************************************************************************/
+ *****************************************************************************/
void vpar_DestroyThread( vpar_thread_t *p_vpar /*, int *pi_status */ )
{
intf_DbgMsg("vpar debug: requesting termination of video parser thread %p\n", p_vpar);
/* following functions are local */
-/*******************************************************************************
+/*****************************************************************************
* CheckConfiguration: check vpar_CreateThread() configuration
- *******************************************************************************
+ *****************************************************************************
* Set default parameters where required. In DEBUG mode, check if configuration
* is valid.
- *******************************************************************************/
+ *****************************************************************************/
#if 0
static int CheckConfiguration( video_cfg_t *p_cfg )
{
- /* ?? */
+ /* XXX?? */
return( 0 );
}
#endif
-/*******************************************************************************
+/*****************************************************************************
* InitThread: initialize vpar output 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( vpar_thread_t *p_vpar )
{
- int i_dummy;
+#ifdef VDEC_SMP
+ int i_dummy;
+#endif
+
+#ifdef SAM_SYNCHRO
+ int i_dummy;
+#endif
intf_DbgMsg("vpar debug: initializing video parser thread %p\n", p_vpar);
vlc_mutex_lock( &p_vpar->fifo.data_lock );
while ( DECODER_FIFO_ISEMPTY(p_vpar->fifo) )
{
+ if ( p_vpar->b_die )
+ {
+ vlc_mutex_unlock( &p_vpar->fifo.data_lock );
+ return( 1 );
+ }
vlc_cond_wait( &p_vpar->fifo.data_wait, &p_vpar->fifo.data_lock );
}
p_vpar->bit_stream.p_ts = DECODER_FIFO_START( p_vpar->fifo )->p_first_ts;
- p_vpar->bit_stream.i_byte = p_vpar->bit_stream.p_ts->i_payload_start;
+ p_vpar->bit_stream.p_byte = p_vpar->bit_stream.p_ts->buffer + p_vpar->bit_stream.p_ts->i_payload_start;
+ p_vpar->bit_stream.p_end = p_vpar->bit_stream.p_ts->buffer + p_vpar->bit_stream.p_ts->i_payload_end;
vlc_mutex_unlock( &p_vpar->fifo.data_lock );
/* Initialize parsing data */
/* Initialize other properties */
#ifdef STATS
- p_vpar->c_loops = 0;
+ p_vpar->c_loops = 0;
p_vpar->c_idle_loops = 0;
p_vpar->c_pictures = 0;
p_vpar->c_i_pictures = 0;
#ifdef VDEC_SMP
/* Spawn video_decoder threads */
- /* ??? modify the number of vdecs at runtime ? */
+ /* FIXME: modify the number of vdecs at runtime ?? */
for( i_dummy = 0; i_dummy < NB_VDEC; i_dummy++ )
{
if( (p_vpar->pp_vdec[i_dummy] = vdec_CreateThread( p_vpar )) == NULL )
vpar_InitDCTTables( p_vpar );
vpar_InitPMBType( p_vpar );
vpar_InitBMBType( p_vpar );
- vpar_InitCodedPattern( p_vpar );
vpar_InitDCTTables( p_vpar );
+
/*
* Initialize the synchro properties
*/
+#ifdef SAM_SYNCHRO
p_vpar->synchro.i_last_decode_pts = 0;
p_vpar->synchro.i_last_display_pts = 0;
p_vpar->synchro.i_images_since_pts = 0;
p_vpar->synchro.modulo = 0;
/* mean decoding time - at least 200 ms for a slow machine */
p_vpar->synchro.i_mean_decode_time = 200000;
- /* suppose we have no delay */
- p_vpar->synchro.i_delay = 0;
+ /* assume we can display all Is and 2 Ps */
+ p_vpar->synchro.can_display_i = 1;
+ p_vpar->synchro.can_display_p = 0;
+ p_vpar->synchro.displayable_p = 2;
+ p_vpar->synchro.can_display_b = 0;
+ p_vpar->synchro.displayable_b = 0;
/* assume there were about 3 P and 6 B images between I's */
p_vpar->synchro.current_p_count = 1;
p_vpar->synchro.nondropped_p_count = 1;
{
p_vpar->synchro.tab_p[i_dummy].mean = 3;
p_vpar->synchro.tab_p[i_dummy].deviation = .5;
-
p_vpar->synchro.tab_b[i_dummy].mean = 6;
p_vpar->synchro.tab_b[i_dummy].deviation = .5;
}
+#endif
+
+#ifdef MEUUH_SYNCHRO
+ p_vpar->synchro.kludge_level = 5;
+ p_vpar->synchro.kludge_nbp = p_vpar->synchro.kludge_p = 5;
+ p_vpar->synchro.kludge_nbb = p_vpar->synchro.kludge_b = 6;
+ p_vpar->synchro.kludge_b = 0;
+ p_vpar->synchro.kludge_prevdate = 0;
+#endif
+
+#ifdef POLUX_SYNCHRO
+ p_vpar->synchro.i_current_frame_date = 0;
+ p_vpar->synchro.i_backward_frame_date = 0;
+
+ p_vpar->synchro.r_p_average = p_vpar->synchro.i_p_nb = 6;
+ p_vpar->synchro.r_b_average = p_vpar->synchro.i_b_nb = 6;
+ p_vpar->synchro.i_p_count = 0;
+ p_vpar->synchro.i_b_count = 0;
+ p_vpar->synchro.i_i_count = 0;
+#endif
/* Mark thread as running and return */
intf_DbgMsg("vpar debug: InitThread(%p) succeeded\n", p_vpar);
return( 0 );
}
-/*******************************************************************************
+/*****************************************************************************
* RunThread: generic parser thread
- *******************************************************************************
+ *****************************************************************************
* Video parser thread. This function does only returns when the thread is
- * terminated.
- *******************************************************************************/
+ * terminated.
+ *****************************************************************************/
static void RunThread( vpar_thread_t *p_vpar )
{
intf_DbgMsg("vpar debug: running video parser thread (%p) (pid == %i)\n", p_vpar, getpid());
- /*
- * Initialize thread
+ /*
+ * Initialize thread
*/
p_vpar->b_error = InitThread( p_vpar );
- if( p_vpar->b_error )
- {
- return;
- }
+
p_vpar->b_run = 1;
/*
break;
};
}
- }
+ }
/*
* Error loop
ErrorThread( p_vpar );
}
+ p_vpar->b_run = 0;
+
/* End of thread */
EndThread( p_vpar );
- p_vpar->b_run = 0;
}
-/*******************************************************************************
+/*****************************************************************************
* ErrorThread: RunThread() error loop
- *******************************************************************************
+ *****************************************************************************
* This function is called when an error occured during thread main's loop. The
* thread can still receive feed, but must be ready to terminate as soon as
* possible.
- *******************************************************************************/
+ *****************************************************************************/
static void ErrorThread( vpar_thread_t *p_vpar )
{
- /* Wait until a `die' order */
+ /* We take the lock, because we are going to read/write the start/end
+ * indexes of the decoder fifo */
+ vlc_mutex_lock( &p_vpar->fifo.data_lock );
+
+ /* Wait until a `die' order is sent */
while( !p_vpar->b_die )
{
- /* We take the lock, because we are going to read/write the start/end
- * indexes of the parser fifo */
- vlc_mutex_lock( &p_vpar->fifo.data_lock );
-
- /* ?? trash all trashable PES packets */
+ /* Trash all received PES packets */
while( !DECODER_FIFO_ISEMPTY(p_vpar->fifo) )
{
- input_NetlistFreePES( p_vpar->bit_stream.p_input,
- DECODER_FIFO_START(p_vpar->fifo) );
+ input_NetlistFreePES( p_vpar->bit_stream.p_input, DECODER_FIFO_START(p_vpar->fifo) );
DECODER_FIFO_INCSTART( p_vpar->fifo );
}
- vlc_mutex_unlock( &p_vpar->fifo.data_lock );
- /* Sleep a while */
- msleep( VPAR_IDLE_SLEEP );
+ /* Waiting for the input thread to put new PES packets in the fifo */
+ vlc_cond_wait( &p_vpar->fifo.data_wait, &p_vpar->fifo.data_lock );
}
+
+ /* We can release the lock before leaving */
+ vlc_mutex_unlock( &p_vpar->fifo.data_lock );
}
-/*******************************************************************************
+/*****************************************************************************
* EndThread: thread destruction
- *******************************************************************************
- * This function is called when the thread ends after a sucessfull
+ *****************************************************************************
+ * This function is called when the thread ends after a sucessfull
* initialization.
- *******************************************************************************/
+ *****************************************************************************/
static void EndThread( vpar_thread_t *p_vpar )
{
#ifdef VDEC_SMP
#ifdef DEBUG
/* Check for remaining PES packets */
- /* ?? */
+ /* XXX?? */
#endif
/* Destroy thread structures allocated by InitThread */
// vout_DestroyStream( p_vpar->p_vout, p_vpar->i_stream );
- /* ?? */
+ /* XXX?? */
/* Dispose of matrices if they have been allocated. */
if( p_vpar->sequence.intra_quant.b_allocated )
free( p_vpar->pp_vdec[0] );
#endif
+ free( p_vpar );
+
intf_DbgMsg("vpar debug: EndThread(%p)\n", p_vpar);
}
projects / vlc / blobdiff