#define HAVE_MMX 1
#ifdef HAVE_LIBAVCODEC_AVCODEC_H
# include <libavcodec/avcodec.h>
-#elif defined(HAVE_FFMPEG_AVCODEC_H)
-# include <ffmpeg/avcodec.h>
#else
# include <avcodec.h>
#endif
char *psz_val;
int i_val;
- if( !GetFfmpegCodec( p_enc->fmt_out.i_codec, &i_cat, &i_codec_id,
+ if( p_enc->fmt_out.i_codec == VLC_CODEC_MP3 )
+ {
+ i_cat = AUDIO_ES;
+ i_codec_id = CODEC_ID_MP3;
+ psz_namecodec = "MPEG I/II Layer 3";
+ }
+ else if( p_enc->fmt_out.i_codec == VLC_CODEC_MP2 )
+ {
+ i_cat = AUDIO_ES;
+ i_codec_id = CODEC_ID_MP2;
+ psz_namecodec = "MPEG I/II Layer 2";
+ }
+ else if( !GetFfmpegCodec( p_enc->fmt_out.i_codec, &i_cat, &i_codec_id,
&psz_namecodec ) )
{
if( TestFfmpegChroma( -1, p_enc->fmt_out.i_codec ) != VLC_SUCCESS )
p_context->dsp_mask = 0;
if( !(i_cpu & CPU_CAPABILITY_MMX) )
{
- p_context->dsp_mask |= FF_MM_MMX;
+ p_context->dsp_mask |= AV_CPU_FLAG_MMX;
}
if( !(i_cpu & CPU_CAPABILITY_MMXEXT) )
{
- p_context->dsp_mask |= FF_MM_MMXEXT;
+ p_context->dsp_mask |= AV_CPU_FLAG_MMX2;
}
if( !(i_cpu & CPU_CAPABILITY_3DNOW) )
{
- p_context->dsp_mask |= FF_MM_3DNOW;
+ p_context->dsp_mask |= AV_CPU_FLAG_3DNOW;
}
if( !(i_cpu & CPU_CAPABILITY_SSE) )
{
- p_context->dsp_mask |= FF_MM_SSE;
- p_context->dsp_mask |= FF_MM_SSE2;
+ p_context->dsp_mask |= AV_CPU_FLAG_SSE;
+ p_context->dsp_mask |= AV_CPU_FLAG_SSE2;
}
config_ChainParse( p_enc, ENC_CFG_PREFIX, ppsz_enc_options, p_enc->p_cfg );
return VLC_EGENERIC;
}
- p_context->codec_type = CODEC_TYPE_VIDEO;
+ p_context->codec_type = AVMEDIA_TYPE_VIDEO;
p_context->width = p_enc->fmt_in.video.i_width;
p_context->height = p_enc->fmt_in.video.i_height;
p_context->time_base.num = p_enc->fmt_in.video.i_frame_rate_base;
p_context->time_base.den = p_enc->fmt_in.video.i_frame_rate;
+ if( p_codec->supported_framerates )
+ {
+ AVRational target = {
+ .num = p_enc->fmt_in.video.i_frame_rate,
+ .den = p_enc->fmt_in.video.i_frame_rate_base,
+ };
+ int idx = av_find_nearest_q_idx(target, p_codec->supported_framerates);
+
+ p_context->time_base.num = p_codec->supported_framerates[idx].den;
+ p_context->time_base.den = p_codec->supported_framerates[idx].num;
+ }
/* Defaults from ffmpeg.c */
p_context->qblur = 0.5;
p_enc->fmt_out.i_codec == VLC_CODEC_MP1V ) )
p_context->flags |= CODEC_FLAG_LOW_DELAY;
+ if( p_enc->fmt_out.i_codec == VLC_CODEC_MP2V )
+ p_context->idct_algo = FF_IDCT_LIBMPEG2MMX;
+
av_reduce( &p_context->sample_aspect_ratio.num,
&p_context->sample_aspect_ratio.den,
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;
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( p_sys->i_qmin > 0 )
{
- p_context->mb_qmin = p_context->qmin = p_sys->i_qmin;
+ p_context->qmin = p_sys->i_qmin;
p_context->mb_lmin = p_context->lmin = p_sys->i_qmin * FF_QP2LAMBDA;
}
if( p_sys->i_qmax > 0 )
{
- p_context->mb_qmax = p_context->qmax = p_sys->i_qmax;
+ p_context->qmax = p_sys->i_qmax;
p_context->mb_lmax = p_context->lmax = p_sys->i_qmax * FF_QP2LAMBDA;
}
p_context->max_qdiff = 3;
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 = AVMEDIA_TYPE_AUDIO;
p_context->sample_fmt = p_codec->sample_fmts ?
p_codec->sample_fmts[0] :
SAMPLE_FMT_S16;
{
/* 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_width >= 720 )
+ 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 * FF_QP2LAMBDA;
- 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 * FF_QP2LAMBDA;
- p_context->mb_lmax = p_context->lmax = 42 * FF_QP2LAMBDA;
- }
-
- p_context->rc_max_rate = 24 * 1000 * 1000; //24M
- p_context->rc_min_rate = 100 * 1000; // 100k
- } else {
- if( !var_GetInteger( p_enc, ENC_CFG_PREFIX "qmin" ) )
- {
- p_context->mb_qmin = p_context->qmin = FF_QP2LAMBDA;
- p_context->mb_lmin = p_context->lmin = FF_QP2LAMBDA;
- }
-
- p_context->rc_max_rate = 1.5 * 1000 * 1000; //1.5M
- p_context->rc_min_rate = 40 * 1000; // 40k
+ /* Check that we don't overrun users qmin/qmax values */
+ if( !var_GetInteger( p_enc, ENC_CFG_PREFIX "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->qmax = 42;
+ p_context->mb_lmax = p_context->lmax = 42 * FF_QP2LAMBDA;
+ }
+
+ } else {
+ if( !var_GetInteger( p_enc, ENC_CFG_PREFIX "qmin" ) )
+ {
+ p_context->qmin = 1;
+ p_context->mb_lmin = p_context->lmin = FF_QP2LAMBDA;
+ }
}
p_context->extradata = NULL;
p_context->flags |= CODEC_FLAG_GLOBAL_HEADER;
+ if( p_enc->i_threads >= 1)
+ p_context->thread_count = p_enc->i_threads;
+ else
+ p_context->thread_count = vlc_GetCPUCount();
+
int ret;
vlc_avcodec_lock();
ret = avcodec_open( p_context, p_codec );
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 );
}
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 ) );
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;
}
/****************************************************************************
static block_t *EncodeVideo( encoder_t *p_enc, picture_t *p_pict )
{
encoder_sys_t *p_sys = p_enc->p_sys;
- AVFrame frame;
int i_out, i_plane;
+ /* 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 )
+ {
+ int bytesPerPixel = p_enc->fmt_out.video.i_bits_per_pixel ?
+ p_enc->fmt_out.video.i_bits_per_pixel / 8 : 3;
+
+ 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( 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;
+ }
- 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
+ AVFrame frame;
+ 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 )
+ {
+ 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;
+ 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->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 "
+ }
+ }
+
+ 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 "
+ 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,
+ 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
{
- i_out = avcodec_encode_video( p_sys->p_context, p_sys->p_buffer_out,
+ i_out = avcodec_encode_video( p_sys->p_context, p_sys->p_buffer_out,
p_sys->i_buffer_out, NULL);
}
- if( i_out > 0 )
+ if( i_out <= 0 )
+ return NULL;
+
+ block_t *p_block = block_New( p_enc, i_out );
+ memcpy( p_block->p_buffer, p_sys->p_buffer_out, i_out );
+
+ /* FIXME, 3-2 pulldown is not handled correctly */
+ p_block->i_length = INT64_C(1000000) *
+ p_enc->fmt_in.video.i_frame_rate_base /
+ p_enc->fmt_in.video.i_frame_rate;
+
+ if( !p_sys->p_context->max_b_frames || !p_sys->p_context->delay )
{
- block_t *p_block = block_New( p_enc, i_out );
- memcpy( p_block->p_buffer, p_sys->p_buffer_out, i_out );
+ /* No delay -> output pts == input pts */
+ 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 &&
+ p_sys->i_buggy_pts_detect != p_sys->p_context->coded_frame->pts )
+ {
+ p_sys->i_buggy_pts_detect = p_sys->p_context->coded_frame->pts;
+ p_block->i_pts = p_sys->p_context->coded_frame->pts;
+
+ /* Ugly work-around for stupid libavcodec behaviour */
+ {
+ int64_t i_framenum = p_block->i_pts *
+ p_enc->fmt_in.video.i_frame_rate /
+ p_enc->fmt_in.video.i_frame_rate_base / AV_TIME_BASE;
- /* FIXME, 3-2 pulldown is not handled correctly */
- p_block->i_length = INT64_C(1000000) *
- p_enc->fmt_in.video.i_frame_rate_base /
- p_enc->fmt_in.video.i_frame_rate;
+ p_block->i_pts = p_sys->pi_delay_pts[i_framenum % MAX_FRAME_DELAY];
+ }
+ /* End work-around */
- if( !p_sys->p_context->max_b_frames || !p_sys->p_context->delay )
+ if( p_sys->p_context->coded_frame->pict_type != FF_I_TYPE &&
+ p_sys->p_context->coded_frame->pict_type != FF_P_TYPE )
{
- /* No delay -> output pts == input pts */
- if( p_pict )
- p_block->i_dts = p_pict->date;
- p_block->i_pts = p_block->i_dts;
+ p_block->i_dts = p_block->i_pts;
}
- else if( p_sys->p_context->coded_frame->pts != (int64_t)AV_NOPTS_VALUE &&
- p_sys->p_context->coded_frame->pts != 0 &&
- p_sys->i_buggy_pts_detect != p_sys->p_context->coded_frame->pts )
+ else
{
- p_sys->i_buggy_pts_detect = p_sys->p_context->coded_frame->pts;
- p_block->i_pts = p_sys->p_context->coded_frame->pts;
-
- /* Ugly work-around for stupid libavcodec behaviour */
- {
- int64_t i_framenum = p_block->i_pts *
- p_enc->fmt_in.video.i_frame_rate /
- p_enc->fmt_in.video.i_frame_rate_base / AV_TIME_BASE;
-
- p_block->i_pts = p_sys->pi_delay_pts[i_framenum % MAX_FRAME_DELAY];
- }
- /* End work-around */
-
- if( p_sys->p_context->coded_frame->pict_type != FF_I_TYPE &&
- p_sys->p_context->coded_frame->pict_type != FF_P_TYPE )
+ if( p_sys->i_last_ref_pts )
{
- p_block->i_dts = p_block->i_pts;
+ p_block->i_dts = p_sys->i_last_ref_pts;
}
else
{
- if( p_sys->i_last_ref_pts )
- {
- p_block->i_dts = p_sys->i_last_ref_pts;
- }
- else
- {
- /* Let's put something sensible */
- p_block->i_dts = p_block->i_pts;
- }
-
- p_sys->i_last_ref_pts = p_block->i_pts;
+ /* Let's put something sensible */
+ p_block->i_dts = p_block->i_pts;
}
- }
- else
- {
- /* Buggy libavcodec which doesn't update coded_frame->pts
- * correctly */
- p_block->i_dts = p_block->i_pts = p_pict->date;
- }
- switch ( p_sys->p_context->coded_frame->pict_type )
- {
- case FF_I_TYPE:
- p_block->i_flags |= BLOCK_FLAG_TYPE_I;
- break;
- case FF_P_TYPE:
- p_block->i_flags |= BLOCK_FLAG_TYPE_P;
- break;
- case FF_B_TYPE:
- p_block->i_flags |= BLOCK_FLAG_TYPE_B;
- break;
+ p_sys->i_last_ref_pts = p_block->i_pts;
}
+ }
+ else if( p_pict )
+ {
+ /* Buggy libavcodec which doesn't update coded_frame->pts
+ * correctly */
+ p_block->i_dts = p_block->i_pts = p_pict->date;
+ }
- return p_block;
+ switch ( p_sys->p_context->coded_frame->pict_type )
+ {
+ case FF_I_TYPE:
+ p_block->i_flags |= BLOCK_FLAG_TYPE_I;
+ break;
+ case FF_P_TYPE:
+ p_block->i_flags |= BLOCK_FLAG_TYPE_P;
+ break;
+ case FF_B_TYPE:
+ p_block->i_flags |= BLOCK_FLAG_TYPE_B;
+ break;
}
- return NULL;
+ return p_block;
}
/****************************************************************************
projects / vlc / blobdiff