X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fcodec%2Fffmpeg%2Fencoder.c;h=ac00f2f39747a7ff3e78638e9435cc7cccedb104;hb=6339478fe9c686d0c527a785fb6c66efe0f17e85;hp=a126135662d42c065ffc85689754c5bfc9740ab7;hpb=a00419ea65c7d320b42d8e47984f946fada8d46e;p=vlc diff --git a/modules/codec/ffmpeg/encoder.c b/modules/codec/ffmpeg/encoder.c index a126135662..ac00f2f397 100644 --- a/modules/codec/ffmpeg/encoder.c +++ b/modules/codec/ffmpeg/encoder.c @@ -28,6 +28,10 @@ /***************************************************************************** * Preamble *****************************************************************************/ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #include #include #include @@ -37,7 +41,9 @@ /* ffmpeg header */ #define HAVE_MMX 1 -#ifdef HAVE_FFMPEG_AVCODEC_H +#ifdef HAVE_LIBAVCODEC_AVCODEC_H +# include +#elif defined(HAVE_FFMPEG_AVCODEC_H) # include #else # include @@ -135,7 +141,9 @@ struct encoder_sys_t 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; - +#if LIBAVCODEC_VERSION_INT >= ((51<<16)+(40<<8)+4) + int i_aac_profile; /* AAC profile to use.*/ +#endif /* Used to work around stupid timestamping behaviour in libavcodec */ uint64_t i_framenum; mtime_t pi_delay_pts[MAX_FRAME_DELAY]; @@ -147,7 +155,11 @@ static const char *ppsz_enc_options[] = { "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 + "chroma-elim-threshold", +#if LIBAVCODEC_VERSION_INT >= ((51<<16)+(40<<8)+4) + "aac-profile", +#endif + NULL }; static const uint16_t mpa_bitrate_tab[2][15] = @@ -159,7 +171,7 @@ static const uint16_t mpa_bitrate_tab[2][15] = static const uint16_t mpa_freq_tab[6] = { 44100, 48000, 32000, 22050, 24000, 16000 }; -static const int16_t mpeg4_default_intra_matrix[64] = { +static const uint16_t mpeg4_default_intra_matrix[64] = { 8, 17, 18, 19, 21, 23, 25, 27, 17, 18, 19, 21, 23, 25, 27, 28, 20, 21, 22, 23, 24, 26, 28, 30, @@ -170,7 +182,7 @@ static const int16_t mpeg4_default_intra_matrix[64] = { 27, 28, 30, 32, 35, 38, 41, 45, }; -static const int16_t mpeg4_default_non_intra_matrix[64] = { +static const uint16_t mpeg4_default_non_intra_matrix[64] = { 16, 17, 18, 19, 20, 21, 22, 23, 17, 18, 19, 20, 21, 22, 23, 24, 18, 19, 20, 21, 22, 23, 24, 25, @@ -181,7 +193,6 @@ static const int16_t mpeg4_default_non_intra_matrix[64] = { 23, 24, 25, 27, 28, 30, 31, 33, }; - /***************************************************************************** * OpenEncoder: probe the encoder *****************************************************************************/ @@ -195,9 +206,6 @@ int E_(OpenEncoder)( vlc_object_t *p_this ) int i_codec_id, i_cat; const char *psz_namecodec; vlc_value_t val; - vlc_value_t lockval; - - var_Get( p_enc->p_libvlc_global, "avcodec", &lockval ); if( !E_(GetFfmpegCodec)( p_enc->fmt_out.i_codec, &i_cat, &i_codec_id, &psz_namecodec ) ) @@ -215,7 +223,7 @@ int E_(OpenEncoder)( vlc_object_t *p_this ) 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, VLC_FALSE, _("Streaming / Transcoding failed"), + intf_UserFatal( p_enc, VLC_FALSE, _("Streaming / Transcoding failed"), _("\"%s\" is no video encoder."), psz_namecodec ); return VLC_EGENERIC; } @@ -223,7 +231,7 @@ int E_(OpenEncoder)( vlc_object_t *p_this ) 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, VLC_FALSE, _("Streaming / Transcoding failed"), + intf_UserFatal( p_enc, VLC_FALSE, _("Streaming / Transcoding failed"), _("\"%s\" is no audio encoder."), psz_namecodec ); return VLC_EGENERIC; } @@ -235,7 +243,7 @@ int E_(OpenEncoder)( vlc_object_t *p_this ) if( !p_codec ) { msg_Err( p_enc, "cannot find encoder %s", psz_namecodec ); - intf_UserFatal( p_enc, VLC_FALSE, _("Streaming / Transcoding failed"), + intf_UserFatal( p_enc, VLC_FALSE, _("Streaming / Transcoding failed"), _("VLC could not find encoder \"%s\"."), psz_namecodec ); return VLC_EGENERIC; } @@ -261,20 +269,21 @@ int E_(OpenEncoder)( vlc_object_t *p_this ) p_context->opaque = (void *)p_this; /* Set CPU capabilities */ + unsigned i_cpu = vlc_CPU(); p_context->dsp_mask = 0; - if( !(p_enc->p_libvlc_global->i_cpu & CPU_CAPABILITY_MMX) ) + if( !(i_cpu & CPU_CAPABILITY_MMX) ) { p_context->dsp_mask |= FF_MM_MMX; } - if( !(p_enc->p_libvlc_global->i_cpu & CPU_CAPABILITY_MMXEXT) ) + if( !(i_cpu & CPU_CAPABILITY_MMXEXT) ) { p_context->dsp_mask |= FF_MM_MMXEXT; } - if( !(p_enc->p_libvlc_global->i_cpu & CPU_CAPABILITY_3DNOW) ) + if( !(i_cpu & CPU_CAPABILITY_3DNOW) ) { p_context->dsp_mask |= FF_MM_3DNOW; } - if( !(p_enc->p_libvlc_global->i_cpu & CPU_CAPABILITY_SSE) ) + if( !(i_cpu & CPU_CAPABILITY_SSE) ) { p_context->dsp_mask |= FF_MM_SSE; p_context->dsp_mask |= FF_MM_SSE2; @@ -329,6 +338,7 @@ int E_(OpenEncoder)( vlc_object_t *p_this ) p_sys->i_quality = (int)(FF_QP2LAMBDA * val.f_float + 0.5); var_Get( p_enc, ENC_CFG_PREFIX "hq", &val ); + p_sys->i_hq = FF_MB_DECISION_RD; if( val.psz_string && *val.psz_string ) { if( !strcmp( val.psz_string, "rd" ) ) @@ -340,7 +350,9 @@ int E_(OpenEncoder)( vlc_object_t *p_this ) else p_sys->i_hq = FF_MB_DECISION_RD; } - if( val.psz_string ) free( val.psz_string ); + else + p_sys->i_hq = FF_MB_DECISION_RD; + free( val.psz_string ); var_Get( p_enc, ENC_CFG_PREFIX "qmin", &val ); p_sys->i_qmin = val.i_int; @@ -366,6 +378,30 @@ int E_(OpenEncoder)( vlc_object_t *p_this ) var_Get( p_enc, ENC_CFG_PREFIX "chroma-elim-threshold", &val ); p_sys->i_chroma_elim = val.i_int; +#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; + if( val.psz_string && *val.psz_string ) + { + if( !strncmp( val.psz_string, "main", 4 ) ) + p_sys->i_aac_profile = FF_PROFILE_AAC_MAIN; + else if( !strncmp( val.psz_string, "low", 3 ) ) + p_sys->i_aac_profile = FF_PROFILE_AAC_LOW; +#if 0 /* Not supported by FAAC encoder */ + else if( !strncmp( val.psz_string, "ssr", 3 ) ) + p_sys->i_aac_profile = FF_PROFILE_AAC_SSR; +#endif + else if( !strncmp( val.psz_string, "ltp", 3 ) ) + 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; + } + } + if( val.psz_string ) free( val.psz_string ); +#endif + if( p_enc->fmt_in.i_cat == VIDEO_ES ) { int i_aspect_num, i_aspect_den; @@ -407,7 +443,7 @@ int E_(OpenEncoder)( vlc_object_t *p_this ) p_context->max_b_frames = __MAX( __MIN( p_sys->i_b_frames, FF_MAX_B_FRAMES ), 0 ); p_context->b_frame_strategy = 0; - if( !p_context->max_b_frames && + 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_context->flags |= CODEC_FLAG_LOW_DELAY; @@ -438,6 +474,7 @@ int E_(OpenEncoder)( vlc_object_t *p_this ) if ( p_sys->b_strict_rc ) { 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 @@ -491,10 +528,25 @@ int E_(OpenEncoder)( vlc_object_t *p_this ) if( p_sys->i_vtolerance > 0 ) p_context->bit_rate_tolerance = p_sys->i_vtolerance; + /* usually if someone sets bitrate, he likes more to get that bitrate over quality + * should help 'normal' user to get asked bitrate + */ + if( p_enc->fmt_out.i_bitrate > 0 && p_sys->i_qmax == 0 && p_sys->i_qmin == 0 ) + { + p_sys->i_qmax = 51; + p_sys->i_qmin = 3; + } + if( p_sys->i_qmin > 0 ) + { p_context->mb_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->mb_lmax = p_context->lmax = p_sys->i_qmax * FF_QP2LAMBDA; + } p_context->max_qdiff = 3; p_context->mb_decision = p_sys->i_hq; @@ -514,6 +566,13 @@ int E_(OpenEncoder)( vlc_object_t *p_this ) 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; + +#if LIBAVCODEC_VERSION_INT >= ((51<<16)+(40<<8)+4) + /* Ignore FF_PROFILE_UNKNOWN */ + if( ( p_sys->i_aac_profile >= FF_PROFILE_AAC_MAIN ) && + ( p_enc->fmt_out.i_codec == VLC_FOURCC('m','p','4','a') ) ) + p_context->profile = p_sys->i_aac_profile; +#endif } /* Misc parameters */ @@ -531,10 +590,11 @@ int E_(OpenEncoder)( vlc_object_t *p_this ) p_context->extradata = NULL; p_context->flags |= CODEC_FLAG_GLOBAL_HEADER; - vlc_mutex_lock( lockval.p_address ); + vlc_mutex_t *lock = var_AcquireMutex( "avcodec" ); + if( avcodec_open( p_context, p_codec ) ) { - vlc_mutex_unlock( lockval.p_address ); + 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) ) @@ -584,12 +644,12 @@ int E_(OpenEncoder)( vlc_object_t *p_this ) } p_context->codec = NULL; - vlc_mutex_lock( lockval.p_address ); + vlc_mutex_lock( lock ); if( avcodec_open( p_context, p_codec ) ) { - vlc_mutex_unlock( lockval.p_address ); + vlc_mutex_unlock( lock ); msg_Err( p_enc, "cannot open encoder" ); - intf_UserFatal( p_enc, VLC_FALSE, _("Streaming / Transcoding failed"), + intf_UserFatal( p_enc, VLC_FALSE, _("Streaming / Transcoding failed"), _("VLC could not open the encoder.") ); free( p_sys ); return VLC_EGENERIC; @@ -598,13 +658,13 @@ int E_(OpenEncoder)( vlc_object_t *p_this ) else { msg_Err( p_enc, "cannot open encoder" ); - intf_UserFatal( p_enc, VLC_FALSE, _("Streaming / Transcoding failed"), + intf_UserFatal( p_enc, VLC_FALSE, _("Streaming / Transcoding failed"), _("VLC could not open the encoder.") ); free( p_sys ); return VLC_EGENERIC; } } - vlc_mutex_unlock( lockval.p_address ); + vlc_mutex_unlock( lock); p_enc->fmt_out.i_extra = p_context->extradata_size; if( p_enc->fmt_out.i_extra ) @@ -620,6 +680,7 @@ int E_(OpenEncoder)( vlc_object_t *p_this ) 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_enc->fmt_out.audio.i_blockalign = p_context->block_align; } msg_Dbg( p_enc, "found encoder %s", psz_namecodec ); @@ -753,9 +814,7 @@ static block_t *EncodeVideo( encoder_t *p_enc, picture_t *p_pict ) 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', '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' ) ) + if( p_enc->fmt_out.i_codec != VLC_FOURCC( 'm', 'p', '4', 'v' ) ) { frame.pts = p_pict->date ? p_pict->date : (int64_t)AV_NOPTS_VALUE; @@ -784,7 +843,7 @@ static block_t *EncodeVideo( encoder_t *p_enc, picture_t *p_pict ) { if ( p_sys->b_trellis ) p_sys->p_context->flags |= CODEC_FLAG_TRELLIS_QUANT; - + p_sys->p_context->noise_reduction = p_sys->i_noise_reduction; } @@ -799,10 +858,10 @@ static block_t *EncodeVideo( encoder_t *p_enc, picture_t *p_pict ) } else { - frame.pts = AV_NOPTS_VALUE; + frame.pts = (int64_t)AV_NOPTS_VALUE; } - if ( frame.pts != AV_NOPTS_VALUE && frame.pts != 0 ) + if ( frame.pts != (int64_t)AV_NOPTS_VALUE && frame.pts != 0 ) { if ( p_sys->i_last_pts == frame.pts ) { @@ -852,7 +911,7 @@ static block_t *EncodeVideo( encoder_t *p_enc, picture_t *p_pict ) /* 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 != (signed int) AV_NOPTS_VALUE && + 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 ) { @@ -861,11 +920,11 @@ static block_t *EncodeVideo( encoder_t *p_enc, picture_t *p_pict ) /* 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; + 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]; + p_block->i_pts = p_sys->pi_delay_pts[i_framenum % MAX_FRAME_DELAY]; } /* End work-around */ @@ -1003,9 +1062,6 @@ void E_(CloseEncoder)( vlc_object_t *p_this ) { 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_global, "avcodec", &lockval ); if ( p_sys->b_inited && p_enc->i_threads >= 1 ) { @@ -1014,24 +1070,24 @@ void E_(CloseEncoder)( vlc_object_t *p_this ) (struct thread_context_t **)p_sys->p_context->thread_opaque; for ( i = 0; i < p_enc->i_threads; i++ ) { - pp_contexts[i]->b_die = 1; + vlc_object_kill( pp_contexts[i] ); vlc_cond_signal( &pp_contexts[i]->cond ); vlc_thread_join( pp_contexts[i] ); vlc_mutex_destroy( &pp_contexts[i]->lock ); vlc_cond_destroy( &pp_contexts[i]->cond ); - vlc_object_destroy( pp_contexts[i] ); + vlc_object_release( pp_contexts[i] ); } free( pp_contexts ); } - vlc_mutex_lock( lockval.p_address ); + vlc_mutex_t *lock = var_AcquireMutex( "avcodec" ); avcodec_close( p_sys->p_context ); - vlc_mutex_unlock( lockval.p_address ); + vlc_mutex_unlock( lock ); 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 ); + free( p_sys->p_buffer ); + free( p_sys->p_buffer_out ); free( p_sys ); }