set_capability( "packetizer", 100 )
set_callbacks( OpenPacketizer, CloseCommon )
+#ifdef ENABLE_SOUT
add_submodule ()
set_description( N_("Linear PCM audio encoder") )
set_capability( "encoder", 100 )
set_callbacks( OpenEncoder, CloseEncoder )
add_shortcut( "lpcm" )
+#endif
vlc_module_end ()
int i_type;
};
+#ifdef ENABLE_SOUT
struct encoder_sys_t
{
int i_channels;
int i_buffer_used;
int i_frame_num;
};
+#endif
/*
* LPCM DVD header :
free( p_dec->p_sys );
}
+#ifdef ENABLE_SOUT
/*****************************************************************************
* OpenEncoder: lpcm encoder construction
*****************************************************************************/
if( ( p_enc->p_sys = p_sys =
(encoder_sys_t *)malloc(sizeof(encoder_sys_t)) ) == NULL )
return VLC_ENOMEM;
+
+ /* In DVD LCPM, a frame is always 150 PTS ticks. */
+ p_sys->i_frame_samples = p_enc->fmt_in.audio.i_rate * 150 / 90000;
+ p_sys->p_buffer = (uint8_t *)malloc(
+ p_sys->i_frame_samples *
+ p_enc->fmt_in.audio.i_channels *
+ p_enc->fmt_in.audio.i_bitspersample);
+ p_sys->i_buffer_used = 0;
+ p_sys->i_frame_num = 0;
+ p_sys->i_channels = p_enc->fmt_in.audio.i_channels;
+ p_sys->i_rate = p_enc->fmt_in.audio.i_rate;
+
p_enc->pf_encode_audio = EncodeFrames;
p_enc->fmt_in.i_codec = p_enc->fmt_out.i_codec;
p_enc->fmt_out.i_bitrate =
p_enc->fmt_in.audio.i_channels *
p_enc->fmt_in.audio.i_rate *
- p_enc->fmt_in.audio.i_bitspersample;
-
- p_sys->i_channels = p_enc->fmt_in.audio.i_channels;
- p_sys->i_rate = p_enc->fmt_in.audio.i_rate;
+ p_enc->fmt_in.audio.i_bitspersample *
+ (p_sys->i_frame_samples + LPCM_VOB_HEADER_LEN) /
+ p_sys->i_frame_samples;
- /* In DVD LCPM, a frame is always 150 PTS ticks. */
- p_sys->i_frame_samples = p_enc->fmt_in.audio.i_rate * 150 / 90000;
- p_sys->p_buffer = (uint8_t *)malloc(
- p_sys->i_frame_samples *
- p_enc->fmt_in.audio.i_channels *
- p_enc->fmt_in.audio.i_bitspersample);
- p_sys->i_buffer_used = 0;
- p_sys->i_frame_num = 0;
-
return VLC_SUCCESS;
}
const int i_leftover_samples = ( p_sys->i_buffer_used + p_aout_buf->i_nb_samples ) %
p_sys->i_frame_samples;
const int i_frame_size = p_sys->i_frame_samples * p_sys->i_channels * 2 + LPCM_VOB_HEADER_LEN;
+ const int i_start_offset = -p_sys->i_buffer_used;
uint8_t i_freq_code = 0;
p_sys->i_buffer_used = 0;
i_bytes_consumed += i_consume_bytes;
- /*
- * The pts is strictly not correct if we have samples kept from
- * a previous buffer, but the frames are so small it should be OK.
- */
- p_block->i_dts = p_block->i_pts = p_aout_buf->i_pts + i * p_sys->i_frame_samples * CLOCK_FREQ / p_sys->i_rate;
+ p_block->i_dts = p_block->i_pts = p_aout_buf->i_pts +
+ (i * p_sys->i_frame_samples + i_start_offset) * CLOCK_FREQ / p_sys->i_rate;
p_block->i_length = p_sys->i_frame_samples * CLOCK_FREQ / p_sys->i_rate;
if( !p_first_block )
p_first_block = p_last_block = p_block;
else
- block_ChainLastAppend( &p_last_block, p_block );
+ p_last_block = p_last_block->p_next = p_block;
}
memcpy( p_sys->p_buffer,
return p_first_block;
}
+#endif
/*****************************************************************************
*