#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;
p_sys->p_context = p_context = avcodec_alloc_context();
p_sys->p_context->codec_id = p_sys->p_codec->id;
- p_context->debug = config_GetInt( p_enc, "ffmpeg-debug" );
+ p_context->debug = var_InheritInteger( p_enc, "ffmpeg-debug" );
p_context->opaque = (void *)p_this;
/* Set CPU capabilities */
p_enc->fmt_in.video.i_sar_num,
p_enc->fmt_in.video.i_sar_den, 1 << 30 );
- p_sys->i_buffer_out = p_context->height * p_context->width
- * 3 /* Assume 24bpp maximum */
- + 200; /* some room for potential headers (such as BMP) */
-
- if( p_sys->i_buffer_out < FF_MIN_BUFFER_SIZE )
- p_sys->i_buffer_out = FF_MIN_BUFFER_SIZE;
- p_sys->p_buffer_out = malloc( p_sys->i_buffer_out );
+ p_sys->p_buffer_out = NULL;
p_enc->fmt_in.i_codec = VLC_CODEC_I420;
p_enc->fmt_in.video.i_chroma = p_enc->fmt_in.i_codec;
}
}
-#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT( 52, 0, 0 )
- if ( p_sys->b_trellis )
- p_context->flags |= CODEC_FLAG_TRELLIS_QUANT;
-#else
p_context->trellis = p_sys->b_trellis;
-#endif
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 and
+ libavcodec/svq3.c , WMV2 calls MPV_encode_init also.
+ */
+ 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_WMV2 ||
+ 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, 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, 69, 2 )
+ /* Set reasonable defaults to VP8, based on
+ libvpx-720p preset from libvpx ffmpeg-patch */
+ if( i_codec_id == CODEC_ID_VP8 )
+ {
+ /* Lets give bitrate tolerance */
+ p_context->bit_rate_tolerance = __MAX(2 * p_enc->fmt_out.i_bitrate, p_sys->i_vtolerance );
+ /* default to 120 frames between keyframe */
+ if( !var_GetInteger( p_enc, ENC_CFG_PREFIX "keyint" ) )
+ p_context->gop_size = 120;
+ /* Don't set rc-values atm, they were from time before
+ libvpx was officially in ffmpeg */
+ //p_context->rc_max_rate = 24 * 1000 * 1000; //24M
+ //p_context->rc_min_rate = 40 * 1000; // 40k
+ /* seems that ffmpeg presets have 720p as divider for buffers */
+ if( p_enc->fmt_out.video.i_height >= 720 )
+ {
+ /* Check that we don't overrun users qmin/qmax values */
+ if( !var_GetInteger( p_enc, ENC_CFG_PREFIX "qmin" ) )
+ {
+ p_context->mb_qmin = p_context->qmin = 10;
+ p_context->mb_lmin = p_context->lmin = 10 * FF_QP2LAMBDA;
+ }
+
+ if( !var_GetInteger( p_enc, ENC_CFG_PREFIX "qmax" ) )
+ {
+ p_context->mb_qmax = p_context->qmax = 42;
+ p_context->mb_lmax = p_context->lmax = 42 * FF_QP2LAMBDA;
+ }
+
+ } else {
+ if( !var_GetInteger( p_enc, ENC_CFG_PREFIX "qmin" ) )
+ {
+ p_context->mb_qmin = p_context->qmin = 1;
+ p_context->mb_lmin = p_context->lmin = FF_QP2LAMBDA;
+ }
+ }
+
+
+#if 0 /* enable when/if vp8 encoder is accepted in libavcodec */
+ p_context->lag = 16;
+ p_context->level = 216;
+ p_context->profile = 0;
+ p_context->rc_buffer_aggressivity = 0.95;
+ p_context->token_partitions = 4;
+ p_context->mb_static_threshold = 0;
+#endif
+ }
+#endif
+
if( i_codec_id == CODEC_ID_RAWVIDEO )
{
/* XXX: hack: Force same codec (will be handled by transcode) */
if( p_enc->fmt_out.i_extra )
{
p_enc->fmt_out.p_extra = malloc( p_enc->fmt_out.i_extra );
+ if ( p_enc->fmt_out.p_extra == NULL )
+ {
+ goto error;
+ }
memcpy( p_enc->fmt_out.p_extra, p_context->extradata,
p_enc->fmt_out.i_extra );
}
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 );
+ if ( p_sys->p_buffer == NULL )
+ {
+ goto error;
+ }
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 );
+ if ( p_sys->p_buffer_out == NULL )
+ {
+ goto error;
+ }
}
msg_Dbg( p_enc, "found encoder %s", psz_namecodec );
return VLC_SUCCESS;
+error:
+ free( p_enc->fmt_out.p_extra );
+ free( p_sys->p_buffer );
+ free( p_sys->p_buffer_out );
+ free( p_sys );
+ return VLC_ENOMEM;
}
/****************************************************************************
AVFrame frame;
int i_out, i_plane;
-
- memset( &frame, 0, sizeof( AVFrame ) );
- for( i_plane = 0; i_plane < p_pict->i_planes; i_plane++ )
- {
- frame.data[i_plane] = p_pict->p[i_plane].p_pixels;
- frame.linesize[i_plane] = p_pict->p[i_plane].i_pitch;
- }
-
- /* Let ffmpeg select the frame type */
- frame.pict_type = 0;
-
- frame.repeat_pict = p_pict->i_nb_fields - 2;
- frame.interlaced_frame = !p_pict->b_progressive;
- frame.top_field_first = !!p_pict->b_top_field_first;
-
- /* Set the pts of the frame being encoded (segfaults with mpeg4!)*/
- if( p_enc->fmt_out.i_codec != VLC_CODEC_MP4V )
+ /* Initialize the video output buffer the first time.
+ * This is done here instead of OpenEncoder() because we need the actual
+ * bits_per_pixel value, without having to assume anything.
+ */
+ if ( p_sys->p_buffer_out == NULL )
{
- frame.pts = p_pict->date ? p_pict->date : (int64_t)AV_NOPTS_VALUE;
+ int bytesPerPixel = p_enc->fmt_out.video.i_bits_per_pixel ?
+ p_enc->fmt_out.video.i_bits_per_pixel / 8 : 3;
- if ( p_sys->b_hurry_up && frame.pts != (int64_t)AV_NOPTS_VALUE )
- {
- mtime_t current_date = mdate();
+ p_sys->i_buffer_out = p_sys->p_context->height * p_sys->p_context->width
+ * bytesPerPixel + 200; /* some room for potential headers (such as BMP) */
- if ( current_date + HURRY_UP_GUARD3 > frame.pts )
- {
- p_sys->p_context->mb_decision = FF_MB_DECISION_SIMPLE;
-#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT( 52, 0, 0 )
- p_sys->p_context->flags &= ~CODEC_FLAG_TRELLIS_QUANT;
-#else
- p_sys->p_context->trellis = 0;
-#endif
- msg_Dbg( p_enc, "hurry up mode 3" );
- }
- else
- {
- p_sys->p_context->mb_decision = p_sys->i_hq;
-
- if ( current_date + HURRY_UP_GUARD2 > frame.pts )
- {
-#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT( 52, 0, 0 )
- p_sys->p_context->flags &= ~CODEC_FLAG_TRELLIS_QUANT;
-#else
- p_sys->p_context->trellis = 0;
-#endif
- p_sys->p_context->noise_reduction = p_sys->i_noise_reduction
- + (HURRY_UP_GUARD2 + current_date - frame.pts) / 500;
- msg_Dbg( p_enc, "hurry up mode 2" );
- }
- else
- {
-#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT( 52, 0, 0 )
- if ( p_sys->b_trellis )
- p_sys->p_context->flags |= CODEC_FLAG_TRELLIS_QUANT;
-#else
- p_sys->p_context->trellis = p_sys->b_trellis;
-#endif
-
- p_sys->p_context->noise_reduction =
- p_sys->i_noise_reduction;
- }
- }
+ if( p_sys->i_buffer_out < FF_MIN_BUFFER_SIZE )
+ p_sys->i_buffer_out = FF_MIN_BUFFER_SIZE;
+ p_sys->p_buffer_out = malloc( p_sys->i_buffer_out );
+ if ( p_sys->p_buffer_out == NULL )
+ return NULL;
+ }
- if ( current_date + HURRY_UP_GUARD1 > frame.pts )
- {
- frame.pict_type = FF_P_TYPE;
- /* msg_Dbg( p_enc, "hurry up mode 1 %lld", current_date + HURRY_UP_GUARD1 - frame.pts ); */
- }
- }
+ memset( &frame, 0, sizeof( AVFrame ) );
+ if( likely(p_pict) ) {
+ for( i_plane = 0; i_plane < p_pict->i_planes; i_plane++ )
+ {
+ frame.data[i_plane] = p_pict->p[i_plane].p_pixels;
+ frame.linesize[i_plane] = p_pict->p[i_plane].i_pitch;
+ }
+
+ /* Let ffmpeg select the frame type */
+ frame.pict_type = 0;
+
+ frame.repeat_pict = p_pict->i_nb_fields - 2;
+ frame.interlaced_frame = !p_pict->b_progressive;
+ frame.top_field_first = !!p_pict->b_top_field_first;
+
+ /* Set the pts of the frame being encoded (segfaults with mpeg4!)*/
+ if( p_enc->fmt_out.i_codec != VLC_CODEC_MP4V )
+ {
+ frame.pts = p_pict->date ? p_pict->date : (int64_t)AV_NOPTS_VALUE;
+
+ if ( p_sys->b_hurry_up && frame.pts != (int64_t)AV_NOPTS_VALUE )
+ {
+ mtime_t current_date = mdate();
+
+ if ( current_date + HURRY_UP_GUARD3 > frame.pts )
+ {
+ p_sys->p_context->mb_decision = FF_MB_DECISION_SIMPLE;
+ p_sys->p_context->trellis = 0;
+ msg_Dbg( p_enc, "hurry up mode 3" );
+ }
+ else
+ {
+ p_sys->p_context->mb_decision = p_sys->i_hq;
+
+ if ( current_date + HURRY_UP_GUARD2 > frame.pts )
+ {
+ p_sys->p_context->trellis = 0;
+ p_sys->p_context->noise_reduction = p_sys->i_noise_reduction
+ + (HURRY_UP_GUARD2 + current_date - frame.pts) / 500;
+ msg_Dbg( p_enc, "hurry up mode 2" );
+ }
+ else
+ {
+ p_sys->p_context->trellis = p_sys->b_trellis;
+
+ p_sys->p_context->noise_reduction =
+ p_sys->i_noise_reduction;
+ }
+ }
+
+ if ( current_date + HURRY_UP_GUARD1 > frame.pts )
+ {
+ frame.pict_type = FF_P_TYPE;
+ /* msg_Dbg( p_enc, "hurry up mode 1 %lld", current_date + HURRY_UP_GUARD1 - frame.pts ); */
+ }
+ }
+ }
+ else
+ {
+ frame.pts = (int64_t)AV_NOPTS_VALUE;
+ }
+
+ if ( frame.pts != (int64_t)AV_NOPTS_VALUE && frame.pts != 0 )
+ {
+ if ( p_sys->i_last_pts == frame.pts )
+ {
+ msg_Warn( p_enc, "almost fed libavcodec with two frames with the "
+ "same PTS (%"PRId64 ")", frame.pts );
+ return NULL;
+ }
+ else if ( p_sys->i_last_pts > frame.pts )
+ {
+ msg_Warn( p_enc, "almost fed libavcodec with a frame in the "
+ "past (current: %"PRId64 ", last: %"PRId64")",
+ frame.pts, p_sys->i_last_pts );
+ return NULL;
+ }
+ else
+ {
+ p_sys->i_last_pts = frame.pts;
+ }
+ }
+
+ frame.quality = p_sys->i_quality;
+
+ /* Ugly work-around for stupid libavcodec behaviour */
+ p_sys->i_framenum++;
+ p_sys->pi_delay_pts[p_sys->i_framenum % MAX_FRAME_DELAY] = frame.pts;
+ frame.pts = p_sys->i_framenum * AV_TIME_BASE *
+ p_enc->fmt_in.video.i_frame_rate_base;
+ frame.pts += p_enc->fmt_in.video.i_frame_rate - 1;
+ frame.pts /= p_enc->fmt_in.video.i_frame_rate;
+ /* End work-around */
+
+ i_out = avcodec_encode_video( p_sys->p_context, p_sys->p_buffer_out,
+ p_sys->i_buffer_out, &frame );
}
else
{
- frame.pts = (int64_t)AV_NOPTS_VALUE;
+ i_out = avcodec_encode_video( p_sys->p_context, p_sys->p_buffer_out,
+ p_sys->i_buffer_out, NULL);
}
- if ( frame.pts != (int64_t)AV_NOPTS_VALUE && frame.pts != 0 )
- {
- if ( p_sys->i_last_pts == frame.pts )
- {
- msg_Warn( p_enc, "almost fed libavcodec with two frames with the "
- "same PTS (%"PRId64 ")", frame.pts );
- return NULL;
- }
- else if ( p_sys->i_last_pts > frame.pts )
- {
- msg_Warn( p_enc, "almost fed libavcodec with a frame in the "
- "past (current: %"PRId64 ", last: %"PRId64")",
- frame.pts, p_sys->i_last_pts );
- return NULL;
- }
- else
- {
- p_sys->i_last_pts = frame.pts;
- }
- }
-
- frame.quality = p_sys->i_quality;
-
- /* Ugly work-around for stupid libavcodec behaviour */
- p_sys->i_framenum++;
- p_sys->pi_delay_pts[p_sys->i_framenum % MAX_FRAME_DELAY] = frame.pts;
- frame.pts = p_sys->i_framenum * AV_TIME_BASE *
- p_enc->fmt_in.video.i_frame_rate_base;
- frame.pts += p_enc->fmt_in.video.i_frame_rate - 1;
- frame.pts /= p_enc->fmt_in.video.i_frame_rate;
- /* End work-around */
-
- i_out = avcodec_encode_video( p_sys->p_context, p_sys->p_buffer_out,
- p_sys->i_buffer_out, &frame );
-
if( i_out > 0 )
{
block_t *p_block = block_New( p_enc, i_out );
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
- if( i_out < 0 ) break;
-
- 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;
+ if( i_out <= 0 )
+ continue;
p_block = block_New( p_enc, i_out );
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, p_buffer,
- i_samples * 2 * p_sys->p_context->channels );
+ memcpy( &p_sys->p_buffer[i_samples_delay * p_sys->i_sample_bytes],
+ p_buffer,
+ i_samples * p_sys->i_sample_bytes );
}
return p_chain;