/* shine.c uses a lot of static variables, so we include the C file to keep
* the scope.
- * Note that it makes this decoder non reentrant, this is why we set
- * b_reentrant to VLC_FALSE in the module initialisation */
+ * Note that it makes this decoder non reentrant, this is why we have the
+ * struct entrant below */
#include "shine.c"
struct encoder_sys_t
set_callbacks( OpenEncoder, CloseEncoder );
vlc_module_end();
+static struct
+{
+ bool busy;
+ vlc_mutex_t lock;
+} entrant = { false, VLC_STATIC_MUTEX, };
+
static int OpenEncoder( vlc_object_t *p_this )
{
encoder_t *p_enc = (encoder_t*)p_this;
p_enc->fmt_out.i_bitrate, p_enc->fmt_out.audio.i_rate,
p_enc->fmt_out.audio.i_channels );
+ vlc_mutex_lock( &entrant.lock );
+ if( entrant.busy )
+ {
+ msg_Err( p_enc, "encoder already in progress" );
+ vlc_mutex_unlock( &entrant.lock );
+ return VLC_EGENERIC;
+ }
+ entrant.busy = true;
+ vlc_mutex_unlock( &entrant.lock );
+
p_enc->p_sys = p_sys = calloc( 1, sizeof( *p_sys ) );
if( !p_sys )
- return VLC_ENOMEM;
+ goto enomem;
if( !( p_sys->p_fifo = block_FifoNew() ) )
{
free( p_sys );
- return VLC_ENOMEM;
+ goto enomem;
}
init_mp3_encoder_engine( p_enc->fmt_out.audio.i_rate,
p_enc->fmt_out.i_cat = AUDIO_ES;
return VLC_SUCCESS;
+
+enomem:
+ vlc_mutex_lock( &entrant.lock );
+ entrant.busy = false;
+ vlc_mutex_unlock( &entrant.lock );
+ return VLC_ENOMEM;
}
/* We split/pack PCM blocks to a fixed size: pcm_chunk_size bytes */
if( !p_block ) goto buffered; /* just return a block if we can */
/* Put the PCM samples sent by VLC in the Fifo */
- while( p_sys->i_buffer + p_block->i_nb_bytes >= pcm_chunk_size )
+ while( p_sys->i_buffer + p_block->i_buffer >= pcm_chunk_size )
{
unsigned int i_buffer = 0;
p_pcm_block = block_New( p_enc, pcm_chunk_size );
p_block->p_buffer, pcm_chunk_size - i_buffer );
p_block->p_buffer += pcm_chunk_size - i_buffer;
- p_block->i_nb_bytes -= pcm_chunk_size - i_buffer;
+ p_block->i_buffer -= pcm_chunk_size - i_buffer;
block_FifoPut( p_sys->p_fifo, p_pcm_block );
}
/* We hadn't enough data to make a block, put it in standby */
- if( p_block->i_nb_bytes )
+ if( p_block->i_buffer )
{
uint8_t *p_tmp;
if( p_sys->i_buffer > 0 )
- p_tmp = realloc( p_sys->p_buffer, p_block->i_nb_bytes + p_sys->i_buffer );
+ p_tmp = realloc( p_sys->p_buffer, p_block->i_buffer + p_sys->i_buffer );
else
- p_tmp = malloc( p_block->i_nb_bytes );
+ p_tmp = malloc( p_block->i_buffer );
if( !p_tmp )
{
}
p_sys->p_buffer = p_tmp;
vlc_memcpy( p_sys->p_buffer + p_sys->i_buffer,
- p_block->p_buffer, p_block->i_nb_bytes );
+ p_block->p_buffer, p_block->i_buffer );
- p_sys->i_buffer += p_block->i_nb_bytes;
- p_block->i_nb_bytes = 0;
+ p_sys->i_buffer += p_block->i_buffer;
+ p_block->i_buffer = 0;
}
buffered:
{
block_t *p_pcm_block;
block_t *p_chain = NULL;
- unsigned int i_samples = p_block->i_nb_bytes >> 2 /* s16l stereo */;
+ unsigned int i_samples = p_block->i_buffer >> 2 /* s16l stereo */;
mtime_t start_date = p_block->i_pts;
start_date -= (mtime_t)i_samples * (mtime_t)1000000 / (mtime_t)p_enc->fmt_out.audio.i_rate;
start_date += p_mp3_block->i_length;
p_mp3_block->i_dts = p_mp3_block->i_pts = start_date;
- p_mp3_block->i_samples = SAMP_PER_FRAME1;
+ p_mp3_block->i_nb_samples = SAMP_PER_FRAME1;
block_ChainAppend( &p_chain, p_mp3_block );
{
encoder_sys_t *p_sys = ((encoder_t*)p_this)->p_sys;
+ vlc_mutex_lock( &entrant.lock );
+ entrant.busy = false;
+ vlc_mutex_unlock( &entrant.lock );
+
/* TODO: we should send the last PCM block padded with 0
* But we don't know if other blocks will come before it's too late */
if( p_sys->i_buffer )