/*****************************************************************************
- * encoder.c: video and audio encoder using the ffmpeg library
+ * encoder.c: video and audio encoder using the libavcodec library
*****************************************************************************
- * Copyright (C) 1999-2004 the VideoLAN team
+ * Copyright (C) 1999-2004 VLC authors and VideoLAN
* $Id$
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
* Gildas Bazin <gbazin@videolan.org>
* Christophe Massiot <massiot@via.ecp.fr>
- * Part of the file Copyright (C) FFMPEG Project Developers
+ * Part of the file Copyright (C) FFmpeg Project Developers
* (mpeg4_default matrixes)
*
- * 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
- * the Free Software Foundation; either version 2 of the License, or
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/*****************************************************************************
#include <vlc_avcodec.h>
#include <vlc_cpu.h>
-/* ffmpeg header */
#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
+#include <libavcodec/avcodec.h>
#include "avcodec.h"
+#include "avcommon.h"
#define HURRY_UP_GUARD1 (450000)
#define HURRY_UP_GUARD2 (300000)
void CloseEncoder( vlc_object_t * );
static block_t *EncodeVideo( encoder_t *, picture_t * );
-static block_t *EncodeAudio( encoder_t *, aout_buffer_t * );
+static block_t *EncodeAudio( encoder_t *, block_t * );
struct thread_context_t;
};
/*****************************************************************************
- * encoder_sys_t : ffmpeg encoder descriptor
+ * encoder_sys_t : libavcodec encoder descriptor
*****************************************************************************/
struct encoder_sys_t
{
/*
- * Ffmpeg properties
+ * libavcodec properties
*/
AVCodec *p_codec;
AVCodecContext *p_context;
/*
- * Common properties
+ * Common buffer mainly for audio as frame size in there needs usually be constant
*/
char *p_buffer;
- uint8_t *p_buffer_out;
size_t i_buffer_out;
/*
float f_lumi_masking, f_dark_masking, f_p_masking, f_border_masking;
int i_luma_elim, i_chroma_elim;
int i_aac_profile; /* AAC profile to use.*/
- /* Used to work around stupid timestamping behaviour in libavcodec */
- uint64_t i_framenum;
- mtime_t pi_delay_pts[MAX_FRAME_DELAY];
};
static const char *const ppsz_enc_options[] = {
- "keyint", "bframes", "vt", "qmin", "qmax", "hq",
+ "keyint", "bframes", "vt", "qmin", "qmax", "codec", "hq",
"rc-buffer-size", "rc-buffer-aggressivity", "pre-me", "hurry-up",
"interlace", "interlace-me", "i-quant-factor", "noise-reduction", "mpeg4-matrix",
"trellis", "qscale", "strict", "lumi-masking", "dark-masking",
encoder_t *p_enc = (encoder_t *)p_this;
encoder_sys_t *p_sys;
AVCodecContext *p_context;
- AVCodec *p_codec;
+ AVCodec *p_codec = NULL;
int i_codec_id, i_cat;
const char *psz_namecodec;
float f_val;
char *psz_val;
- int i_val;
- if( !GetFfmpegCodec( p_enc->fmt_out.i_codec, &i_cat, &i_codec_id,
+ /* Initialization must be done before avcodec_find_encoder() */
+ vlc_init_avcodec();
+
+ config_ChainParse( p_enc, ENC_CFG_PREFIX, ppsz_enc_options, p_enc->p_cfg );
+
+ 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( p_enc->fmt_out.i_codec == VLC_CODEC_MP1V )
+ {
+ i_cat = VIDEO_ES;
+ i_codec_id = CODEC_ID_MPEG1VIDEO;
+ psz_namecodec = "MPEG-1 video";
+ }
+ 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 )
return VLC_EGENERIC;
}
- /* Initialization must be done before avcodec_find_encoder() */
- InitLibavcodec( p_this );
-
- p_codec = avcodec_find_encoder( i_codec_id );
+ char *psz_encoder = var_GetString( p_this, ENC_CFG_PREFIX "codec" );
+ if( psz_encoder && *psz_encoder )
+ {
+ p_codec = avcodec_find_encoder_by_name( psz_encoder );
+ if( !p_codec )
+ msg_Err( p_this, "Encoder `%s' not found", psz_encoder );
+ else if( p_codec->id != i_codec_id )
+ {
+ msg_Err( p_this, "Encoder `%s' can't handle %4.4s",
+ psz_encoder, (char*)&p_enc->fmt_out.i_codec );
+ p_codec = NULL;
+ }
+ }
+ free( psz_encoder );
+ if( !p_codec )
+ p_codec = avcodec_find_encoder( i_codec_id );
if( !p_codec )
{
msg_Err( p_enc, "cannot find encoder %s\n"
-"*** Your FFMPEG installation is crippled. ***\n"
-"*** Please check with your FFMPEG packager. ***\n"
+"*** Your Libav/FFmpeg installation is crippled. ***\n"
+"*** Please check with your Libav/FFmpeg packager. ***\n"
"*** This is NOT a VLC media player issue. ***", psz_namecodec );
dialog_Fatal( p_enc, _("Streaming / Transcoding failed"), _(
* 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"
+"It seems your Libav/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"
if( ( p_sys = calloc( 1, sizeof(encoder_sys_t) ) ) == NULL )
return VLC_ENOMEM;
p_enc->p_sys = p_sys;
+ p_sys->i_samples_delay = 0;
p_sys->p_codec = p_codec;
- p_enc->pf_encode_video = EncodeVideo;
- p_enc->pf_encode_audio = EncodeAudio;
-
p_sys->p_buffer = NULL;
- p_sys->p_buffer_out = NULL;
p_sys->i_buffer_out = 0;
- p_sys->p_context = p_context = avcodec_alloc_context();
+#if LIBAVCODEC_VERSION_MAJOR < 54
+ p_context = avcodec_alloc_context();
+#else
+ p_context = avcodec_alloc_context3(p_codec);
+#endif
+ p_sys->p_context = p_context;
p_sys->p_context->codec_id = p_sys->p_codec->id;
- p_context->debug = var_InheritInteger( p_enc, "ffmpeg-debug" );
+ p_context->debug = var_InheritInteger( p_enc, "avcodec-debug" );
p_context->opaque = (void *)p_this;
- /* Set CPU capabilities */
- unsigned i_cpu = vlc_CPU();
- p_context->dsp_mask = 0;
- if( !(i_cpu & CPU_CAPABILITY_MMX) )
- {
- p_context->dsp_mask |= FF_MM_MMX;
- }
- if( !(i_cpu & CPU_CAPABILITY_MMXEXT) )
- {
- p_context->dsp_mask |= FF_MM_MMXEXT;
- }
- if( !(i_cpu & CPU_CAPABILITY_3DNOW) )
- {
- p_context->dsp_mask |= FF_MM_3DNOW;
- }
- if( !(i_cpu & CPU_CAPABILITY_SSE) )
- {
- p_context->dsp_mask |= FF_MM_SSE;
- p_context->dsp_mask |= FF_MM_SSE2;
- }
-
- config_ChainParse( p_enc, ENC_CFG_PREFIX, ppsz_enc_options, p_enc->p_cfg );
+ /* set CPU capabilities */
+#if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT( 51, 25, 0 )
+ av_set_cpu_flags_mask( INT_MAX & ~GetVlcDspMask() );
+#else
+ p_context->dsp_mask = GetVlcDspMask();
+#endif
p_sys->i_key_int = var_GetInteger( p_enc, ENC_CFG_PREFIX "keyint" );
p_sys->i_b_frames = var_GetInteger( p_enc, ENC_CFG_PREFIX "bframes" );
p_sys->i_qmax = var_GetInteger( p_enc, ENC_CFG_PREFIX "qmax" );
p_sys->b_trellis = var_GetBool( p_enc, ENC_CFG_PREFIX "trellis" );
- i_val = var_GetInteger( p_enc, ENC_CFG_PREFIX "strict" );
- if( i_val < - 1 || i_val > 1 ) i_val = 0;
- p_context->strict_std_compliance = i_val;
+ p_context->strict_std_compliance = var_GetInteger( p_enc, ENC_CFG_PREFIX "strict" );
p_sys->f_lumi_masking = var_GetFloat( p_enc, ENC_CFG_PREFIX "lumi-masking" );
p_sys->f_dark_masking = var_GetFloat( p_enc, ENC_CFG_PREFIX "dark-masking" );
p_sys->i_chroma_elim = var_GetInteger( p_enc, ENC_CFG_PREFIX "chroma-elim-threshold" );
psz_val = var_GetString( p_enc, ENC_CFG_PREFIX "aac-profile" );
- /* ffmpeg uses faac encoder atm, and it has issues with
+ /* libavcodec 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( psz_val && *psz_val )
else if( !strncmp( psz_val, "ssr", 3 ) )
p_sys->i_aac_profile = FF_PROFILE_AAC_SSR;
#endif
- else if( !strncmp( psz_val, "ltp", 3 ) )
+ else if( !strncmp( psz_val, "ltp", 3 ) )
p_sys->i_aac_profile = FF_PROFILE_AAC_LTP;
+#if LIBAVCODEC_VERSION_CHECK( 54, 19, 0, 35, 100 )
+/* These require libavcodec with libfdk-aac */
+ else if( !strncmp( psz_val, "hev2", 4 ) )
+ p_sys->i_aac_profile = FF_PROFILE_AAC_HE_V2;
+ else if( !strncmp( psz_val, "hev1", 4 ) )
+ p_sys->i_aac_profile = FF_PROFILE_AAC_HE;
+#endif
else
{
msg_Warn( p_enc, "unknown AAC profile requested, setting it to low" );
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;
if( p_sys->i_key_int > 0 )
p_context->gop_size = p_sys->i_key_int;
p_context->max_b_frames =
- __MAX( __MIN( p_sys->i_b_frames, FF_MAX_B_FRAMES ), 0 );
+ VLC_CLIP( p_sys->i_b_frames, 0, FF_MAX_B_FRAMES );
p_context->b_frame_strategy = 0;
if( !p_context->max_b_frames &&
( 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_enc->fmt_out.i_codec == VLC_CODEC_MP2V ) )
p_context->flags |= CODEC_FLAG_LOW_DELAY;
av_reduce( &p_context->sample_aspect_ratio.num,
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_enc->fmt_in.i_codec = VLC_CODEC_I420;
p_enc->fmt_in.video.i_chroma = p_enc->fmt_in.i_codec;
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
+ 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_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( 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;
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;
+ if( p_sys->i_rc_buffer_size )
+ {
+ 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
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;
- p_enc->fmt_in.i_codec = VLC_CODEC_S16N;
+ AV_SAMPLE_FMT_S16;
+ p_enc->fmt_in.i_codec = GetVlcAudioFormat( p_context->sample_fmt );
+
p_context->sample_rate = p_enc->fmt_out.audio.i_rate;
+ p_context->time_base.num = 1;
+ p_context->time_base.den = p_context->sample_rate;
p_context->channels = p_enc->fmt_out.audio.i_channels;
if ( p_enc->fmt_out.i_codec == VLC_CODEC_MP4A )
/* Misc parameters */
p_context->bit_rate = p_enc->fmt_out.i_bitrate;
-#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 52, 68, 2 )
/* Set reasonable defaults to VP8, based on
libvpx-720p preset from libvpx ffmpeg-patch */
if( i_codec_id == CODEC_ID_VP8 )
{
- p_context->bit_rate_tolerance = 2* p_enc->fmt_out.i_bitrate;
+ /* Lets give bitrate tolerance */
+ p_context->bit_rate_tolerance = __MAX(2 * (int)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->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;
+ }
+ }
+
+
+#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
+ }
if( i_codec_id == CODEC_ID_RAWVIDEO )
{
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();
+#if LIBAVCODEC_VERSION_MAJOR < 54
ret = avcodec_open( p_context, p_codec );
+#else
+ ret = avcodec_open2( p_context, p_codec, NULL /* options */ );
+#endif
vlc_avcodec_unlock();
if( ret )
{
p_context->codec = NULL;
vlc_avcodec_lock();
+#if LIBAVCODEC_VERSION_MAJOR < 54
ret = avcodec_open( p_context, p_codec );
+#else
+ ret = avcodec_open2( p_context, p_codec, NULL /* options */ );
+#endif
vlc_avcodec_unlock();
if( ret )
{
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 )
{
- GetVlcAudioFormat( &p_enc->fmt_in.i_codec,
- &p_enc->fmt_in.audio.i_bitspersample,
- p_sys->p_context->sample_fmt );
+ p_enc->fmt_in.i_codec = GetVlcAudioFormat( p_sys->p_context->sample_fmt );
+ p_enc->fmt_in.audio.i_bitspersample = aout_BitsPerSample( p_enc->fmt_in.i_codec );
+
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 ) );
+ p_enc->fmt_out.audio.i_bitspersample = aout_BitsPerSample( 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 );
}
msg_Dbg( p_enc, "found encoder %s", psz_namecodec );
+ p_enc->pf_encode_video = EncodeVideo;
+ p_enc->pf_encode_audio = EncodeAudio;
+
return VLC_SUCCESS;
+error:
+ free( p_enc->fmt_out.p_extra );
+ free( p_sys->p_buffer );
+ 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.
+ */
+ const int bytesPerPixel = p_enc->fmt_out.video.i_bits_per_pixel ?
+ p_enc->fmt_out.video.i_bits_per_pixel / 8 : 3;
+ const int blocksize = __MAX( FF_MIN_BUFFER_SIZE,bytesPerPixel * p_sys->p_context->height * p_sys->p_context->width + 200 );
+ block_t *p_block = block_Alloc( blocksize );
- 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
- {
- i_out = avcodec_encode_video( p_sys->p_context, p_sys->p_buffer_out,
- p_sys->i_buffer_out, NULL);
- }
-
- if( i_out > 0 )
- {
- 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 )
+ AVFrame *frame;
+ frame = avcodec_alloc_frame();
+ for( i_plane = 0; i_plane < p_pict->i_planes; i_plane++ )
{
- /* No delay -> output pts == input pts */
- if( p_pict )
- p_block->i_dts = p_pict->date;
- p_block->i_pts = p_block->i_dts;
+ frame->data[i_plane] = p_pict->p[i_plane].p_pixels;
+ frame->linesize[i_plane] = p_pict->p[i_plane].i_pitch;
}
- 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;
+ /* Let libavcodec select the frame type */
+ frame->pict_type = 0;
- p_block->i_pts = p_sys->pi_delay_pts[i_framenum % MAX_FRAME_DELAY];
- }
- /* End work-around */
+ 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 */
+ 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( p_sys->p_context->coded_frame->pict_type != FF_I_TYPE &&
- p_sys->p_context->coded_frame->pict_type != FF_P_TYPE )
+ if ( current_date + HURRY_UP_GUARD3 > frame->pts )
{
- p_block->i_dts = p_block->i_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
{
- if( p_sys->i_last_ref_pts )
+ p_sys->p_context->mb_decision = p_sys->i_hq;
+
+ if ( current_date + HURRY_UP_GUARD2 > frame->pts )
{
- p_block->i_dts = p_sys->i_last_ref_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
{
- /* Let's put something sensible */
- p_block->i_dts = p_block->i_pts;
+ p_sys->p_context->trellis = p_sys->b_trellis;
+
+ p_sys->p_context->noise_reduction =
+ p_sys->i_noise_reduction;
}
+ }
- p_sys->i_last_ref_pts = p_block->i_pts;
+ if ( current_date + HURRY_UP_GUARD1 > frame->pts )
+ {
+ frame->pict_type = AV_PICTURE_TYPE_P;
+ /* msg_Dbg( p_enc, "hurry up mode 1 %lld", current_date + HURRY_UP_GUARD1 - frame.pts ); */
}
}
- else
+
+ if ( frame->pts != (int64_t)AV_NOPTS_VALUE && frame->pts != 0 )
{
- /* Buggy libavcodec which doesn't update coded_frame->pts
- * correctly */
- p_block->i_dts = p_block->i_pts = p_pict->date;
+ 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 );
+ av_freep( &frame );
+ 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 );
+ av_freep( &frame );
+ return NULL;
+ }
+ else
+ {
+ p_sys->i_last_pts = frame->pts;
+ }
}
- switch ( p_sys->p_context->coded_frame->pict_type )
+ frame->quality = p_sys->i_quality;
+
+ i_out = avcodec_encode_video( p_sys->p_context, p_block->p_buffer,
+ p_block->i_buffer, frame );
+ av_freep( &frame );
+ }
+ else
+ {
+ i_out = avcodec_encode_video( p_sys->p_context, p_block->p_buffer,
+ p_block->i_buffer, NULL);
+ }
+
+ if( i_out <= 0 )
+ {
+ block_Release( p_block );
+ return NULL;
+ }
+
+ p_block->i_buffer = 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 )
+ {
+ /* 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;
+
+ if( p_sys->p_context->coded_frame->pict_type != AV_PICTURE_TYPE_I &&
+ p_sys->p_context->coded_frame->pict_type != AV_PICTURE_TYPE_P )
{
- 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_block->i_dts = p_block->i_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;
}
+ }
+ 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;
+ }
+
+ switch ( p_sys->p_context->coded_frame->pict_type )
+ {
+ case AV_PICTURE_TYPE_I:
+ p_block->i_flags |= BLOCK_FLAG_TYPE_I;
+ break;
+ case AV_PICTURE_TYPE_P:
+ p_block->i_flags |= BLOCK_FLAG_TYPE_P;
+ break;
+ case AV_PICTURE_TYPE_B:
+ p_block->i_flags |= BLOCK_FLAG_TYPE_B;
+ break;
- return p_block;
}
- return NULL;
+ return p_block;
}
/****************************************************************************
* EncodeAudio: the whole thing
****************************************************************************/
-static block_t *EncodeAudio( encoder_t *p_enc, aout_buffer_t *p_aout_buf )
+static block_t *EncodeAudio( encoder_t *p_enc, block_t *p_aout_buf )
{
encoder_sys_t *p_sys = p_enc->p_sys;
block_t *p_block, *p_chain = NULL;
+ AVFrame *frame=NULL;
+ int got_packet,i_out,i_samples_left=0,i_data_offset = 0;
+
+ //i_samples_left is amount of samples we get
+ i_samples_left = p_aout_buf ? p_aout_buf->i_nb_samples : 0;
+
+ if( p_sys->i_samples_delay > 0 )
+ {
+ AVPacket packet;
+ //How much we need to copy from new packet
+ const int leftover = __MAX(0,__MIN(i_samples_left, (p_sys->i_frame_size - p_sys->i_samples_delay)));
+
+ frame = avcodec_alloc_frame();
+ frame->nb_samples = p_sys->i_samples_delay + leftover;
+ frame->format = p_sys->p_context->sample_fmt;
+
+ //Copy samples from new packet to buffer to get frame size
+ if( likely( leftover ) )
+ memcpy( p_sys->p_buffer+(p_sys->i_samples_delay*p_sys->i_sample_bytes), p_aout_buf->p_buffer, leftover*p_sys->i_sample_bytes*p_enc->fmt_in.audio.i_channels);
+
+ if( avcodec_fill_audio_frame( frame, p_enc->fmt_in.audio.i_channels,
+ p_sys->p_context->sample_fmt,
+ p_sys->p_buffer,
+ (p_sys->i_samples_delay + leftover) * p_sys->i_sample_bytes * p_enc->fmt_in.audio.i_channels,
+ 0) < 0 )
+ msg_Err( p_enc, "Filling on leftovers error i_leftover %d i_samples_left %d samples_delay %d frame size %d", leftover, i_samples_left, p_sys->i_samples_delay, p_sys->i_frame_size );
+
+ if( likely( p_aout_buf ) )
+ frame->pts = p_aout_buf->i_pts -
+ (mtime_t)1000000 * (mtime_t)p_sys->i_samples_delay /
+ (mtime_t)p_enc->fmt_in.audio.i_rate;
+
+ p_sys->i_samples_delay = 0;
+ i_data_offset += leftover * p_sys->i_sample_bytes * p_enc->fmt_in.audio.i_channels;
+ i_samples_left -= leftover;
+
+ p_block = block_Alloc( p_sys->i_buffer_out );
+ av_init_packet( &packet );
+ packet.data = p_block->p_buffer;
+ packet.size = p_block->i_buffer;
+
+ i_out = avcodec_encode_audio2( p_sys->p_context, &packet, frame, &got_packet );
+ p_block->i_buffer = packet.size;
+
+
+ /*FIXME: same as avcodec_free_frame, but we don't require so new avcodec that has it*/
+ if( frame->extended_data != frame->data )
+ av_freep( frame->extended_data );
+ av_freep( &frame );
+ if( unlikely( !got_packet || ( i_out < 0 ) ) )
+ {
+ if( i_out < 0 )
+ {
+ msg_Err( p_enc,"Encoding problem...");
+ return p_chain;
+ }
+ } else {
+ p_block->i_buffer = packet.size;
- uint8_t *p_buffer = p_aout_buf->p_buffer;
- int i_samples = p_aout_buf->i_nb_samples;
- int i_samples_delay = p_sys->i_samples_delay;
+ p_block->i_length = (mtime_t)1000000 *
+ (mtime_t)p_sys->i_frame_size /
+ (mtime_t)p_sys->p_context->sample_rate;
- p_sys->i_pts = p_aout_buf->i_pts -
- (mtime_t)1000000 * (mtime_t)p_sys->i_samples_delay /
- (mtime_t)p_enc->fmt_in.audio.i_rate;
+ p_block->i_dts = p_block->i_pts = packet.pts;
- p_sys->i_samples_delay += i_samples;
+ block_ChainAppend( &p_chain, p_block );
+ }
+ }
- while( p_sys->i_samples_delay >= p_sys->i_frame_size )
+ if( unlikely( !p_aout_buf ) )
{
- void *p_samples;
- int i_out;
+ msg_Dbg(p_enc,"Flushing..");
+ do {
+ AVPacket packet;
+ p_block = block_Alloc( p_sys->i_buffer_out );
+ av_init_packet( &packet );
+ packet.data = p_block->p_buffer;
+ packet.size = p_block->i_buffer;
+
+ i_out = avcodec_encode_audio2( p_sys->p_context, &packet, NULL, &got_packet );
+ p_block->i_buffer = packet.size;
+
+ p_block->i_length = (mtime_t)1000000 *
+ (mtime_t)p_sys->i_frame_size /
+ (mtime_t)p_sys->p_context->sample_rate;
+
+ p_block->i_dts = p_block->i_pts = packet.pts;
+
+ if( !i_out && got_packet )
+ block_ChainAppend( &p_chain, p_block );
+ } while( got_packet && !i_out );
+ return p_chain;
+ }
- if( i_samples_delay )
- {
- /* Take care of the left-over from last time */
- int i_delay_size = i_samples_delay;
- int i_size = (p_sys->i_frame_size - i_delay_size) *
- p_sys->i_sample_bytes;
-
- 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 = p_buffer;
- }
+ while( i_samples_left >= p_sys->i_frame_size )
+ {
+ AVPacket packet = {0};
+ frame = avcodec_alloc_frame();
- i_out = avcodec_encode_audio( p_sys->p_context, p_sys->p_buffer_out,
- p_sys->i_buffer_out, p_samples );
+ frame->nb_samples = p_sys->i_frame_size;
+ frame->format = p_sys->p_context->sample_fmt;
-#if 0
- msg_Warn( p_enc, "avcodec_encode_audio: %d", i_out );
-#endif
- 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( avcodec_fill_audio_frame( frame, p_enc->fmt_in.audio.i_channels,
+ p_sys->p_context->sample_fmt,
+ p_aout_buf->p_buffer+i_data_offset,
+ p_sys->i_frame_size * p_sys->i_sample_bytes * p_enc->fmt_in.audio.i_channels,
+ 0) < 0 )
+ msg_Err( p_enc, "filling error on encode" );
+
+ i_samples_left -= p_sys->i_frame_size;
+ i_data_offset += p_sys->i_frame_size * p_sys->i_sample_bytes * p_enc->fmt_in.audio.i_channels;
+
+ frame->pts = p_aout_buf->i_pts;
+
+ p_block = block_Alloc( p_sys->i_buffer_out );
+ av_init_packet( &packet );
+ packet.data = p_block->p_buffer;
+ packet.size = p_block->i_buffer;
- if( i_out <= 0 )
+ i_out = avcodec_encode_audio2( p_sys->p_context, &packet, frame, &got_packet );
+ p_block->i_buffer = packet.size;
+
+ if( frame->extended_data != frame->data )
+ av_freep( frame->extended_data );
+ av_freep( &frame );
+ if( unlikely( !got_packet || ( i_out < 0 ) ) )
+ {
+ if( i_out < 0 )
+ {
+ msg_Err( p_enc,"Encoding problem..");
+ return p_chain;
+ }
+ block_Release( p_block );
continue;
+ }
- p_block = block_New( p_enc, i_out );
- memcpy( p_block->p_buffer, p_sys->p_buffer_out, i_out );
+ p_block->i_buffer = packet.size;
p_block->i_length = (mtime_t)1000000 *
(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;
+ p_block->i_dts = p_block->i_pts = packet.pts;
- /* Update pts */
- p_sys->i_pts += p_block->i_length;
block_ChainAppend( &p_chain, p_block );
}
+ if( i_samples_left < 0 )
+ msg_Err( p_enc, "I_data_left overflow");
- /* Backup the remaining raw samples */
- if( i_samples )
+ // We have leftover samples that don't fill frame_size, and libavcodec doesn't seem to like
+ // that frame has more data than p_sys->i_frame_size most of the cases currently.
+ if( i_samples_left > 0 )
{
- memcpy( &p_sys->p_buffer[i_samples_delay * p_sys->i_sample_bytes],
- p_buffer,
- i_samples * p_sys->i_sample_bytes );
+ memcpy( p_sys->p_buffer, p_aout_buf->p_buffer+i_data_offset , i_samples_left*p_sys->i_sample_bytes*p_enc->fmt_in.audio.i_channels);
+ p_sys->i_samples_delay = i_samples_left;
}
return p_chain;
}
/*****************************************************************************
- * CloseEncoder: ffmpeg encoder destruction
+ * CloseEncoder: libavcodec encoder destruction
*****************************************************************************/
void CloseEncoder( vlc_object_t *p_this )
{
av_free( p_sys->p_context );
free( p_sys->p_buffer );
- free( p_sys->p_buffer_out );
free( p_sys );
}
projects / vlc / blobdiff