#include <vlc_aout.h>
#include <vlc_sout.h>
#include <vlc_codec.h>
-#include <vlc_interface.h>
+#include <vlc_dialog.h>
+#include <vlc_avcodec.h>
/* ffmpeg header */
#define HAVE_MMX 1
#endif
#include "avcodec.h"
-#include "chroma.h"
-#include "fourcc.h"
#define HURRY_UP_GUARD1 (450000)
#define HURRY_UP_GUARD2 (300000)
static block_t *EncodeAudio( encoder_t *, aout_buffer_t * );
struct thread_context_t;
-static int FfmpegThread( struct thread_context_t *p_context );
+static void* FfmpegThread( vlc_object_t *p_this );
static int FfmpegExecute( AVCodecContext *s,
int (*pf_func)(AVCodecContext *c2, void *arg2),
- void **arg, int *ret, int count );
+ void *arg, int *ret, int count, int );
/*****************************************************************************
* thread_context_t : for multithreaded encoding
int i_qmin;
int i_qmax;
int i_hq;
- bool b_strict_rc;
int i_rc_buffer_size;
float f_rc_buffer_aggressivity;
bool b_pre_me;
};
static const char *const ppsz_enc_options[] = {
- "keyint", "bframes", "vt", "qmin", "qmax", "hq", "strict-rc",
+ "keyint", "bframes", "vt", "qmin", "qmax", "hq",
"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",
if( !GetFfmpegCodec( p_enc->fmt_out.i_codec, &i_cat, &i_codec_id,
&psz_namecodec ) )
{
- if( GetFfmpegChroma( p_enc->fmt_out.i_codec ) < 0 )
+ if( TestFfmpegChroma( -1, p_enc->fmt_out.i_codec ) != VLC_SUCCESS )
{
/* handed chroma output */
return VLC_EGENERIC;
if( p_enc->fmt_out.i_cat == VIDEO_ES && i_cat != VIDEO_ES )
{
msg_Err( p_enc, "\"%s\" is not a video encoder", psz_namecodec );
- intf_UserFatal( p_enc, false, _("Streaming / Transcoding failed"),
+ dialog_Fatal( p_enc, _("Streaming / Transcoding failed"),
_("\"%s\" is no video encoder."), psz_namecodec );
return VLC_EGENERIC;
}
if( p_enc->fmt_out.i_cat == AUDIO_ES && i_cat != AUDIO_ES )
{
msg_Err( p_enc, "\"%s\" is not an audio encoder", psz_namecodec );
- intf_UserFatal( p_enc, false, _("Streaming / Transcoding failed"),
+ dialog_Fatal( p_enc, _("Streaming / Transcoding failed"),
_("\"%s\" is no audio encoder."), psz_namecodec );
return VLC_EGENERIC;
}
p_codec = avcodec_find_encoder( i_codec_id );
if( !p_codec )
{
- msg_Err( p_enc, "cannot find encoder %s", psz_namecodec );
- intf_UserFatal( p_enc, false, _("Streaming / Transcoding failed"),
- _("VLC could not find encoder \"%s\"."), psz_namecodec );
+ msg_Err( p_enc, "cannot find encoder %s\n"
+"*** Your FFMPEG installation is crippled. ***\n"
+"*** Please check with your FFMPEG packager. ***\n"
+"*** This is NOT a VLC media player issue. ***", psz_namecodec );
+
+ dialog_Fatal( p_enc, _("Streaming / Transcoding failed"), _(
+/* I have had enough of all these MPEG-3 transcoding bug reports.
+ * Downstream packager, you had better not patch this out, or I will be really
+ * annoyed. Think about it - you don't want to fork the VLC translation files,
+ * do you? -- Courmisch, 2008-10-22 */
+"It seems your FFMPEG (libavcodec) installation lacks the following encoder:\n"
+"%s.\n"
+"If you don't know how to fix this, ask for support from your distribution.\n"
+"\n"
+"This is not an error inside VLC media player.\n"
+"Do not contact the VideoLAN project about this issue.\n"),
+ psz_namecodec );
return VLC_EGENERIC;
}
/* Allocate the memory needed to store the encoder's structure */
- if( ( p_sys = (encoder_sys_t *)malloc(sizeof(encoder_sys_t)) ) == NULL )
- {
- msg_Err( p_enc, "out of memory" );
- return VLC_EGENERIC;
- }
- memset( p_sys, 0, sizeof(encoder_sys_t) );
+ if( ( p_sys = calloc( 1, sizeof(encoder_sys_t) ) ) == NULL )
+ return VLC_ENOMEM;
p_enc->p_sys = p_sys;
p_sys->p_codec = p_codec;
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 );
#if LIBAVCODEC_VERSION_INT >= ((51<<16)+(40<<8)+4)
var_Get( p_enc, ENC_CFG_PREFIX "aac-profile", &val );
- p_sys->i_aac_profile = FF_PROFILE_UNKNOWN;
+ /* ffmpeg uses faac encoder atm, and it has issues with
+ * other than low-complexity profile, so default to that */
+ p_sys->i_aac_profile = FF_PROFILE_AAC_LOW;
if( val.psz_string && *val.psz_string )
{
if( !strncmp( val.psz_string, "main", 4 ) )
p_sys->i_aac_profile = FF_PROFILE_AAC_LTP;
else
{
- msg_Warn( p_enc, "unknown AAC profile requested" );
- p_sys->i_aac_profile = FF_PROFILE_UNKNOWN;
+ msg_Warn( p_enc, "unknown AAC profile requested, setting it to low" );
+ p_sys->i_aac_profile = FF_PROFILE_AAC_LOW;
}
}
free( val.psz_string );
p_context->width = p_enc->fmt_in.video.i_width;
p_context->height = p_enc->fmt_in.video.i_height;
- if( p_enc->fmt_out.i_codec == VLC_FOURCC('m', 'p', '2', 'v')
- && (p_context->width > 720 || p_context->height > 576) )
- p_context->level = 4; /* High level */
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;
__MAX( __MIN( p_sys->i_b_frames, FF_MAX_B_FRAMES ), 0 );
p_context->b_frame_strategy = 0;
if( !p_context->max_b_frames &&
- ( p_enc->fmt_out.i_codec == VLC_FOURCC('m', 'p', '2', 'v') ||
- p_enc->fmt_out.i_codec == VLC_FOURCC('m', 'p', '1', 'v') ) )
+ ( p_enc->fmt_out.i_codec == VLC_CODEC_MPGV ||
+ p_enc->fmt_out.i_codec == VLC_CODEC_MP2V ||
+ p_enc->fmt_out.i_codec == VLC_CODEC_MP1V ) )
p_context->flags |= CODEC_FLAG_LOW_DELAY;
av_reduce( &i_aspect_num, &i_aspect_den,
p_sys->i_buffer_out = FF_MIN_BUFFER_SIZE;
p_sys->p_buffer_out = malloc( p_sys->i_buffer_out );
- p_enc->fmt_in.i_codec = VLC_FOURCC('I','4','2','0');
- p_context->pix_fmt = GetFfmpegChroma( p_enc->fmt_in.i_codec );
+ p_enc->fmt_in.i_codec = VLC_CODEC_I420;
+ p_enc->fmt_in.video.i_chroma = p_enc->fmt_in.i_codec;
+ GetFfmpegChroma( &p_context->pix_fmt, p_enc->fmt_in.video );
+
if( p_codec->pix_fmts )
{
const enum PixelFormat *p = p_codec->pix_fmts;
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 = GetVlcChroma( p_context->pix_fmt );
+ GetVlcChroma( &p_enc->fmt_in.video, p_context->pix_fmt );
+ p_enc->fmt_in.i_codec = p_enc->fmt_in.video.i_chroma;
}
- if ( p_sys->b_strict_rc )
- {
- p_context->rc_qsquish = 1.0;
- p_context->rc_max_rate = p_enc->fmt_out.i_bitrate;
- p_context->rc_min_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_VERSION_INT < ((52<<16)+(0<<8)+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;
p_context->flags |= CODEC_FLAG_QSCALE;
p_context->global_quality = p_sys->i_quality;
}
+ else
+ {
+ p_context->rc_qsquish = 1.0;
+ p_context->rc_max_rate = p_enc->fmt_out.i_bitrate;
+ p_context->rc_min_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;
+ }
}
else if( p_enc->fmt_in.i_cat == AUDIO_ES )
{
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_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;
- if ( p_enc->fmt_out.i_codec == VLC_FOURCC('m','p','4','a') )
+ if ( p_enc->fmt_out.i_codec == VLC_CODEC_MP4A )
{
/* XXX: FAAC does resample only when setting the INPUT samplerate
- * to the desired value (-R option of the faac frontend) */
- p_enc->fmt_in.audio.i_rate = p_context->sample_rate;
+ * to the desired value (-R option of the faac frontend)
+ p_enc->fmt_in.audio.i_rate = p_context->sample_rate;*/
#if LIBAVCODEC_VERSION_INT >= ((51<<16)+(40<<8)+4)
- /* Ignore FF_PROFILE_UNKNOWN */
- if( p_sys->i_aac_profile >= FF_PROFILE_AAC_MAIN )
+ /* vlc should default to low-complexity profile, faac encoder
+ * has bug and aac audio has issues otherwise atm */
p_context->profile = p_sys->i_aac_profile;
#endif
}
if( i_codec_id == CODEC_ID_RAWVIDEO )
{
/* XXX: hack: Force same codec (will be handled by transcode) */
- p_enc->fmt_in.i_codec = p_enc->fmt_out.i_codec;
- p_context->pix_fmt = GetFfmpegChroma( p_enc->fmt_in.i_codec );
+ p_enc->fmt_in.video.i_chroma = p_enc->fmt_in.i_codec = p_enc->fmt_out.i_codec;
+ GetFfmpegChroma( &p_context->pix_fmt, p_enc->fmt_in.video );
}
/* Make sure we get extradata filled by the encoder */
p_context->extradata = NULL;
p_context->flags |= CODEC_FLAG_GLOBAL_HEADER;
- vlc_mutex_t *lock = var_AcquireMutex( "avcodec" );
-
- if( avcodec_open( p_context, p_codec ) )
+ int ret;
+ vlc_avcodec_lock();
+ ret = avcodec_open( p_context, p_codec );
+ vlc_avcodec_unlock();
+ if( ret )
{
- vlc_mutex_unlock( lock );
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->codec = NULL;
- vlc_mutex_lock( lock );
- if( avcodec_open( p_context, p_codec ) )
+ vlc_avcodec_lock();
+ ret = avcodec_open( p_context, p_codec );
+ vlc_avcodec_unlock();
+ if( ret )
{
- vlc_mutex_unlock( lock );
msg_Err( p_enc, "cannot open encoder" );
- intf_UserFatal( p_enc, false,
+ dialog_Fatal( p_enc,
_("Streaming / Transcoding failed"),
_("VLC could not open the encoder.") );
free( p_sys );
else
{
msg_Err( p_enc, "cannot open encoder" );
- intf_UserFatal( p_enc, false, _("Streaming / Transcoding failed"),
+ dialog_Fatal( p_enc, _("Streaming / Transcoding failed"),
_("VLC could not open the encoder.") );
free( p_sys );
return VLC_EGENERIC;
}
}
- vlc_mutex_unlock( lock);
- p_enc->fmt_out.i_extra = p_context->extradata_size;
- if( p_enc->fmt_out.i_extra )
+ if( i_codec_id == CODEC_ID_FLAC )
{
+ p_enc->fmt_out.i_extra = 4 + 1 + 3 + p_context->extradata_size;
p_enc->fmt_out.p_extra = malloc( p_enc->fmt_out.i_extra );
- memcpy( p_enc->fmt_out.p_extra, p_context->extradata,
- p_enc->fmt_out.i_extra );
+ if( p_enc->fmt_out.p_extra )
+ {
+ uint8_t *p = p_enc->fmt_out.p_extra;
+ p[0] = 0x66;
+ p[1] = 0x4C;
+ p[2] = 0x61;
+ p[3] = 0x43;
+ p[4] = 0x00;
+ p[5] = ( p_context->extradata_size >> 16 ) & 0xff;
+ p[6] = ( p_context->extradata_size >> 8 ) & 0xff;
+ p[7] = ( p_context->extradata_size ) & 0xff;
+ memcpy( &p[8], p_context->extradata, p_context->extradata_size );
+ }
+ else
+ {
+ p_enc->fmt_out.i_extra = 0;
+ }
+ }
+ else
+ {
+ p_enc->fmt_out.i_extra = p_context->extradata_size;
+ if( p_enc->fmt_out.i_extra )
+ {
+ p_enc->fmt_out.p_extra = malloc( p_enc->fmt_out.i_extra );
+ memcpy( p_enc->fmt_out.p_extra, p_context->extradata,
+ p_enc->fmt_out.i_extra );
+ }
}
+
p_context->flags &= ~CODEC_FLAG_GLOBAL_HEADER;
if( p_enc->fmt_in.i_cat == AUDIO_ES )
/****************************************************************************
* Ffmpeg threading system
****************************************************************************/
-static int FfmpegThread( struct thread_context_t *p_context )
+static void* FfmpegThread( vlc_object_t *p_this )
{
- while ( !p_context->b_die && !p_context->b_error )
+ struct thread_context_t *p_context = (struct thread_context_t *)p_this;
+ int canc = vlc_savecancel ();
+ while ( vlc_object_alive (p_context) && !p_context->b_error )
{
vlc_mutex_lock( &p_context->lock );
- while ( !p_context->b_work && !p_context->b_die && !p_context->b_error )
+ while ( !p_context->b_work && vlc_object_alive (p_context) && !p_context->b_error )
{
vlc_cond_wait( &p_context->cond, &p_context->lock );
}
p_context->b_work = 0;
vlc_mutex_unlock( &p_context->lock );
- if ( p_context->b_die || p_context->b_error )
+ if ( !vlc_object_alive (p_context) || p_context->b_error )
break;
if ( p_context->pf_func )
vlc_mutex_unlock( &p_context->lock );
}
- return 0;
+ vlc_restorecancel (canc);
+ return NULL;
}
static int FfmpegExecute( AVCodecContext *s,
int (*pf_func)(AVCodecContext *c2, void *arg2),
- void **arg, int *ret, int count )
+ void *arg, int *ret, int count, int size )
{
struct thread_context_t ** pp_contexts =
(struct thread_context_t **)s->thread_opaque;
- int i;
+ void **argv = arg;
/* Note, we can be certain that this is not called with the same
* AVCodecContext by different threads at the same time */
- for ( i = 0; i < count; i++ )
+ for ( int i = 0; i < count; i++ )
{
vlc_mutex_lock( &pp_contexts[i]->lock );
- pp_contexts[i]->arg = arg[i];
+ pp_contexts[i]->arg = argv[i];
pp_contexts[i]->pf_func = pf_func;
pp_contexts[i]->i_ret = 12345;
pp_contexts[i]->b_work = 1;
vlc_cond_signal( &pp_contexts[i]->cond );
vlc_mutex_unlock( &pp_contexts[i]->lock );
}
- for ( i = 0; i < count; i++ )
+ for ( int i = 0; i < count; i++ )
{
vlc_mutex_lock( &pp_contexts[i]->lock );
while ( !pp_contexts[i]->b_done )
}
}
+ (void)size;
return 0;
}
sizeof(struct thread_context_t) );
pp_contexts[i]->p_context = p_sys->p_context;
vlc_mutex_init( &pp_contexts[i]->lock );
- vlc_cond_init( p_enc, &pp_contexts[i]->cond );
+ vlc_cond_init( &pp_contexts[i]->cond );
pp_contexts[i]->b_work = 0;
pp_contexts[i]->b_done = 0;
if ( vlc_thread_create( pp_contexts[i], "encoder", FfmpegThread,
- VLC_THREAD_PRIORITY_VIDEO, false ) )
+ VLC_THREAD_PRIORITY_VIDEO ) )
{
msg_Err( p_enc, "cannot spawn encoder thread, expect to die soon" );
return NULL;
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_FOURCC( 'm', 'p', '4', 'v' ) )
+ if( p_enc->fmt_out.i_codec != VLC_CODEC_MP4V )
{
frame.pts = p_pict->date ? p_pict->date : (int64_t)AV_NOPTS_VALUE;
if ( current_date + HURRY_UP_GUARD3 > frame.pts )
{
p_sys->p_context->mb_decision = FF_MB_DECISION_SIMPLE;
+#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+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
if ( current_date + HURRY_UP_GUARD2 > frame.pts )
{
+#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+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 < ((52<<16)+(0<<8)+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;
free( pp_contexts );
}
- vlc_mutex_t *lock = var_AcquireMutex( "avcodec" );
+ vlc_avcodec_lock();
avcodec_close( p_sys->p_context );
- vlc_mutex_unlock( lock );
+ vlc_avcodec_unlock();
av_free( p_sys->p_context );
free( p_sys->p_buffer );
projects / vlc / blobdiff