* ac3_decoder_thread.c: ac3 decoder thread
*****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN
- * $Id: ac3_decoder_thread.c,v 1.32 2001/05/06 04:32:02 sam Exp $
+ * $Id: ac3_decoder_thread.c,v 1.33 2001/05/15 16:19:42 sam Exp $
*
* Authors: Michel Lespinasse <walken@zoy.org>
*
#include <unistd.h> /* getpid() */
-#include <stdio.h> /* "intf_msg.h" */
#include <stdlib.h> /* malloc(), free() */
#include <string.h> /* memset() */
#include "common.h"
#include "threads.h"
#include "mtime.h"
+#include "modules.h"
#include "intf_msg.h" /* intf_DbgMsg(), intf_ErrMsg() */
#include "audio_output.h"
+#include "ac3_imdct.h"
+#include "ac3_downmix.h"
#include "ac3_decoder.h"
#include "ac3_decoder_thread.h"
static void BitstreamCallback ( bit_stream_t *p_bit_stream,
boolean_t b_new_pes );
-
/*****************************************************************************
* ac3dec_CreateThread: creates an ac3 decoder thread
*****************************************************************************/
vlc_thread_t ac3dec_CreateThread( adec_config_t * p_config )
{
- ac3dec_thread_t * p_ac3dec_t;
+ ac3dec_thread_t * p_ac3thread;
intf_DbgMsg( "ac3dec debug: creating ac3 decoder thread" );
/* Allocate the memory needed to store the thread's structure */
- if((p_ac3dec_t = (ac3dec_thread_t *)malloc(sizeof(ac3dec_thread_t)))==NULL)
+ if((p_ac3thread = (ac3dec_thread_t *)malloc(sizeof(ac3dec_thread_t)))==NULL)
{
intf_ErrMsg ( "ac3dec error: not enough memory "
"for ac3dec_CreateThread() to create the new thread");
/*
* Initialize the thread properties
*/
- p_ac3dec_t->p_config = p_config;
- p_ac3dec_t->p_fifo = p_config->decoder_config.p_decoder_fifo;
+ p_ac3thread->p_config = p_config;
+ p_ac3thread->p_fifo = p_config->decoder_config.p_decoder_fifo;
+
+ /*
+ * Choose the best downmix module
+ */
+#define DOWNMIX p_ac3thread->ac3_decoder.downmix
+ DOWNMIX.p_module = module_Need( MODULE_CAPABILITY_DOWNMIX, NULL );
+
+ if( DOWNMIX.p_module == NULL )
+ {
+ intf_ErrMsg( "ac3dec error: no suitable downmix module" );
+ free( p_ac3thread );
+ return( 0 );
+ }
+
+#define F DOWNMIX.p_module->p_functions->downmix.functions.downmix
+ DOWNMIX.pf_downmix_3f_2r_to_2ch = F.pf_downmix_3f_2r_to_2ch;
+ DOWNMIX.pf_downmix_2f_2r_to_2ch = F.pf_downmix_2f_2r_to_2ch;
+ DOWNMIX.pf_downmix_3f_1r_to_2ch = F.pf_downmix_3f_1r_to_2ch;
+ DOWNMIX.pf_downmix_2f_1r_to_2ch = F.pf_downmix_2f_1r_to_2ch;
+ DOWNMIX.pf_downmix_3f_0r_to_2ch = F.pf_downmix_3f_0r_to_2ch;
+ DOWNMIX.pf_stream_sample_2ch_to_s16 = F.pf_stream_sample_2ch_to_s16;
+ DOWNMIX.pf_stream_sample_1ch_to_s16 = F.pf_stream_sample_1ch_to_s16;
+#undef F
+#undef DOWNMIX
+
+ /*
+ * Choose the best IMDCT module
+ */
+#define IMDCT p_ac3thread->ac3_decoder.imdct
+ IMDCT.p_module = module_Need( MODULE_CAPABILITY_IMDCT, NULL );
+
+ if( IMDCT.p_module == NULL )
+ {
+ intf_ErrMsg( "ac3dec error: no suitable IMDCT module" );
+ module_Unneed( p_ac3thread->ac3_decoder.downmix.p_module );
+ free( p_ac3thread );
+ return( 0 );
+ }
+
+#define F IMDCT.p_module->p_functions->imdct.functions.imdct
+ IMDCT.pf_imdct_init = F.pf_imdct_init;
+ IMDCT.pf_imdct_256 = F.pf_imdct_256;
+ IMDCT.pf_imdct_256_nol = F.pf_imdct_256_nol;
+ IMDCT.pf_imdct_512 = F.pf_imdct_512;
+ IMDCT.pf_imdct_512_nol = F.pf_imdct_512_nol;
+#undef F
+#undef IMDCT
/* Initialize the ac3 decoder structures */
- ac3_init (&p_ac3dec_t->ac3_decoder);
+ ac3_init (&p_ac3thread->ac3_decoder);
/*
* Initialize the output properties
*/
- p_ac3dec_t->p_aout_fifo = NULL;
+ p_ac3thread->p_aout_fifo = NULL;
/* Spawn the ac3 decoder thread */
- if (vlc_thread_create(&p_ac3dec_t->thread_id, "ac3 decoder",
- (vlc_thread_func_t)RunThread, (void *)p_ac3dec_t))
+ if (vlc_thread_create(&p_ac3thread->thread_id, "ac3 decoder",
+ (vlc_thread_func_t)RunThread, (void *)p_ac3thread))
{
intf_ErrMsg( "ac3dec error: can't spawn ac3 decoder thread" );
- free (p_ac3dec_t);
+ module_Unneed( p_ac3thread->ac3_decoder.downmix.p_module );
+ module_Unneed( p_ac3thread->ac3_decoder.imdct.p_module );
+ free (p_ac3thread);
return 0;
}
- intf_DbgMsg ("ac3dec debug: ac3 decoder thread (%p) created", p_ac3dec_t);
- return p_ac3dec_t->thread_id;
+ intf_DbgMsg ("ac3dec debug: ac3 decoder thread (%p) created", p_ac3thread);
+ return p_ac3thread->thread_id;
}
/* Following functions are local */
/*****************************************************************************
* InitThread : initialize an ac3 decoder thread
*****************************************************************************/
-static int InitThread (ac3dec_thread_t * p_ac3dec_t)
+static int InitThread (ac3dec_thread_t * p_ac3thread)
{
- intf_DbgMsg("ac3dec debug: initializing ac3 decoder thread %p",p_ac3dec_t);
+ intf_DbgMsg("ac3dec debug: initializing ac3 decoder thread %p",p_ac3thread);
- p_ac3dec_t->p_config->decoder_config.pf_init_bit_stream(
- &p_ac3dec_t->ac3_decoder.bit_stream,
- p_ac3dec_t->p_config->decoder_config.p_decoder_fifo,
- BitstreamCallback, (void *) p_ac3dec_t );
+ p_ac3thread->p_config->decoder_config.pf_init_bit_stream(
+ &p_ac3thread->ac3_decoder.bit_stream,
+ p_ac3thread->p_config->decoder_config.p_decoder_fifo,
+ BitstreamCallback, (void *) p_ac3thread );
/* Creating the audio output fifo */
- p_ac3dec_t->p_aout_fifo = aout_CreateFifo( AOUT_ADEC_STEREO_FIFO, 2, 0, 0,
+ p_ac3thread->p_aout_fifo = aout_CreateFifo( AOUT_ADEC_STEREO_FIFO, 2, 0, 0,
AC3DEC_FRAME_SIZE, NULL );
- if ( p_ac3dec_t->p_aout_fifo == NULL )
+ if ( p_ac3thread->p_aout_fifo == NULL )
{
return -1;
}
- intf_DbgMsg("ac3dec debug: ac3 decoder thread %p initialized", p_ac3dec_t);
+ intf_DbgMsg("ac3dec debug: ac3 decoder thread %p initialized", p_ac3thread);
return 0;
}
/*****************************************************************************
* RunThread : ac3 decoder thread
*****************************************************************************/
-static void RunThread (ac3dec_thread_t * p_ac3dec_t)
+static void RunThread (ac3dec_thread_t * p_ac3thread)
{
int sync;
- intf_DbgMsg ("ac3dec debug: running ac3 decoder thread (%p) (pid == %i)", p_ac3dec_t, getpid());
+ intf_DbgMsg ("ac3dec debug: running ac3 decoder thread (%p) (pid == %i)", p_ac3thread, getpid());
/* Initializing the ac3 decoder thread */
- if (InitThread (p_ac3dec_t)) /* XXX?? */
+ if (InitThread (p_ac3thread)) /* XXX?? */
{
- p_ac3dec_t->p_fifo->b_error = 1;
+ p_ac3thread->p_fifo->b_error = 1;
}
sync = 0;
- p_ac3dec_t->sync_ptr = 0;
+ p_ac3thread->sync_ptr = 0;
/* ac3 decoder thread's main loop */
/* FIXME : do we have enough room to store the decoded frames ?? */
- while ((!p_ac3dec_t->p_fifo->b_die) && (!p_ac3dec_t->p_fifo->b_error))
+ while ((!p_ac3thread->p_fifo->b_die) && (!p_ac3thread->p_fifo->b_error))
{
s16 * buffer;
ac3_sync_info_t sync_info;
if (!sync) {
do {
- GetBits(&p_ac3dec_t->ac3_decoder.bit_stream,8);
- } while ((!p_ac3dec_t->sync_ptr) && (!p_ac3dec_t->p_fifo->b_die)
- && (!p_ac3dec_t->p_fifo->b_error));
+ GetBits(&p_ac3thread->ac3_decoder.bit_stream,8);
+ } while ((!p_ac3thread->sync_ptr) && (!p_ac3thread->p_fifo->b_die)
+ && (!p_ac3thread->p_fifo->b_error));
- ptr = p_ac3dec_t->sync_ptr;
+ ptr = p_ac3thread->sync_ptr;
- while(ptr-- && (!p_ac3dec_t->p_fifo->b_die)
- && (!p_ac3dec_t->p_fifo->b_error))
+ while(ptr-- && (!p_ac3thread->p_fifo->b_die)
+ && (!p_ac3thread->p_fifo->b_error))
{
- p_ac3dec_t->ac3_decoder.bit_stream.p_byte++;
+ p_ac3thread->ac3_decoder.bit_stream.p_byte++;
}
/* we are in sync now */
sync = 1;
}
- if (DECODER_FIFO_START(*p_ac3dec_t->p_fifo)->i_pts)
+ if (DECODER_FIFO_START(*p_ac3thread->p_fifo)->i_pts)
{
- p_ac3dec_t->p_aout_fifo->date[p_ac3dec_t->p_aout_fifo->l_end_frame] =
- DECODER_FIFO_START(*p_ac3dec_t->p_fifo)->i_pts;
- DECODER_FIFO_START(*p_ac3dec_t->p_fifo)->i_pts = 0;
+ p_ac3thread->p_aout_fifo->date[p_ac3thread->p_aout_fifo->l_end_frame] =
+ DECODER_FIFO_START(*p_ac3thread->p_fifo)->i_pts;
+ DECODER_FIFO_START(*p_ac3thread->p_fifo)->i_pts = 0;
} else {
- p_ac3dec_t->p_aout_fifo->date[p_ac3dec_t->p_aout_fifo->l_end_frame] =
+ p_ac3thread->p_aout_fifo->date[p_ac3thread->p_aout_fifo->l_end_frame] =
LAST_MDATE;
}
- if (ac3_sync_frame (&p_ac3dec_t->ac3_decoder, &sync_info))
+ if (ac3_sync_frame (&p_ac3thread->ac3_decoder, &sync_info))
{
sync = 0;
goto bad_frame;
}
- p_ac3dec_t->p_aout_fifo->l_rate = sync_info.sample_rate;
+ p_ac3thread->p_aout_fifo->l_rate = sync_info.sample_rate;
- buffer = ((s16 *)p_ac3dec_t->p_aout_fifo->buffer) +
- (p_ac3dec_t->p_aout_fifo->l_end_frame * AC3DEC_FRAME_SIZE);
+ buffer = ((s16 *)p_ac3thread->p_aout_fifo->buffer) +
+ (p_ac3thread->p_aout_fifo->l_end_frame * AC3DEC_FRAME_SIZE);
- if (ac3_decode_frame (&p_ac3dec_t->ac3_decoder, buffer))
+ if (ac3_decode_frame (&p_ac3thread->ac3_decoder, buffer))
{
sync = 0;
goto bad_frame;
}
- vlc_mutex_lock (&p_ac3dec_t->p_aout_fifo->data_lock);
- p_ac3dec_t->p_aout_fifo->l_end_frame =
- (p_ac3dec_t->p_aout_fifo->l_end_frame + 1) & AOUT_FIFO_SIZE;
- vlc_cond_signal (&p_ac3dec_t->p_aout_fifo->data_wait);
- vlc_mutex_unlock (&p_ac3dec_t->p_aout_fifo->data_lock);
+ vlc_mutex_lock (&p_ac3thread->p_aout_fifo->data_lock);
+ p_ac3thread->p_aout_fifo->l_end_frame =
+ (p_ac3thread->p_aout_fifo->l_end_frame + 1) & AOUT_FIFO_SIZE;
+ vlc_cond_signal (&p_ac3thread->p_aout_fifo->data_wait);
+ vlc_mutex_unlock (&p_ac3thread->p_aout_fifo->data_lock);
bad_frame:
- RealignBits(&p_ac3dec_t->ac3_decoder.bit_stream);
+ RealignBits(&p_ac3thread->ac3_decoder.bit_stream);
}
/* If b_error is set, the ac3 decoder thread enters the error loop */
- if (p_ac3dec_t->p_fifo->b_error)
+ if (p_ac3thread->p_fifo->b_error)
{
- ErrorThread (p_ac3dec_t);
+ ErrorThread (p_ac3thread);
}
/* End of the ac3 decoder thread */
- EndThread (p_ac3dec_t);
+ EndThread (p_ac3thread);
}
/*****************************************************************************
* ErrorThread : ac3 decoder's RunThread() error loop
*****************************************************************************/
-static void ErrorThread (ac3dec_thread_t * p_ac3dec_t)
+static void ErrorThread (ac3dec_thread_t * p_ac3thread)
{
/* We take the lock, because we are going to read/write the start/end
* indexes of the decoder fifo */
- vlc_mutex_lock (&p_ac3dec_t->p_fifo->data_lock);
+ vlc_mutex_lock (&p_ac3thread->p_fifo->data_lock);
/* Wait until a `die' order is sent */
- while (!p_ac3dec_t->p_fifo->b_die)
+ while (!p_ac3thread->p_fifo->b_die)
{
/* Trash all received PES packets */
- while (!DECODER_FIFO_ISEMPTY(*p_ac3dec_t->p_fifo))
+ while (!DECODER_FIFO_ISEMPTY(*p_ac3thread->p_fifo))
{
- p_ac3dec_t->p_fifo->pf_delete_pes(p_ac3dec_t->p_fifo->p_packets_mgt,
- DECODER_FIFO_START(*p_ac3dec_t->p_fifo));
- DECODER_FIFO_INCSTART (*p_ac3dec_t->p_fifo);
+ p_ac3thread->p_fifo->pf_delete_pes(p_ac3thread->p_fifo->p_packets_mgt,
+ DECODER_FIFO_START(*p_ac3thread->p_fifo));
+ DECODER_FIFO_INCSTART (*p_ac3thread->p_fifo);
}
/* Waiting for the input thread to put new PES packets in the fifo */
- vlc_cond_wait (&p_ac3dec_t->p_fifo->data_wait,
- &p_ac3dec_t->p_fifo->data_lock);
+ vlc_cond_wait (&p_ac3thread->p_fifo->data_wait,
+ &p_ac3thread->p_fifo->data_lock);
}
/* We can release the lock before leaving */
- vlc_mutex_unlock (&p_ac3dec_t->p_fifo->data_lock);
+ vlc_mutex_unlock (&p_ac3thread->p_fifo->data_lock);
}
/*****************************************************************************
* EndThread : ac3 decoder thread destruction
*****************************************************************************/
-static void EndThread (ac3dec_thread_t * p_ac3dec_t)
+static void EndThread (ac3dec_thread_t * p_ac3thread)
{
- intf_DbgMsg ("ac3dec debug: destroying ac3 decoder thread %p", p_ac3dec_t);
+ intf_DbgMsg ("ac3dec debug: destroying ac3 decoder thread %p", p_ac3thread);
/* If the audio output fifo was created, we destroy it */
- if (p_ac3dec_t->p_aout_fifo != NULL)
+ if (p_ac3thread->p_aout_fifo != NULL)
{
- aout_DestroyFifo (p_ac3dec_t->p_aout_fifo);
+ aout_DestroyFifo (p_ac3thread->p_aout_fifo);
/* Make sure the output thread leaves the NextFrame() function */
- vlc_mutex_lock (&(p_ac3dec_t->p_aout_fifo->data_lock));
- vlc_cond_signal (&(p_ac3dec_t->p_aout_fifo->data_wait));
- vlc_mutex_unlock (&(p_ac3dec_t->p_aout_fifo->data_lock));
-
+ vlc_mutex_lock (&(p_ac3thread->p_aout_fifo->data_lock));
+ vlc_cond_signal (&(p_ac3thread->p_aout_fifo->data_wait));
+ vlc_mutex_unlock (&(p_ac3thread->p_aout_fifo->data_lock));
}
+ /* Unlock the modules */
+ module_Unneed( p_ac3thread->ac3_decoder.downmix.p_module );
+ module_Unneed( p_ac3thread->ac3_decoder.imdct.p_module );
+
/* Destroy descriptor */
- free( p_ac3dec_t->p_config );
- free( p_ac3dec_t );
+ free( p_ac3thread->p_config );
+ free( p_ac3thread );
- intf_DbgMsg ("ac3dec debug: ac3 decoder thread %p destroyed", p_ac3dec_t);
+ intf_DbgMsg ("ac3dec debug: ac3 decoder thread %p destroyed", p_ac3thread);
}
/*****************************************************************************
boolean_t b_new_pes)
{
- ac3dec_thread_t *p_ac3dec_t=(ac3dec_thread_t *)p_bit_stream->p_callback_arg;
+ ac3dec_thread_t *p_ac3thread=(ac3dec_thread_t *)p_bit_stream->p_callback_arg;
if( b_new_pes )
{
ptr = *(p_bit_stream->p_byte + 1);
ptr <<= 8;
ptr |= *(p_bit_stream->p_byte + 2);
- p_ac3dec_t->sync_ptr = ptr;
+ p_ac3thread->sync_ptr = ptr;
p_bit_stream->p_byte += 3;
}
}
+
projects / vlc / blobdiff