* video_parser.c : video parser thread
*****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN
- * $Id: video_parser.c,v 1.66 2001/01/13 12:57:21 sam Exp $
+ * $Id: video_parser.c,v 1.75 2001/02/18 03:32:02 polux Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
* Samuel Hocevar <sam@via.ecp.fr>
#include "common.h"
#include "threads.h"
#include "mtime.h"
-#include "plugins.h"
#include "modules.h"
#include "intf_msg.h"
#include "video_output.h"
#include "video_decoder.h"
-#include "../video_decoder/vdec_motion.h"
+#include "vdec_motion.h"
#include "../video_decoder/vdec_idct.h"
-#include "../video_decoder/vpar_blocks.h"
+#include "vpar_blocks.h"
#include "../video_decoder/vpar_headers.h"
#include "../video_decoder/vpar_synchro.h"
#include "../video_decoder/video_parser.h"
static void RunThread ( vpar_thread_t *p_vpar );
static void ErrorThread ( vpar_thread_t *p_vpar );
static void EndThread ( vpar_thread_t *p_vpar );
-static void BitstreamCallback ( bit_stream_t *p_bit_stream );
+static void BitstreamCallback ( bit_stream_t *p_bit_stream,
+ boolean_t b_new_pes );
/*****************************************************************************
* vpar_CreateThread: create a generic parser thread
p_vpar->p_vout = p_config->p_vout;
- /* Choose the best IDCT module */
- p_vpar->p_module = module_Need( p_main->p_module_bank,
- MODULE_CAPABILITY_IDCT, NULL );
+ /*
+ * Choose the best motion compensation module
+ */
+ p_vpar->p_motion_module = module_Need( p_main->p_bank,
+ MODULE_CAPABILITY_MOTION, NULL );
- if( p_vpar->p_module == NULL )
+ if( p_vpar->p_motion_module == NULL )
+ {
+ intf_ErrMsg( "vpar error: no suitable motion compensation module" );
+ free( p_vpar );
+ return( 0 );
+ }
+
+#define m ( p_vpar->pppf_motion )
+#define s ( p_vpar->ppf_motion_skipped )
+#define f ( p_vpar->p_motion_module->p_functions->motion.functions.motion )
+ m[0][0][0] = m[0][0][1] = m[0][0][2] = m[0][0][3] = NULL;
+ m[0][1][0] = m[0][1][1] = m[0][1][2] = m[0][1][3] = NULL;
+ m[1][0][0] = NULL;
+ m[1][1][0] = NULL;
+ m[2][0][0] = NULL;
+ m[2][1][0] = NULL;
+ m[3][0][0] = NULL;
+ m[3][1][0] = NULL;
+
+ m[1][0][1] = f.pf_field_field_420;
+ m[1][1][1] = f.pf_frame_field_420;
+ m[2][0][1] = f.pf_field_field_422;
+ m[2][1][1] = f.pf_frame_field_422;
+ m[3][0][1] = f.pf_field_field_444;
+ m[3][1][1] = f.pf_frame_field_444;
+
+ m[1][0][2] = f.pf_field_16x8_420;
+ m[1][1][2] = f.pf_frame_frame_420;
+ m[2][0][2] = f.pf_field_16x8_422;
+ m[2][1][2] = f.pf_frame_frame_422;
+ m[3][0][2] = f.pf_field_16x8_444;
+ m[3][1][2] = f.pf_frame_frame_444;
+
+ m[1][0][3] = f.pf_field_dmv_420;
+ m[1][1][3] = f.pf_frame_dmv_420;
+ m[2][0][3] = f.pf_field_dmv_422;
+ m[2][1][3] = f.pf_frame_dmv_422;
+ m[3][0][3] = f.pf_field_dmv_444;
+ m[3][1][3] = f.pf_frame_dmv_444;
+
+ s[0][0] = s[0][1] = s[0][2] = s[0][3] = NULL;
+ s[1][0] = NULL;
+ s[2][0] = NULL;
+ s[3][0] = NULL;
+
+ s[1][1] = f.pf_field_field_420;
+ s[2][1] = f.pf_field_field_422;
+ s[3][1] = f.pf_field_field_444;
+
+ s[1][2] = f.pf_field_field_420;
+ s[2][2] = f.pf_field_field_422;
+ s[3][2] = f.pf_field_field_444;
+
+ s[1][3] = f.pf_frame_frame_420;
+ s[2][3] = f.pf_frame_frame_422;
+ s[3][3] = f.pf_frame_frame_444;
+#undef f
+#undef s
+#undef m
+
+ /*
+ * Choose the best IDCT module
+ */
+ p_vpar->p_idct_module = module_Need( p_main->p_bank,
+ MODULE_CAPABILITY_IDCT, NULL );
+
+ if( p_vpar->p_idct_module == NULL )
{
intf_ErrMsg( "vpar error: no suitable IDCT module" );
+ module_Unneed( p_main->p_bank, p_vpar->p_motion_module );
free( p_vpar );
return( 0 );
}
-#define idct_functions p_vpar->p_module->p_functions->idct.functions.idct
- p_vpar->pf_init = idct_functions.pf_init;
- p_vpar->pf_sparse_idct = idct_functions.pf_sparse_idct;
- p_vpar->pf_idct = idct_functions.pf_idct;
-#undef idct_functions
+#define f p_vpar->p_idct_module->p_functions->idct.functions.idct
+ p_vpar->pf_init = f.pf_init;
+ p_vpar->pf_sparse_idct = f.pf_sparse_idct;
+ p_vpar->pf_idct = f.pf_idct;
+ p_vpar->pf_norm_scan = f.pf_norm_scan;
+#undef f
/* Spawn the video parser thread */
if ( vlc_thread_create( &p_vpar->thread_id, "video parser",
(vlc_thread_func_t)RunThread, (void *)p_vpar ) )
{
intf_ErrMsg("vpar error: can't spawn video parser thread");
- module_Unneed( p_main->p_module_bank, p_vpar->p_module );
+ module_Unneed( p_main->p_bank, p_vpar->p_idct_module );
+ module_Unneed( p_main->p_bank, p_vpar->p_motion_module );
free( p_vpar );
return( 0 );
}
p_vpar->p_config->decoder_config.pf_init_bit_stream( &p_vpar->bit_stream,
p_vpar->p_config->decoder_config.p_decoder_fifo );
+ p_vpar->bit_stream.pf_bitstream_callback = BitstreamCallback;
+ p_vpar->bit_stream.p_callback_arg = (void *)p_vpar;
+
+ /* InitBitstream has normally begun to read a PES packet, get its
+ * PTS/DTS */
+ if( !p_vpar->p_fifo->b_die )
+ {
+ BitstreamCallback( &p_vpar->bit_stream, 1 );
+ }
/* Initialize parsing data */
p_vpar->sequence.p_forward = NULL;
p_vpar->sequence.nonintra_quant.b_allocated = 0;
p_vpar->sequence.chroma_intra_quant.b_allocated = 0;
p_vpar->sequence.chroma_nonintra_quant.b_allocated = 0;
- /* FIXME : initialize matrix_coefficients, but to what value ? */
+ p_vpar->sequence.i_matrix_coefficients = 1;
+ p_vpar->sequence.next_pts = p_vpar->sequence.next_dts = 0;
+ p_vpar->sequence.b_expect_discontinuity = 0;
/* Initialize copyright information */
p_vpar->sequence.b_copyright_flag = 0;
p_vpar->pp_vdec[0]->b_error = 0;
p_vpar->pp_vdec[0]->p_vpar = p_vpar;
+# ifndef SYS_BEOS
+# if VDEC_NICE
/* Re-nice ourself */
if( nice(VDEC_NICE) == -1 )
{
intf_WarnMsg( 2, "vpar warning : couldn't nice() (%s)",
strerror(errno) );
}
+# endif
+# endif
#endif
/* Initialize lookup tables */
vpar_InitPMBType( p_vpar );
vpar_InitBMBType( p_vpar );
vpar_InitDCTTables( p_vpar );
+ vpar_InitScanTable( p_vpar );
/*
* Initialize the synchro properties
vlc_mutex_destroy( &(p_vpar->synchro.fifo_lock) );
- module_Unneed( p_main->p_module_bank, p_vpar->p_module );
+ module_Unneed( p_main->p_bank, p_vpar->p_idct_module );
+ module_Unneed( p_main->p_bank, p_vpar->p_motion_module );
free( p_vpar );
/*****************************************************************************
* BitstreamCallback: Import parameters from the new data/PES packet
*****************************************************************************
- * This function is called when the thread ends after a sucessful
- * initialization.
+ * This function is called by input's NextDataPacket.
*****************************************************************************/
-static void BitstreamCallback ( bit_stream_t *p_bit_stream );
+static void BitstreamCallback ( bit_stream_t * p_bit_stream,
+ boolean_t b_new_pes )
+{
+ vpar_thread_t * p_vpar = (vpar_thread_t *)p_bit_stream->p_callback_arg;
+
+ if( b_new_pes )
+ {
+ p_vpar->sequence.next_pts =
+ DECODER_FIFO_START( *p_bit_stream->p_decoder_fifo )->i_pts;
+ p_vpar->sequence.next_dts =
+ DECODER_FIFO_START( *p_bit_stream->p_decoder_fifo )->i_dts;
+ p_vpar->sequence.i_current_rate =
+ DECODER_FIFO_START( *p_bit_stream->p_decoder_fifo )->i_rate;
+
+ if( DECODER_FIFO_START( *p_bit_stream->p_decoder_fifo )->b_discontinuity )
+ {
+ /* Escape the current picture and reset the picture predictors. */
+ p_vpar->sequence.b_expect_discontinuity = 1;
+ p_vpar->picture.b_error = 1;
+ }
+ }
+
+ if( p_bit_stream->p_data->b_discard_payload )
+ {
+ /* 1 packet messed up, trash the slice. */
+ p_vpar->picture.b_error = 1;
+ }
+}
projects / vlc / blobdiff