-/*******************************************************************************
+/*****************************************************************************
* video_decoder.c : video decoder thread
- * (c)1999 VideoLAN
- *******************************************************************************/
+ *****************************************************************************
+ * Copyright (C) 1999, 2000 VideoLAN
+ * $Id: video_decoder.c,v 1.50 2001/05/30 17:03:12 sam Exp $
+ *
+ * Authors: Christophe Massiot <massiot@via.ecp.fr>
+ * Gaël Hendryckx <jimmy@via.ecp.fr>
+ *
+ * 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, USA.
+ *****************************************************************************/
+
+/*****************************************************************************
+ * Preamble
+ *****************************************************************************/
+#include "defs.h"
-/* ?? passer en terminate/destroy avec les signaux supplémentaires */
+#include <unistd.h> /* getpid() */
-/*******************************************************************************
- * Preamble
- *******************************************************************************/
-#include <errno.h>
-#include <pthread.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <string.h>
-#include <sys/uio.h>
-#include <X11/Xlib.h>
-#include <X11/extensions/XShm.h>
+#include <stdlib.h> /* free() */
+#include <string.h> /* memcpy(), memset() */
+#include <errno.h> /* errno */
#include "config.h"
#include "common.h"
+#include "threads.h"
#include "mtime.h"
#include "intf_msg.h"
-#include "debug.h" /* ?? temporaire, requis par netlist.h */
-#include "input.h"
-#include "input_netlist.h"
-#include "decoder_fifo.h"
+#include "stream_control.h"
+#include "input_ext-dec.h"
+
#include "video.h"
#include "video_output.h"
+
+#include "vdec_motion.h"
#include "video_decoder.h"
+#include "vpar_blocks.h"
+#include "vpar_headers.h"
+#include "vpar_synchro.h"
+#include "video_parser.h"
+#include "video_fifo.h"
+
/*
* Local prototypes
*/
-//static int CheckConfiguration ( video_cfg_t *p_cfg );
-static int InitThread ( vdec_thread_t *p_vdec );
+#ifdef VDEC_SMP
+static int vdec_InitThread ( vdec_thread_t *p_vdec );
+#endif
static void RunThread ( vdec_thread_t *p_vdec );
static void ErrorThread ( vdec_thread_t *p_vdec );
static void EndThread ( vdec_thread_t *p_vdec );
-/*******************************************************************************
- * vdec_CreateThread: create a generic decoder thread
- *******************************************************************************
+/*****************************************************************************
+ * vdec_CreateThread: create a video decoder thread
+ *****************************************************************************
* This function creates a new video decoder thread, and returns a pointer
* to its description. On error, it returns NULL.
* Following configuration properties are used:
- * ??
- *******************************************************************************/
-vdec_thread_t * vdec_CreateThread( /* video_cfg_t *p_cfg, */ input_thread_t *p_input /*,
- vout_thread_t *p_vout, int *pi_status */ )
+ * XXX??
+ *****************************************************************************/
+vdec_thread_t * vdec_CreateThread( vpar_thread_t *p_vpar /*, int *pi_status */ )
{
vdec_thread_t * p_vdec;
- intf_DbgMsg("vdec debug: creating video decoder thread\n");
+ intf_DbgMsg("vdec debug: creating video decoder thread");
/* Allocate the memory needed to store the thread's structure */
if ( (p_vdec = (vdec_thread_t *)malloc( sizeof(vdec_thread_t) )) == NULL )
{
- intf_ErrMsg("adec error: not enough memory for vdec_CreateThread() to create the new thread\n");
+ intf_ErrMsg("vdec error: not enough memory for vdec_CreateThread() to create the new thread");
return( NULL );
}
p_vdec->b_error = 0;
/*
- * Initialize the input properties
+ * Initialize the parser properties
*/
- /* Initialize the decoder fifo's data lock and conditional variable and set * its buffer as empty */
- pthread_mutex_init( &p_vdec->fifo.data_lock, NULL );
- pthread_cond_init( &p_vdec->fifo.data_wait, NULL );
- p_vdec->fifo.i_start = 0;
- p_vdec->fifo.i_end = 0;
- /* Initialize the bit stream structure */
- p_vdec->bit_stream.p_input = p_input;
- p_vdec->bit_stream.p_decoder_fifo = &p_vdec->fifo;
- p_vdec->bit_stream.fifo.buffer = 0;
- p_vdec->bit_stream.fifo.i_available = 0;
+ p_vdec->p_vpar = p_vpar;
/* Spawn the video decoder thread */
- if ( pthread_create(&p_vdec->thread_id, NULL, (void *)RunThread, (void *)p_vdec) )
+ if ( vlc_thread_create(&p_vdec->thread_id, "video decoder",
+ (vlc_thread_func_t)RunThread, (void *)p_vdec) )
{
- intf_ErrMsg("vdec error: can't spawn video decoder thread\n");
+ intf_ErrMsg("vdec error: can't spawn video decoder thread");
free( p_vdec );
return( NULL );
}
- intf_DbgMsg("vdec debug: video decoder thread (%p) created\n", p_vdec);
+ intf_DbgMsg("vdec debug: video decoder thread (%p) created", p_vdec);
return( p_vdec );
}
-/*******************************************************************************
- * vdec_DestroyThread: destroy a generic decoder thread
- *******************************************************************************
- * Destroy a terminated thread. This function will return 0 if the thread could
+/*****************************************************************************
+ * vdec_DestroyThread: destroy a video decoder thread
+ *****************************************************************************
+ * Destroy and terminate 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 vdec_DestroyThread( vdec_thread_t *p_vdec /*, int *pi_status */ )
{
- intf_DbgMsg("vdec debug: requesting termination of video decoder thread %p\n", p_vdec);
+ intf_DbgMsg("vdec debug: requesting termination of video decoder thread %p", p_vdec);
/* Ask thread to kill itself */
p_vdec->b_die = 1;
+#ifdef VDEC_SMP
+ /* Make sure the decoder thread leaves the vpar_GetMacroblock() function */
+ vlc_mutex_lock( &(p_vdec->p_vpar->vfifo.lock) );
+ vlc_cond_signal( &(p_vdec->p_vpar->vfifo.wait) );
+ vlc_mutex_unlock( &(p_vdec->p_vpar->vfifo.lock) );
+#endif
+
+ /* Waiting for the decoder thread to exit */
/* Remove this as soon as the "status" flag is implemented */
- pthread_join( p_vdec->thread_id, NULL ); /* wait until it's done */
+ vlc_thread_join( p_vdec->thread_id );
}
/* following functions are local */
-/*******************************************************************************
- * CheckConfiguration: check vdec_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 )
-{
- /* ?? */
-
- return( 0 );
-}
-#endif
-
-/*******************************************************************************
- * InitThread: initialize vdec output thread
- *******************************************************************************
+/*****************************************************************************
+ * vdec_InitThread: initialize video decoder 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( vdec_thread_t *p_vdec )
+ *****************************************************************************/
+#ifdef VDEC_SMP
+static int vdec_InitThread( vdec_thread_t *p_vdec )
+#else
+int vdec_InitThread( vdec_thread_t *p_vdec )
+#endif
{
+ intf_DbgMsg("vdec debug: initializing video decoder thread %p", p_vdec);
- intf_DbgMsg("vdec debug: initializing video decoder thread %p\n", p_vdec);
+ p_vdec->pf_decode_init = p_vdec->p_vpar->pf_decode_init;
+ p_vdec->pf_decode_mb_c = p_vdec->p_vpar->pf_decode_mb_c;
+ p_vdec->pf_decode_mb_bw = p_vdec->p_vpar->pf_decode_mb_bw;
- /* Our first job is to initialize the bit stream structure with the
- * beginning of the input stream */
- pthread_mutex_lock( &p_vdec->fifo.data_lock );
- while ( DECODER_FIFO_ISEMPTY(p_vdec->fifo) )
- {
- pthread_cond_wait( &p_vdec->fifo.data_wait, &p_vdec->fifo.data_lock );
- }
- p_vdec->bit_stream.p_ts = DECODER_FIFO_START( p_vdec->fifo )->p_first_ts;
- p_vdec->bit_stream.i_byte = p_vdec->bit_stream.p_ts->i_payload_start;
- pthread_mutex_unlock( &p_vdec->fifo.data_lock );
-
-#if 0
- /* ?? */
- /* Create video stream */
- p_vdec->i_stream = vout_CreateStream( p_vdec->p_vout );
- if( p_vdec->i_stream < 0 ) /* error */
+ p_vdec->pf_decode_init( p_vdec );
+
+#ifdef VDEC_SMP
+ /* Re-nice ourself */
+ if( nice(VDEC_NICE) == -1 )
{
- return( 1 );
+ intf_WarnMsg( 2, "vdec warning : couldn't nice() (%s)",
+ strerror(errno) );
}
-
- /* Initialize decoding data */
- /* ?? */
-#endif
-
- /* Initialize other properties */
-#ifdef STATS
- p_vdec->c_loops = 0;
- p_vdec->c_idle_loops = 0;
- p_vdec->c_pictures = 0;
- p_vdec->c_i_pictures = 0;
- p_vdec->c_p_pictures = 0;
- p_vdec->c_b_pictures = 0;
- p_vdec->c_decoded_pictures = 0;
- p_vdec->c_decoded_i_pictures = 0;
- p_vdec->c_decoded_p_pictures = 0;
- p_vdec->c_decoded_b_pictures = 0;
#endif
/* Mark thread as running and return */
- intf_DbgMsg("vdec debug: InitThread(%p) succeeded\n", p_vdec);
- return( 0 );
+ intf_DbgMsg("vdec debug: InitThread(%p) succeeded", p_vdec);
+ return( 0 );
}
-/*******************************************************************************
- * RunThread: generic decoder thread
- *******************************************************************************
- * Generic decoder thread. This function does only returns when the thread is
- * terminated.
- *******************************************************************************/
-static void RunThread( vdec_thread_t *p_vdec )
+/*****************************************************************************
+ * 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( vdec_thread_t *p_vdec )
+{
+ macroblock_t * p_mb;
+
+ /* Wait until a `die' order */
+ while( !p_vdec->b_die )
+ {
+ p_mb = vpar_GetMacroblock( &p_vdec->p_vpar->vfifo );
+ vpar_DestroyMacroblock( &p_vdec->p_vpar->vfifo, p_mb );
+ }
+}
+
+/*****************************************************************************
+ * EndThread: thread destruction
+ *****************************************************************************
+ * This function is called when the thread ends after a sucessful
+ * initialization.
+ *****************************************************************************/
+static void EndThread( vdec_thread_t *p_vdec )
{
+ intf_DbgMsg("vdec debug: EndThread(%p)", p_vdec);
+}
- intf_DbgMsg("vdec debug: running video decoder thread (%p) (pid == %i)\n", p_vdec, getpid());
+/*****************************************************************************
+ * RunThread: video decoder thread
+ *****************************************************************************
+ * Video decoder thread. This function does only return when the thread is
+ * terminated.
+ *****************************************************************************/
+static void RunThread( vdec_thread_t *p_vdec )
+{
+ intf_DbgMsg("vdec debug: running video decoder thread (%p) (pid == %i)",
+ p_vdec, getpid());
- /*
- * Initialize thread and free configuration
+ /*
+ * Initialize thread and free configuration
*/
- p_vdec->b_error = InitThread( p_vdec );
+ p_vdec->b_error = vdec_InitThread( p_vdec );
if( p_vdec->b_error )
{
return;
}
p_vdec->b_run = 1;
-/* REMOVE ME !!!!! */
-p_vdec->b_error = 1;
-
/*
* Main loop - it is not executed if an error occured during
* initialization
*/
while( (!p_vdec->b_die) && (!p_vdec->b_error) )
{
- /* ?? */
- }
+ macroblock_t * p_mb;
+
+ if( (p_mb = vpar_GetMacroblock( &p_vdec->p_vpar->vfifo )) != NULL )
+ {
+ p_vdec->pf_decode_mb_c( p_vdec, p_mb );
+ }
+ }
/*
* Error loop
*/
if( p_vdec->b_error )
{
- ErrorThread( p_vdec );
+ ErrorThread( p_vdec );
}
/* End of thread */
p_vdec->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( vdec_thread_t *p_vdec )
-{
- /* Wait until a `die' order */
- while( !p_vdec->b_die )
- {
- /* We take the lock, because we are going to read/write the start/end
- * indexes of the decoder fifo */
- pthread_mutex_lock( &p_vdec->fifo.data_lock );
-
- /* ?? trash all trashable PES packets */
- while( !DECODER_FIFO_ISEMPTY(p_vdec->fifo) )
- {
- input_NetlistFreePES( p_vdec->bit_stream.p_input, DECODER_FIFO_START(p_vdec->fifo) );
- DECODER_FIFO_INCSTART( p_vdec->fifo );
- }
-
- pthread_mutex_unlock( &p_vdec->fifo.data_lock );
- /* Sleep a while */
- msleep( VDEC_IDLE_SLEEP );
- }
-}
-
-/*******************************************************************************
- * EndThread: thread destruction
- *******************************************************************************
- * This function is called when the thread ends after a sucessfull
- * initialization.
- *******************************************************************************/
-static void EndThread( vdec_thread_t *p_vdec )
-{
- intf_DbgMsg("vdec debug: destroying video decoder thread %p\n", p_vdec);
-
-#ifdef DEBUG
- /* Check for remaining PES packets */
- /* ?? */
-#endif
-
- /* Destroy thread structures allocated by InitThread */
-// vout_DestroyStream( p_vdec->p_vout, p_vdec->i_stream );
- /* ?? */
-
- intf_DbgMsg("vdec debug: EndThread(%p)\n", p_vdec);
-}
-
-