/*****************************************************************************
* encoder.c: video and audio encoder using the ffmpeg library
*****************************************************************************
- * Copyright (C) 1999-2001 VideoLAN
- * $Id: encoder.c,v 1.23 2004/02/21 22:41:49 gbazin Exp $
+ * Copyright (C) 1999-2004 the VideoLAN team
+ * $Id$
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
- * Gildas Bazin <gbazin@netcourrier.com>
+ * Gildas Bazin <gbazin@videolan.org>
+ * Christophe Massiot <massiot@via.ecp.fr>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
#include <vlc/vlc.h>
#include <vlc/vout.h>
#include <vlc/aout.h>
+#include <vlc/sout.h>
#include <vlc/decoder.h>
/* ffmpeg header */
# include <avcodec.h>
#endif
+#if LIBAVCODEC_BUILD < 4704
+# define AV_NOPTS_VALUE 0
+#endif
+#if LIBAVCODEC_BUILD < 4684
+# define FF_QP2LAMBDA 118
+#endif
+
#include "ffmpeg.h"
#define AVCODEC_MAX_VIDEO_FRAME_SIZE (3*1024*1024)
-#define HURRY_UP_GUARD1 (1000000)
-#define HURRY_UP_GUARD2 (1000000)
-#define HURRY_UP_GUARD3 (200000)
+#define HURRY_UP_GUARD1 (450000)
+#define HURRY_UP_GUARD2 (300000)
+#define HURRY_UP_GUARD3 (100000)
+
+#define MAX_FRAME_DELAY (FF_MAX_B_FRAMES + 2)
/*****************************************************************************
* Local prototypes
*/
mtime_t i_last_ref_pts;
mtime_t i_buggy_pts_detect;
+ mtime_t i_last_pts;
vlc_bool_t b_inited;
/*
int i_frame_size;
int i_samples_delay;
mtime_t i_pts;
+
+ /* Encoding settings */
+ int i_key_int;
+ int i_b_frames;
+ int i_vtolerance;
+ int i_qmin;
+ int i_qmax;
+ int i_hq;
+ vlc_bool_t b_strict_rc;
+ int i_rc_buffer_size;
+ float f_rc_buffer_aggressivity;
+ vlc_bool_t b_pre_me;
+ vlc_bool_t b_hurry_up;
+ vlc_bool_t b_interlace, b_interlace_me;
+ float f_i_quant_factor;
+ int i_noise_reduction;
+ vlc_bool_t b_mpeg4_matrix;
+ vlc_bool_t b_trellis;
+ int i_quality; /* for VBR */
+ float f_lumi_masking, f_dark_masking, f_p_masking, f_border_masking;
+ int i_luma_elim, i_chroma_elim;
+
+ /* Used to work around stupid timestamping behaviour in libavcodec */
+ uint64_t i_framenum;
+ mtime_t pi_delay_pts[MAX_FRAME_DELAY];
+};
+
+static const char *ppsz_enc_options[] = {
+ "keyint", "bframes", "vt", "qmin", "qmax", "hq", "strict-rc",
+ "rc-buffer-size", "rc-buffer-aggressivity", "pre-me", "hurry-up",
+ "interlace", "i-quant-factor", "noise-reduction", "mpeg4-matrix",
+ "trellis", "qscale", "strict", "lumi-masking", "dark-masking",
+ "p-masking", "border-masking", "luma-elim-threshold",
+ "chroma-elim-threshold", NULL
+};
+
+static const uint16_t mpa_bitrate_tab[2][15] =
+{
+ {0, 32, 48, 56, 64, 80, 96, 112, 128, 160, 192, 224, 256, 320, 384},
+ {0, 8, 16, 24, 32, 40, 48, 56, 64, 80, 96, 112, 128, 144, 160}
};
+static const uint16_t mpa_freq_tab[6] =
+{ 44100, 48000, 32000, 22050, 24000, 16000 };
+
/*****************************************************************************
* OpenEncoder: probe the encoder
*****************************************************************************/
-extern int16_t ff_mpeg4_default_intra_matrix[];
-extern int16_t ff_mpeg4_default_non_intra_matrix[];
+extern int16_t IMPORT_SYMBOL ff_mpeg4_default_intra_matrix[];
+extern int16_t IMPORT_SYMBOL ff_mpeg4_default_non_intra_matrix[];
int E_(OpenEncoder)( vlc_object_t *p_this )
{
AVCodec *p_codec;
int i_codec_id, i_cat;
char *psz_namecodec;
+ vlc_value_t val;
+ vlc_value_t lockval;
+
+ var_Get( p_enc->p_libvlc, "avcodec", &lockval );
if( !E_(GetFfmpegCodec)( p_enc->fmt_out.i_codec, &i_cat, &i_codec_id,
&psz_namecodec ) )
msg_Err( p_enc, "out of memory" );
return VLC_EGENERIC;
}
+ memset( p_sys, 0, sizeof(encoder_sys_t) );
p_enc->p_sys = p_sys;
p_sys->p_codec = p_codec;
p_sys->p_buffer_out = NULL;
p_sys->p_buffer = NULL;
- p_sys->b_inited = 0;
p_sys->p_context = p_context = avcodec_alloc_context();
+ p_context->debug = config_GetInt( p_enc, "ffmpeg-debug" );
+ p_context->opaque = (void *)p_this;
/* Set CPU capabilities */
p_context->dsp_mask = 0;
p_context->dsp_mask |= FF_MM_SSE2;
}
- /* Make sure we get extradata filled by the encoder */
- p_context->extradata_size = 0;
- p_context->extradata = NULL;
- p_context->flags |= CODEC_FLAG_GLOBAL_HEADER;
+ sout_CfgParse( p_enc, ENC_CFG_PREFIX, ppsz_enc_options, p_enc->p_cfg );
+
+ var_Get( p_enc, ENC_CFG_PREFIX "keyint", &val );
+ p_sys->i_key_int = val.i_int;
+
+ var_Get( p_enc, ENC_CFG_PREFIX "bframes", &val );
+ p_sys->i_b_frames = val.i_int;
+
+ var_Get( p_enc, ENC_CFG_PREFIX "vt", &val );
+ p_sys->i_vtolerance = val.i_int;
+
+ var_Get( p_enc, ENC_CFG_PREFIX "interlace", &val );
+ p_sys->b_interlace = val.b_bool;
+
+ var_Get( p_enc, ENC_CFG_PREFIX "interlace-me", &val );
+ p_sys->b_interlace_me = val.b_bool;
+
+ var_Get( p_enc, ENC_CFG_PREFIX "pre-me", &val );
+ p_sys->b_pre_me = val.b_bool;
+
+ var_Get( p_enc, ENC_CFG_PREFIX "hurry-up", &val );
+ p_sys->b_hurry_up = val.b_bool;
+ if( p_sys->b_hurry_up )
+ {
+ /* hurry up mode needs noise reduction, even small */
+ p_sys->i_noise_reduction = 1;
+ }
+
+ var_Get( p_enc, ENC_CFG_PREFIX "strict-rc", &val );
+ p_sys->b_strict_rc = val.b_bool;
+ var_Get( p_enc, ENC_CFG_PREFIX "rc-buffer-size", &val );
+ p_sys->i_rc_buffer_size = val.i_int;
+ var_Get( p_enc, ENC_CFG_PREFIX "rc-buffer-aggressivity", &val );
+ p_sys->f_rc_buffer_aggressivity = val.f_float;
+
+ var_Get( p_enc, ENC_CFG_PREFIX "i-quant-factor", &val );
+ p_sys->f_i_quant_factor = val.f_float;
+
+ var_Get( p_enc, ENC_CFG_PREFIX "noise-reduction", &val );
+ p_sys->i_noise_reduction = val.i_int;
+
+ var_Get( p_enc, ENC_CFG_PREFIX "mpeg4-matrix", &val );
+ p_sys->b_mpeg4_matrix = val.b_bool;
+
+ var_Get( p_enc, ENC_CFG_PREFIX "qscale", &val );
+ if( val.f_float < 0.01 || val.f_float > 255.0 ) val.f_float = 0;
+ p_sys->i_quality = (int)(FF_QP2LAMBDA * val.f_float + 0.5);
+
+ var_Get( p_enc, ENC_CFG_PREFIX "hq", &val );
+ if( val.psz_string && *val.psz_string )
+ {
+ if( !strcmp( val.psz_string, "rd" ) )
+ p_sys->i_hq = FF_MB_DECISION_RD;
+ else if( !strcmp( val.psz_string, "bits" ) )
+ p_sys->i_hq = FF_MB_DECISION_BITS;
+ else if( !strcmp( val.psz_string, "simple" ) )
+ p_sys->i_hq = FF_MB_DECISION_SIMPLE;
+ else
+ p_sys->i_hq = FF_MB_DECISION_RD;
+ }
+ if( val.psz_string ) free( val.psz_string );
+
+ var_Get( p_enc, ENC_CFG_PREFIX "qmin", &val );
+ p_sys->i_qmin = val.i_int;
+ var_Get( p_enc, ENC_CFG_PREFIX "qmax", &val );
+ p_sys->i_qmax = val.i_int;
+ var_Get( p_enc, ENC_CFG_PREFIX "trellis", &val );
+ p_sys->b_trellis = val.b_bool;
+
+ var_Get( p_enc, ENC_CFG_PREFIX "strict", &val );
+ if( val.i_int < - 1 || val.i_int > 1 ) val.i_int = 0;
+ p_context->strict_std_compliance = val.i_int;
+
+ var_Get( p_enc, ENC_CFG_PREFIX "lumi-masking", &val );
+ p_sys->f_lumi_masking = val.f_float;
+ var_Get( p_enc, ENC_CFG_PREFIX "dark-masking", &val );
+ p_sys->f_dark_masking = val.f_float;
+ var_Get( p_enc, ENC_CFG_PREFIX "p-masking", &val );
+ p_sys->f_p_masking = val.f_float;
+ var_Get( p_enc, ENC_CFG_PREFIX "border-masking", &val );
+ p_sys->f_border_masking = val.f_float;
+ var_Get( p_enc, ENC_CFG_PREFIX "luma-elim-threshold", &val );
+ p_sys->i_luma_elim = val.i_int;
+ var_Get( p_enc, ENC_CFG_PREFIX "chroma-elim-threshold", &val );
+ p_sys->i_chroma_elim = val.i_int;
if( p_enc->fmt_in.i_cat == VIDEO_ES )
{
+ int i_aspect_num, i_aspect_den;
+
if( !p_enc->fmt_in.video.i_width || !p_enc->fmt_in.video.i_height )
{
msg_Warn( p_enc, "invalid size %ix%i", p_enc->fmt_in.video.i_width,
p_context->width = p_enc->fmt_in.video.i_width;
p_context->height = p_enc->fmt_in.video.i_height;
+#if LIBAVCODEC_BUILD >= 4754
+ 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;
+#else
p_context->frame_rate = p_enc->fmt_in.video.i_frame_rate;
p_context->frame_rate_base= p_enc->fmt_in.video.i_frame_rate_base;
+#endif
/* Defaults from ffmpeg.c */
p_context->qblur = 0.5;
p_context->i_quant_offset = 0.0;
p_context->i_quant_factor = -0.8;
- p_context->gop_size = p_enc->i_key_int > 0 ? p_enc->i_key_int : 50;
+ p_context->lumi_masking = p_sys->f_lumi_masking;
+ p_context->dark_masking = p_sys->f_dark_masking;
+ p_context->p_masking = p_sys->f_p_masking;
+#if LIBAVCODEC_BUILD >= 4741
+ p_context->border_masking = p_sys->f_border_masking;
+#endif
+ p_context->luma_elim_threshold = p_sys->i_luma_elim;
+ p_context->chroma_elim_threshold = p_sys->i_chroma_elim;
+
+ if( p_sys->i_key_int > 0 )
+ p_context->gop_size = p_sys->i_key_int;
p_context->max_b_frames =
- __MIN( p_enc->i_b_frames, FF_MAX_B_FRAMES );
+ __MAX( __MIN( p_sys->i_b_frames, FF_MAX_B_FRAMES ), 0 );
p_context->b_frame_strategy = 0;
#if LIBAVCODEC_BUILD >= 4687
- p_context->sample_aspect_ratio =
- (AVRational){ p_enc->fmt_in.video.i_aspect *
- (int64_t)p_context->height / p_context->width,
- VOUT_ASPECT_FACTOR };
+ av_reduce( &i_aspect_num, &i_aspect_den,
+ p_enc->fmt_in.video.i_aspect,
+ VOUT_ASPECT_FACTOR, 1 << 30 /* something big */ );
+ av_reduce( &p_context->sample_aspect_ratio.num,
+ &p_context->sample_aspect_ratio.den,
+ i_aspect_num * (int64_t)p_context->height,
+ i_aspect_den * (int64_t)p_context->width, 1 << 30 );
#else
p_context->aspect_ratio = ((float)p_enc->fmt_in.video.i_aspect) /
VOUT_ASPECT_FACTOR;
p_sys->p_buffer_out = malloc( AVCODEC_MAX_VIDEO_FRAME_SIZE );
p_enc->fmt_in.i_codec = VLC_FOURCC('I','4','2','0');
-
- if ( p_enc->b_strict_rc )
+ p_context->pix_fmt = E_(GetFfmpegChroma)( p_enc->fmt_in.i_codec );
+#if LIBAVCODEC_BUILD >= 4714
+ if( p_codec->pix_fmts )
{
- p_context->rc_max_rate = p_enc->fmt_out.i_bitrate;
- p_context->rc_buffer_size = p_enc->i_rc_buffer_size;
- p_context->rc_buffer_aggressivity = p_enc->f_rc_buffer_aggressivity;
+ const enum PixelFormat *p = p_codec->pix_fmts;
+ for( ; *p != -1; p++ )
+ {
+ if( *p == p_context->pix_fmt ) break;
+ }
+ if( *p == -1 ) p_context->pix_fmt = p_codec->pix_fmts[0];
+ p_enc->fmt_in.i_codec = E_(GetVlcChroma)( p_context->pix_fmt );
}
+#else
+ p_enc->fmt_in.i_codec = E_(GetVlcChroma)( p_context->pix_fmt );
+#endif
- if ( p_enc->f_i_quant_factor != 0.0 )
+ if ( p_sys->b_strict_rc )
{
- p_context->i_quant_factor = p_enc->f_i_quant_factor;
+ p_context->rc_max_rate = p_enc->fmt_out.i_bitrate;
+ p_context->rc_buffer_size = p_sys->i_rc_buffer_size;
+ /* This is from ffmpeg's ffmpeg.c : */
+ p_context->rc_initial_buffer_occupancy
+ = p_sys->i_rc_buffer_size * 3/4;
+ p_context->rc_buffer_aggressivity = p_sys->f_rc_buffer_aggressivity;
}
+ if ( p_sys->f_i_quant_factor != 0.0 )
+ p_context->i_quant_factor = p_sys->f_i_quant_factor;
+
#if LIBAVCODEC_BUILD >= 4690
- p_context->noise_reduction = p_enc->i_noise_reduction;
+ p_context->noise_reduction = p_sys->i_noise_reduction;
#endif
- if ( p_enc->b_mpeg4_matrix )
+ if ( p_sys->b_mpeg4_matrix )
{
p_context->intra_matrix = ff_mpeg4_default_intra_matrix;
p_context->inter_matrix = ff_mpeg4_default_non_intra_matrix;
}
- if ( p_enc->b_pre_me )
+ if ( p_sys->b_pre_me )
{
p_context->pre_me = 1;
p_context->me_pre_cmp = FF_CMP_CHROMA;
}
- if ( p_enc->b_interlace )
+ if ( p_sys->b_interlace )
{
- p_context->flags |= CODEC_FLAG_INTERLACED_DCT;
+ if ( p_context->height <= 280 )
+ {
+ if ( p_context->height != 16 || p_context->width != 16 )
+ msg_Warn( p_enc,
+ "disabling interlaced video because height=%d <= 280",
+ p_context->height );
+ }
+ else
+ {
+ p_context->flags |= CODEC_FLAG_INTERLACED_DCT;
#if LIBAVCODEC_BUILD >= 4698
- p_context->flags |= CODEC_FLAG_INTERLACED_ME;
+ if ( p_sys->b_interlace_me )
+ p_context->flags |= CODEC_FLAG_INTERLACED_ME;
+ }
#endif
}
- if ( p_enc->b_trellis )
- {
+ if ( p_sys->b_trellis )
p_context->flags |= CODEC_FLAG_TRELLIS_QUANT;
- }
+
+ if ( p_sys->i_qmin > 0 && p_sys->i_qmin == p_sys->i_qmax )
+ p_context->flags |= CODEC_FLAG_QSCALE;
#if LIBAVCODEC_BUILD >= 4702
if ( p_enc->i_threads >= 1 )
- {
p_context->thread_count = p_enc->i_threads;
- }
#endif
- if( p_enc->i_vtolerance > 0 )
- {
- p_context->bit_rate_tolerance = p_enc->i_vtolerance;
- }
+ if( p_sys->i_vtolerance > 0 )
+ p_context->bit_rate_tolerance = p_sys->i_vtolerance;
- p_context->mb_qmin = p_context->qmin = p_enc->i_qmin;
- p_context->mb_qmax = p_context->qmax = p_enc->i_qmax;
+ if( p_sys->i_qmin > 0 )
+ p_context->mb_qmin = p_context->qmin = p_sys->i_qmin;
+ if( p_sys->i_qmax > 0 )
+ p_context->mb_qmax = p_context->qmax = p_sys->i_qmax;
p_context->max_qdiff = 3;
- p_context->mb_decision = p_enc->i_hq;
+ p_context->mb_decision = p_sys->i_hq;
+
+ if( p_sys->i_quality )
+ {
+ p_context->flags |= CODEC_FLAG_QSCALE;
+#if LIBAVCODEC_BUILD >= 4668
+ p_context->global_quality = p_sys->i_quality;
+#endif
+ }
}
else if( p_enc->fmt_in.i_cat == AUDIO_ES )
{
+ /* work around bug in libmp3lame encoding */
+ if( i_codec_id == CODEC_ID_MP3 && p_enc->fmt_in.audio.i_channels > 2 )
+ p_enc->fmt_in.audio.i_channels = 2;
+
p_enc->fmt_in.i_codec = AOUT_FMT_S16_NE;
p_context->sample_rate = p_enc->fmt_in.audio.i_rate;
p_context->channels = p_enc->fmt_in.audio.i_channels;
- p_sys->i_frame_size = p_context->frame_size * 2 * p_context->channels;
- p_sys->p_buffer = malloc( p_sys->i_frame_size );
- p_sys->p_buffer_out = malloc( 2 * AVCODEC_MAX_AUDIO_FRAME_SIZE );
}
/* Misc parameters */
p_context->extradata = NULL;
p_context->flags |= CODEC_FLAG_GLOBAL_HEADER;
+ vlc_mutex_lock( lockval.p_address );
if( avcodec_open( p_context, p_codec ) )
{
- if( p_enc->fmt_in.i_cat == AUDIO_ES && p_context->channels > 2 )
+ vlc_mutex_unlock( lockval.p_address );
+ if( p_enc->fmt_in.i_cat == AUDIO_ES &&
+ (p_context->channels > 2 || i_codec_id == CODEC_ID_MP2
+ || i_codec_id == CODEC_ID_MP3) )
{
- p_context->channels = 2;
- p_enc->fmt_in.audio.i_channels = 2; // FIXME
+ if( p_context->channels > 2 )
+ {
+ p_context->channels = 2;
+ p_enc->fmt_in.audio.i_channels = 2; // FIXME
+ msg_Warn( p_enc, "stereo mode selected (codec limitation)" );
+ }
+
+ if( i_codec_id == CODEC_ID_MP2 || i_codec_id == CODEC_ID_MP3 )
+ {
+ int i_frequency, i;
+
+ for ( i_frequency = 0; i_frequency < 6; i_frequency++ )
+ {
+ if ( p_enc->fmt_out.audio.i_rate
+ == mpa_freq_tab[i_frequency] )
+ break;
+ }
+ if ( i_frequency == 6 )
+ {
+ msg_Err( p_enc, "MPEG audio doesn't support frequency=%d",
+ p_enc->fmt_out.audio.i_rate );
+ free( p_sys );
+ return VLC_EGENERIC;
+ }
+
+ for ( i = 1; i < 14; i++ )
+ {
+ if ( p_enc->fmt_out.i_bitrate / 1000
+ <= mpa_bitrate_tab[i_frequency / 3][i] )
+ break;
+ }
+ if ( p_enc->fmt_out.i_bitrate / 1000
+ != mpa_bitrate_tab[i_frequency / 3][i] )
+ {
+ msg_Warn( p_enc,
+ "MPEG audio doesn't support bitrate=%d, using %d",
+ p_enc->fmt_out.i_bitrate,
+ mpa_bitrate_tab[i_frequency / 3][i] * 1000 );
+ p_enc->fmt_out.i_bitrate =
+ mpa_bitrate_tab[i_frequency / 3][i] * 1000;
+ p_context->bit_rate = p_enc->fmt_out.i_bitrate;
+ }
+ }
+
+ p_context->codec = NULL;
+ vlc_mutex_lock( lockval.p_address );
if( avcodec_open( p_context, p_codec ) )
{
+ vlc_mutex_unlock( lockval.p_address );
msg_Err( p_enc, "cannot open encoder" );
free( p_sys );
return VLC_EGENERIC;
}
- msg_Warn( p_enc, "stereo mode selected (codec limitation)" );
}
else
{
return VLC_EGENERIC;
}
}
+ vlc_mutex_unlock( lockval.p_address );
p_enc->fmt_out.i_extra = p_context->extradata_size;
p_enc->fmt_out.p_extra = p_context->extradata;
if( p_enc->fmt_in.i_cat == AUDIO_ES )
{
+ p_sys->p_buffer_out = malloc( 2 * AVCODEC_MAX_AUDIO_FRAME_SIZE );
p_sys->i_frame_size = p_context->frame_size * 2 * p_context->channels;
p_sys->p_buffer = malloc( p_sys->i_frame_size );
}
- p_sys->i_last_ref_pts = 0;
- p_sys->i_buggy_pts_detect = 0;
- p_sys->i_samples_delay = 0;
- p_sys->i_pts = 0;
-
msg_Dbg( p_enc, "found encoder %s", psz_namecodec );
return VLC_SUCCESS;
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;
+
+#if LIBAVCODEC_BUILD >= 4685
+ frame.interlaced_frame = !p_pict->b_progressive;
+ frame.top_field_first = !!p_pict->b_top_field_first;
+#endif
+
+#if LIBAVCODEC_BUILD < 4702
/* Set the pts of the frame being encoded (segfaults with mpeg4!)*/
if( p_enc->fmt_out.i_codec == VLC_FOURCC( 'm', 'p', 'g', 'v' ) ||
p_enc->fmt_out.i_codec == VLC_FOURCC( 'm', 'p', '1', 'v' ) ||
p_enc->fmt_out.i_codec == VLC_FOURCC( 'm', 'p', '2', 'v' ) )
+#else
+ if( 1 )
+#endif
{
- frame.pts = p_pict->date;
+ frame.pts = p_pict->date ? p_pict->date : AV_NOPTS_VALUE;
- if ( p_enc->b_hurry_up )
+ if ( p_sys->b_hurry_up && frame.pts != AV_NOPTS_VALUE )
{
mtime_t current_date = mdate();
-#if LIBAVCODEC_BUILD >= 4702
- struct thread_context_t ** pp_contexts =
- (struct thread_context_t **)p_sys->p_context->thread_opaque;
-#endif
- if ( frame.pts && current_date + HURRY_UP_GUARD3 > frame.pts )
+ if ( current_date + HURRY_UP_GUARD3 > frame.pts )
{
p_sys->p_context->mb_decision = FF_MB_DECISION_SIMPLE;
p_sys->p_context->flags &= ~CODEC_FLAG_TRELLIS_QUANT;
-#if LIBAVCODEC_BUILD >= 4702
- if ( p_enc->i_threads >= 2 )
- {
- int i;
-
- for ( i = 0; i < p_enc->i_threads; i++ )
- {
- vlc_thread_set_priority( pp_contexts[i],
- VLC_THREAD_PRIORITY_VIDEO + 4 );
- }
- }
-#endif
msg_Dbg( p_enc, "hurry up mode 3" );
}
else
{
- p_sys->p_context->mb_decision = p_enc->i_hq;
+ p_sys->p_context->mb_decision = p_sys->i_hq;
- if ( frame.pts && current_date + HURRY_UP_GUARD2 > frame.pts )
+ if ( current_date + HURRY_UP_GUARD2 > frame.pts )
{
p_sys->p_context->flags &= ~CODEC_FLAG_TRELLIS_QUANT;
-#if LIBAVCODEC_BUILD >= 4702
- if ( p_enc->i_threads >= 2 )
- {
- int i;
-
- for ( i = 0; i < p_enc->i_threads; i++ )
- {
- vlc_thread_set_priority( pp_contexts[i],
- VLC_THREAD_PRIORITY_VIDEO + 2 );
- }
- }
+#if LIBAVCODEC_BUILD >= 4690
+ p_sys->p_context->noise_reduction = p_sys->i_noise_reduction
+ + (HURRY_UP_GUARD2 + current_date - frame.pts) / 500;
#endif
msg_Dbg( p_enc, "hurry up mode 2" );
}
else
{
- if ( p_enc->b_trellis )
+ if ( p_sys->b_trellis )
p_sys->p_context->flags |= CODEC_FLAG_TRELLIS_QUANT;
-
-#if LIBAVCODEC_BUILD >= 4702
- if ( p_enc->i_threads >= 2 )
- {
- int i;
-
- for ( i = 0; i < p_enc->i_threads; i++ )
- {
- vlc_thread_set_priority( pp_contexts[i],
- VLC_THREAD_PRIORITY_VIDEO );
- }
- }
+#if LIBAVCODEC_BUILD >= 4690
+ p_sys->p_context->noise_reduction =
+ p_sys->i_noise_reduction;
#endif
}
}
-#if LIBAVCODEC_BUILD >= 4690
- if ( frame.pts && current_date + HURRY_UP_GUARD1 > frame.pts )
+ if ( current_date + HURRY_UP_GUARD1 > frame.pts )
{
- p_sys->p_context->noise_reduction = p_enc->i_noise_reduction
- + (HURRY_UP_GUARD1 + current_date - frame.pts) / 1500;
+ frame.pict_type = FF_P_TYPE;
+ /* msg_Dbg( p_enc, "hurry up mode 1 %lld", current_date + HURRY_UP_GUARD1 - frame.pts ); */
}
- else
- {
- p_sys->p_context->noise_reduction = p_enc->i_noise_reduction;
- }
-#endif
}
}
else
{
- frame.pts = 0;
+ frame.pts = AV_NOPTS_VALUE;
}
- /* Let ffmpeg select the frame type */
- frame.pict_type = 0;
+ if ( frame.pts != 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 (" I64Fd ")", 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: " I64Fd ", last: "I64Fd")",
+ frame.pts, p_sys->i_last_pts );
+ return NULL;
+ }
+ else
+ {
+ p_sys->i_last_pts = frame.pts;
+ }
+ }
- frame.repeat_pict = p_pict->i_nb_fields;
-#if LIBAVCODEC_BUILD >= 4685
- frame.interlaced_frame = !p_pict->b_progressive;
- frame.top_field_first = p_pict->b_top_field_first;
+ frame.quality = p_sys->i_quality;
+
+ /* Ugly work-around for stupid libavcodec behaviour */
+#if LIBAVCODEC_BUILD >= 4722
+ 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;
#endif
+ /* End work-around */
i_out = avcodec_encode_video( p_sys->p_context, p_sys->p_buffer_out,
AVCODEC_MAX_VIDEO_FRAME_SIZE, &frame );
block_t *p_block = block_New( p_enc, i_out );
memcpy( p_block->p_buffer, p_sys->p_buffer_out, i_out );
- if( p_sys->p_context->coded_frame->pts != 0 &&
+ /* FIXME, 3-2 pulldown is not handled correctly */
+ p_block->i_length = I64C(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 )
+ {
+ /* No delay -> output pts == input pts */
+ p_block->i_pts = p_block->i_dts = p_pict->date;
+ }
+ else if( p_sys->p_context->coded_frame->pts != 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;
- /* FIXME, 3-2 pulldown is not handled correctly */
- p_block->i_length = I64C(1000000) *
- p_enc->fmt_in.video.i_frame_rate_base /
- p_enc->fmt_in.video.i_frame_rate;
- p_block->i_pts = p_sys->p_context->coded_frame->pts;
+ /* Ugly work-around for stupid libavcodec behaviour */
+#if LIBAVCODEC_BUILD >= 4722
+ {
+ 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];
+ }
+#endif
+ /* End work-around */
- if( !p_sys->p_context->delay ||
- ( 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->p_context->coded_frame->pict_type != FF_I_TYPE &&
+ p_sys->p_context->coded_frame->pict_type != FF_P_TYPE )
{
p_block->i_dts = p_block->i_pts;
}
{
/* Buggy libavcodec which doesn't update coded_frame->pts
* correctly */
- p_block->i_length = I64C(1000000) *
- p_enc->fmt_in.video.i_frame_rate_base /
- p_enc->fmt_in.video.i_frame_rate;
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;
+ }
+
return p_block;
}
{
encoder_t *p_enc = (encoder_t *)p_this;
encoder_sys_t *p_sys = p_enc->p_sys;
+ vlc_value_t lockval;
+
+ var_Get( p_enc->p_libvlc, "avcodec", &lockval );
#if LIBAVCODEC_BUILD >= 4702
if ( p_sys->b_inited && p_enc->i_threads >= 1 )
vlc_object_destroy( pp_contexts[i] );
}
- free(pp_contexts);
+ free( pp_contexts );
}
#endif
+ vlc_mutex_lock( lockval.p_address );
avcodec_close( p_sys->p_context );
- free( p_sys->p_context );
+ vlc_mutex_unlock( lockval.p_address );
+ av_free( p_sys->p_context );
if( p_sys->p_buffer ) free( p_sys->p_buffer );
if( p_sys->p_buffer_out ) free( p_sys->p_buffer_out );
projects / vlc / blobdiff