#define MAX_FRAME_DELAY (FF_MAX_B_FRAMES + 2)
+#define RAW_AUDIO_FRAME_SIZE (2048)
+
/*****************************************************************************
* Local prototypes
*****************************************************************************/
/*
* Audio properties
*/
+ int i_sample_bytes;
int i_frame_size;
int i_samples_delay;
mtime_t i_pts;
if ( p_sys->i_qmin > 0 && p_sys->i_qmin == p_sys->i_qmax )
p_context->flags |= CODEC_FLAG_QSCALE;
+ /* These codecs cause libavcodec to exit if thread_count is > 1.
+ See libavcodec/mpegvideo_enc.c:MPV_encode_init
+ */
+ if ( i_codec_id == CODEC_ID_FLV1 ||
+ i_codec_id == CODEC_ID_H261 ||
+ i_codec_id == CODEC_ID_LJPEG ||
+ i_codec_id == CODEC_ID_MJPEG ||
+ i_codec_id == CODEC_ID_H263 ||
+ i_codec_id == CODEC_ID_H263P ||
+ i_codec_id == CODEC_ID_MSMPEG4V1 ||
+ i_codec_id == CODEC_ID_MSMPEG4V2 ||
+ i_codec_id == CODEC_ID_MSMPEG4V3 ||
+ i_codec_id == CODEC_ID_WMV1 ||
+ i_codec_id == CODEC_ID_RV10 ||
+ i_codec_id == CODEC_ID_RV20 ||
+ i_codec_id == CODEC_ID_SVQ3 )
+ p_enc->i_threads = 1;
if ( p_enc->i_threads >= 1 )
avcodec_thread_init( p_context, p_enc->i_threads );
else
- avcodec_thread_init( p_context, 2 );
+ avcodec_thread_init( p_context, vlc_GetCPUCount() );
if( p_sys->i_vtolerance > 0 )
p_context->bit_rate_tolerance = p_sys->i_vtolerance;
if( i_codec_id == CODEC_ID_MP3 && p_enc->fmt_in.audio.i_channels > 2 )
p_enc->fmt_in.audio.i_channels = 2;
- p_context->codec_type = CODEC_TYPE_AUDIO;
+ p_context->codec_type = CODEC_TYPE_AUDIO;
+ p_context->sample_fmt = p_codec->sample_fmts ?
+ p_codec->sample_fmts[0] :
+ SAMPLE_FMT_S16;
p_enc->fmt_in.i_codec = VLC_CODEC_S16N;
p_context->sample_rate = p_enc->fmt_out.audio.i_rate;
p_context->channels = p_enc->fmt_out.audio.i_channels;
/* Misc parameters */
p_context->bit_rate = p_enc->fmt_out.i_bitrate;
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 52, 68, 2 )
+ /* Set reasonable defaults to VP8, based on
+ libvpx-720p preset from libvpx ffmpeg-patch */
+ if( i_codec_id == CODEC_ID_VP8 )
+ {
+ p_context->bit_rate_tolerance = 2* p_enc->fmt_out.i_bitrate;
+ p_context->lag = 16;
+ p_context->level = 216;
+ p_context->profile = 0;
+ p_context->rc_buffer_aggressivity = 0.95;
+ p_context->token_partitions = 4;
+ }
+#endif
+
if( i_codec_id == CODEC_ID_RAWVIDEO )
{
/* XXX: hack: Force same codec (will be handled by transcode) */
if( p_enc->fmt_in.i_cat == AUDIO_ES )
{
- p_sys->i_buffer_out = 2 * AVCODEC_MAX_AUDIO_FRAME_SIZE;
- p_sys->p_buffer_out = malloc( p_sys->i_buffer_out );
- p_sys->i_frame_size = p_context->frame_size * 2 * p_context->channels;
- p_sys->p_buffer = malloc( p_sys->i_frame_size );
+ GetVlcAudioFormat( &p_enc->fmt_in.i_codec,
+ &p_enc->fmt_in.audio.i_bitspersample,
+ p_sys->p_context->sample_fmt );
+ p_sys->i_sample_bytes = (p_enc->fmt_in.audio.i_bitspersample / 8) *
+ p_context->channels;
+ p_sys->i_frame_size = p_context->frame_size > 1 ?
+ p_context->frame_size :
+ RAW_AUDIO_FRAME_SIZE;
+ p_sys->p_buffer = malloc( p_sys->i_frame_size * p_sys->i_sample_bytes );
p_enc->fmt_out.audio.i_blockalign = p_context->block_align;
+ p_enc->fmt_out.audio.i_bitspersample = aout_BitsPerSample( vlc_fourcc_GetCodec( AUDIO_ES, p_enc->fmt_out.i_codec ) );
+
+ if( p_context->frame_size > 1 )
+ p_sys->i_buffer_out = 8 * AVCODEC_MAX_AUDIO_FRAME_SIZE;
+ else
+ p_sys->i_buffer_out = p_sys->i_frame_size * p_sys->i_sample_bytes;
+ p_sys->p_buffer_out = malloc( p_sys->i_buffer_out );
}
msg_Dbg( p_enc, "found encoder %s", psz_namecodec );
if( !p_sys->p_context->max_b_frames || !p_sys->p_context->delay )
{
/* No delay -> output pts == input pts */
- p_block->i_pts = p_block->i_dts = p_pict->date;
+ if( p_pict )
+ p_block->i_dts = p_pict->date;
+ p_block->i_pts = p_block->i_dts;
}
else if( p_sys->p_context->coded_frame->pts != (int64_t)AV_NOPTS_VALUE &&
p_sys->p_context->coded_frame->pts != 0 &&
static block_t *EncodeAudio( encoder_t *p_enc, aout_buffer_t *p_aout_buf )
{
encoder_sys_t *p_sys = p_enc->p_sys;
+
block_t *p_block, *p_chain = NULL;
uint8_t *p_buffer = p_aout_buf->p_buffer;
p_sys->i_samples_delay += i_samples;
- while( p_sys->i_samples_delay >= p_sys->p_context->frame_size )
+ while( p_sys->i_samples_delay >= p_sys->i_frame_size )
{
- int16_t *p_samples;
+ void *p_samples;
int i_out;
if( i_samples_delay )
{
/* Take care of the left-over from last time */
- int i_delay_size = i_samples_delay * 2 *
- p_sys->p_context->channels;
- int i_size = p_sys->i_frame_size - i_delay_size;
+ int i_delay_size = i_samples_delay;
+ int i_size = (p_sys->i_frame_size - i_delay_size) *
+ p_sys->i_sample_bytes;
- p_samples = (int16_t *)p_sys->p_buffer;
- memcpy( p_sys->p_buffer + i_delay_size, p_buffer, i_size );
- p_buffer -= i_delay_size;
+ memcpy( p_sys->p_buffer + i_delay_size * p_sys->i_sample_bytes,
+ p_buffer, i_size );
+ p_buffer -= i_delay_size * p_sys->i_sample_bytes;
i_samples += i_samples_delay;
i_samples_delay = 0;
+
+ p_samples = p_sys->p_buffer;
}
else
{
- p_samples = (int16_t *)p_buffer;
+ p_samples = p_buffer;
}
i_out = avcodec_encode_audio( p_sys->p_context, p_sys->p_buffer_out,
#if 0
msg_Warn( p_enc, "avcodec_encode_audio: %d", i_out );
#endif
- p_buffer += p_sys->i_frame_size;
- p_sys->i_samples_delay -= p_sys->p_context->frame_size;
- i_samples -= p_sys->p_context->frame_size;
+ p_buffer += p_sys->i_frame_size * p_sys->i_sample_bytes;
+ p_sys->i_samples_delay -= p_sys->i_frame_size;
+ i_samples -= p_sys->i_frame_size;
if( i_out <= 0 )
continue;
memcpy( p_block->p_buffer, p_sys->p_buffer_out, i_out );
p_block->i_length = (mtime_t)1000000 *
- (mtime_t)p_sys->p_context->frame_size /
+ (mtime_t)p_sys->i_frame_size /
(mtime_t)p_sys->p_context->sample_rate;
p_block->i_dts = p_block->i_pts = p_sys->i_pts;
/* Backup the remaining raw samples */
if( i_samples )
{
- memcpy( &p_sys->p_buffer[i_samples_delay * 2 * p_sys->p_context->channels],
+ memcpy( &p_sys->p_buffer[i_samples_delay * p_sys->i_sample_bytes],
p_buffer,
- i_samples * 2 * p_sys->p_context->channels );
+ i_samples * p_sys->i_sample_bytes );
}
return p_chain;
projects / vlc / blobdiff