/*****************************************************************************
- * 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.
*****************************************************************************/
/*****************************************************************************
#endif
#include <vlc_common.h>
-#include <vlc_vout.h>
#include <vlc_aout.h>
#include <vlc_sout.h>
#include <vlc_codec.h>
-#include <vlc_interface.h>
+#include <vlc_dialog.h>
+#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"
+
+#if LIBAVUTIL_VERSION_CHECK( 52,2,6,0,0 )
+# include <libavutil/channel_layout.h>
+#endif
#define HURRY_UP_GUARD1 (450000)
#define HURRY_UP_GUARD2 (300000)
#define MAX_FRAME_DELAY (FF_MAX_B_FRAMES + 2)
+#define RAW_AUDIO_FRAME_SIZE (2048)
+
/*****************************************************************************
* Local prototypes
*****************************************************************************/
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;
-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 );
/*****************************************************************************
* thread_context_t : for multithreaded encoding
};
/*****************************************************************************
- * 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;
+ uint8_t *p_buffer;
size_t i_buffer_out;
+ uint8_t *p_interleave_buf;
/*
* Video properties
/*
* Audio properties
*/
- int i_frame_size;
- int i_samples_delay;
+ size_t i_sample_bytes;
+ size_t i_frame_size;
+ size_t i_samples_delay; //How much samples in delay buffer
+ bool b_planar;
+ bool b_variable; //Encoder can be fed with any size frames not just frame_size
mtime_t i_pts;
+ date_t buffer_date;
/* Encoding settings */
int i_key_int;
bool b_trellis;
int i_quality; /* for VBR */
float f_lumi_masking, f_dark_masking, f_p_masking, f_border_masking;
+#if (LIBAVCODEC_VERSION_MAJOR < 55)
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];
+ int i_aac_profile; /* AAC profile to use.*/
+
+ AVFrame *frame;
};
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", "i-quant-factor", "noise-reduction", "mpeg4-matrix",
+ "interlace", "interlace-me", "i-quant-factor", "noise-reduction", "mpeg4-matrix",
"trellis", "qscale", "strict", "lumi-masking", "dark-masking",
- "p-masking", "border-masking", "luma-elim-threshold",
- "chroma-elim-threshold",
-#if LIBAVCODEC_VERSION_INT >= ((51<<16)+(40<<8)+4)
- "aac-profile",
+ "p-masking", "border-masking",
+#if (LIBAVCODEC_VERSION_MAJOR < 55)
+ "luma-elim-threshold", "chroma-elim-threshold",
#endif
- NULL
+ "aac-profile", "options",
+ NULL
};
static const uint16_t mpa_bitrate_tab[2][15] =
int OpenEncoder( vlc_object_t *p_this )
{
encoder_t *p_enc = (encoder_t *)p_this;
- encoder_sys_t *p_sys = p_enc->p_sys;
+ 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;
- vlc_value_t val;
+ float f_val;
+ char *psz_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 = AV_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 = AV_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 = AV_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 )
- {
- /* handed chroma output */
- return VLC_EGENERIC;
- }
+ if( FindFfmpegChroma( p_enc->fmt_out.i_codec ) == PIX_FMT_NONE )
+ return VLC_EGENERIC; /* handed chroma output */
+
i_cat = VIDEO_ES;
- i_codec_id = CODEC_ID_RAWVIDEO;
+ i_codec_id = AV_CODEC_ID_RAWVIDEO;
psz_namecodec = "Raw video";
}
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;
}
- /* Initialization must be done before avcodec_find_encoder() */
- InitLibavcodec( p_this );
+ if( p_enc->fmt_out.i_cat == SPU_ES )
+ {
+ /* We don't support subtitle encoding */
+ return VLC_EGENERIC;
+ }
- 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 );
- intf_UserFatal( p_enc, false, _("Streaming / Transcoding failed"), _(
+ 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"
+"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->b_planar = false;
p_sys->p_buffer = NULL;
- p_sys->p_buffer_out = NULL;
+ p_sys->p_interleave_buf = NULL;
p_sys->i_buffer_out = 0;
- p_sys->p_context = p_context = avcodec_alloc_context();
- p_context->debug = config_GetInt( p_enc, "ffmpeg-debug" );
+ p_context = avcodec_alloc_context3(p_codec);
+ p_sys->p_context = p_context;
+ p_sys->p_context->codec_id = p_sys->p_codec->id;
+ p_context->thread_type = 0;
+ 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 );
-
- 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 * 1000;
-
- 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;
+ /* set CPU capabilities */
+#if LIBAVUTIL_VERSION_CHECK(51, 25, 0, 42, 100)
+ av_set_cpu_flags_mask( INT_MAX & ~GetVlcDspMask() );
+#else
+ p_context->dsp_mask = GetVlcDspMask();
+#endif
- var_Get( p_enc, ENC_CFG_PREFIX "pre-me", &val );
- p_sys->b_pre_me = val.b_bool;
+ 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_vtolerance = var_GetInteger( p_enc, ENC_CFG_PREFIX "vt" ) * 1000;
+ p_sys->b_interlace = var_GetBool( p_enc, ENC_CFG_PREFIX "interlace" );
+ p_sys->b_interlace_me = var_GetBool( p_enc, ENC_CFG_PREFIX "interlace-me" );
+ p_sys->b_pre_me = var_GetBool( p_enc, ENC_CFG_PREFIX "pre-me" );
+ p_sys->b_hurry_up = var_GetBool( p_enc, ENC_CFG_PREFIX "hurry-up" );
- 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 "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;
+ p_sys->i_rc_buffer_size = var_GetInteger( p_enc, ENC_CFG_PREFIX "rc-buffer-size" );
+ p_sys->f_rc_buffer_aggressivity = var_GetFloat( p_enc, ENC_CFG_PREFIX "rc-buffer-aggressivity" );
+ p_sys->f_i_quant_factor = var_GetFloat( p_enc, ENC_CFG_PREFIX "i-quant-factor" );
+ p_sys->i_noise_reduction = var_GetInteger( p_enc, ENC_CFG_PREFIX "noise-reduction" );
+ p_sys->b_mpeg4_matrix = var_GetBool( p_enc, ENC_CFG_PREFIX "mpeg4-matrix" );
- var_Get( p_enc, ENC_CFG_PREFIX "noise-reduction", &val );
- p_sys->i_noise_reduction = val.i_int;
+ f_val = var_GetFloat( p_enc, ENC_CFG_PREFIX "qscale" );
- 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);
+ p_sys->i_quality = 0;
+ if( f_val < 0.01 || f_val > 255.0 )
+ f_val = 0;
+ else
+ p_sys->i_quality = (int)(FF_QP2LAMBDA * f_val + 0.5);
- var_Get( p_enc, ENC_CFG_PREFIX "hq", &val );
+ psz_val = var_GetString( p_enc, ENC_CFG_PREFIX "hq" );
p_sys->i_hq = FF_MB_DECISION_RD;
- if( val.psz_string && *val.psz_string )
+ if( psz_val && *psz_val )
{
- if( !strcmp( val.psz_string, "rd" ) )
+ if( !strcmp( psz_val, "rd" ) )
p_sys->i_hq = FF_MB_DECISION_RD;
- else if( !strcmp( val.psz_string, "bits" ) )
+ else if( !strcmp( psz_val, "bits" ) )
p_sys->i_hq = FF_MB_DECISION_BITS;
- else if( !strcmp( val.psz_string, "simple" ) )
+ else if( !strcmp( psz_val, "simple" ) )
p_sys->i_hq = FF_MB_DECISION_SIMPLE;
else
p_sys->i_hq = FF_MB_DECISION_RD;
}
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;
- 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 LIBAVCODEC_VERSION_INT >= ((51<<16)+(40<<8)+4)
- var_Get( p_enc, ENC_CFG_PREFIX "aac-profile", &val );
- /* ffmpeg uses faac encoder atm, and it has issues with
+ free( psz_val );
+
+ p_sys->i_qmin = var_GetInteger( p_enc, ENC_CFG_PREFIX "qmin" );
+ p_sys->i_qmax = var_GetInteger( p_enc, ENC_CFG_PREFIX "qmax" );
+ p_sys->b_trellis = var_GetBool( p_enc, ENC_CFG_PREFIX "trellis" );
+
+ 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->f_p_masking = var_GetFloat( p_enc, ENC_CFG_PREFIX "p-masking" );
+ p_sys->f_border_masking = var_GetFloat( p_enc, ENC_CFG_PREFIX "border-masking" );
+#if (LIBAVCODEC_VERSION_MAJOR < 55)
+ p_sys->i_luma_elim = var_GetInteger( p_enc, ENC_CFG_PREFIX "luma-elim-threshold" );
+ p_sys->i_chroma_elim = var_GetInteger( p_enc, ENC_CFG_PREFIX "chroma-elim-threshold" );
+#endif
+
+ psz_val = var_GetString( p_enc, ENC_CFG_PREFIX "aac-profile" );
+ /* 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( val.psz_string && *val.psz_string )
+ if( psz_val && *psz_val )
{
- if( !strncmp( val.psz_string, "main", 4 ) )
+ if( !strncmp( psz_val, "main", 4 ) )
p_sys->i_aac_profile = FF_PROFILE_AAC_MAIN;
- else if( !strncmp( val.psz_string, "low", 3 ) )
+ else if( !strncmp( psz_val, "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 ) )
+ else if( !strncmp( psz_val, "ssr", 3 ) )
p_sys->i_aac_profile = FF_PROFILE_AAC_SSR;
#endif
- else if( !strncmp( val.psz_string, "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" );
p_sys->i_aac_profile = FF_PROFILE_AAC_LOW;
}
}
- free( val.psz_string );
-#endif
+ free( psz_val );
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,
return VLC_EGENERIC;
}
+ 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;
- 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;
+ 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_context->dark_masking = p_sys->f_dark_masking;
p_context->p_masking = p_sys->f_p_masking;
p_context->border_masking = p_sys->f_border_masking;
+#if (LIBAVCODEC_VERSION_MAJOR < 55)
p_context->luma_elim_threshold = p_sys->i_luma_elim;
p_context->chroma_elim_threshold = p_sys->i_chroma_elim;
+#endif
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_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_context->flags |= CODEC_FLAG_LOW_DELAY;
- 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 );
+ 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;
- 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_FOURCC('I','4','2','0');
+ 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 );
+ GetFfmpegChroma( &p_context->pix_fmt, &p_enc->fmt_in.video );
if( p_codec->pix_fmts )
{
}
}
-#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;
-
- if ( p_enc->i_threads >= 1 )
- p_context->thread_count = p_enc->i_threads;
+ /* These codecs cause libavcodec to exit if thread_count is > 1.
+ See libavcodec/mpegvideo_enc.c:MPV_encode_init and
+ libavcodec/svq3.c , WMV2 calls MPV_encode_init also.
+ */
+ if ( i_codec_id == AV_CODEC_ID_FLV1 ||
+ i_codec_id == AV_CODEC_ID_H261 ||
+ i_codec_id == AV_CODEC_ID_LJPEG ||
+ i_codec_id == AV_CODEC_ID_MJPEG ||
+ i_codec_id == AV_CODEC_ID_H263 ||
+ i_codec_id == AV_CODEC_ID_H263P ||
+ i_codec_id == AV_CODEC_ID_MSMPEG4V1 ||
+ i_codec_id == AV_CODEC_ID_MSMPEG4V2 ||
+ i_codec_id == AV_CODEC_ID_MSMPEG4V3 ||
+ i_codec_id == AV_CODEC_ID_WMV1 ||
+ i_codec_id == AV_CODEC_ID_WMV2 ||
+ i_codec_id == AV_CODEC_ID_RV10 ||
+ i_codec_id == AV_CODEC_ID_RV20 ||
+ i_codec_id == AV_CODEC_ID_SVQ3 )
+ p_enc->i_threads = 1;
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
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 )
+ if( i_codec_id == AV_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->codec_type = AVMEDIA_TYPE_AUDIO;
+ p_context->sample_fmt = p_codec->sample_fmts ?
+ p_codec->sample_fmts[0] :
+ AV_SAMPLE_FMT_S16;
+
+ /* Try to match avcodec input format to vlc format so we could avoid one
+ format conversion */
+ if( GetVlcAudioFormat( p_context->sample_fmt ) != p_enc->fmt_in.i_codec )
+ {
+ msg_Dbg( p_enc, "Trying to find more suitable sample format instead of %s", av_get_sample_fmt_name( p_context->sample_fmt ) );
+ for( unsigned int i=0; p_codec->sample_fmts[i] != -1; i++ )
+ {
+ if( GetVlcAudioFormat( p_codec->sample_fmts[i] ) == p_enc->fmt_in.i_codec )
+ {
+ p_context->sample_fmt = p_codec->sample_fmts[i];
+ msg_Dbg( p_enc, "Using %s as new sample format", av_get_sample_fmt_name( p_context->sample_fmt ) );
+ break;
+ }
+ }
+ }
+ p_sys->b_planar = av_sample_fmt_is_planar( p_context->sample_fmt );
+ // Try if we can use interleaved format for codec input as VLC doesn't really do planar audio yet
+ // FIXME: Remove when planar/interleaved audio in vlc is equally supported
+ if( p_sys->b_planar )
+ {
+ msg_Dbg( p_enc, "Trying to find packet sample format instead of planar %s", av_get_sample_fmt_name( p_context->sample_fmt ) );
+ for( unsigned int i=0; p_codec->sample_fmts[i] != -1; i++ )
+ {
+ if( !av_sample_fmt_is_planar( p_codec->sample_fmts[i] ) )
+ {
+ p_context->sample_fmt = p_codec->sample_fmts[i];
+ msg_Dbg( p_enc, "Changing to packet format %s as new sample format", av_get_sample_fmt_name( p_context->sample_fmt ) );
+ break;
+ }
+ }
+ }
+ msg_Dbg( p_enc, "Ended up using %s as sample format", av_get_sample_fmt_name( p_context->sample_fmt ) );
+ p_enc->fmt_in.i_codec = GetVlcAudioFormat( p_context->sample_fmt );
+ p_sys->b_planar = av_sample_fmt_is_planar( p_context->sample_fmt );
+
p_context->sample_rate = p_enc->fmt_out.audio.i_rate;
+ date_Init( &p_sys->buffer_date, p_enc->fmt_out.audio.i_rate, 1 );
+ date_Set( &p_sys->buffer_date, 0 );
+ 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 LIBAVUTIL_VERSION_CHECK( 52, 2, 6, 0, 0)
+ p_context->channel_layout = av_get_default_channel_layout( p_context->channels );
+#endif
- 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;*/
-#if LIBAVCODEC_VERSION_INT >= ((51<<16)+(40<<8)+4)
/* 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
}
}
/* Misc parameters */
p_context->bit_rate = p_enc->fmt_out.i_bitrate;
- if( i_codec_id == CODEC_ID_RAWVIDEO )
+ /* Set reasonable defaults to VP8, based on
+ libvpx-720p preset from libvpx ffmpeg-patch */
+ if( i_codec_id == AV_CODEC_ID_VP8 )
+ {
+ /* 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 == AV_CODEC_ID_RAWVIDEO )
{
/* XXX: hack: Force same codec (will be handled by transcode) */
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 );
+ 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_lock( &avcodec_lock );
+ if( p_enc->i_threads >= 1)
+ p_context->thread_count = p_enc->i_threads;
+ else
+ p_context->thread_count = vlc_GetCPUCount();
+
+ int ret;
+ char *psz_opts = var_InheritString(p_enc, ENC_CFG_PREFIX "options");
+ AVDictionary *options = NULL;
+ if (psz_opts && *psz_opts)
+ options = vlc_av_get_options(psz_opts);
+ free(psz_opts);
+
+ vlc_avcodec_lock();
+ ret = avcodec_open2( p_context, p_codec, options ? &options : NULL );
+ vlc_avcodec_unlock();
+
+ AVDictionaryEntry *t = NULL;
+ while ((t = av_dict_get(options, "", t, AV_DICT_IGNORE_SUFFIX))) {
+ msg_Err(p_enc, "Unknown option \"%s\"", t->key);
+ }
- if( avcodec_open( p_context, p_codec ) )
+ if( ret )
{
- vlc_mutex_unlock( &avcodec_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) )
+ if( p_enc->fmt_in.i_cat != AUDIO_ES ||
+ (p_context->channels <= 2 && i_codec_id != AV_CODEC_ID_MP2
+ && i_codec_id != AV_CODEC_ID_MP3) )
{
- 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)" );
- }
+ msg_Err( p_enc, "cannot open encoder" );
+ dialog_Fatal( p_enc, _("Streaming / Transcoding failed"),
+ "%s", _("VLC could not open the encoder.") );
+ av_dict_free(&options);
+ goto error;
+ }
- if( i_codec_id == CODEC_ID_MP2 || i_codec_id == CODEC_ID_MP3 )
- {
- int i_frequency, i;
+ 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)" );
+ }
- 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;
- }
+ if( i_codec_id == AV_CODEC_ID_MP2 || i_codec_id == AV_CODEC_ID_MP3 )
+ {
+ int i_frequency, i;
+ es_format_t *fmt = &p_enc->fmt_out;
- 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;
- }
+ for ( i_frequency = 0; i_frequency < 6; i_frequency++ )
+ if ( fmt->audio.i_rate == mpa_freq_tab[i_frequency] )
+ break;
+
+ if ( i_frequency == 6 )
+ {
+ msg_Err( p_enc, "MPEG audio doesn't support frequency=%d",
+ fmt->audio.i_rate );
+ av_dict_free(&options);
+ goto error;
}
- p_context->codec = NULL;
- vlc_mutex_lock( &avcodec_lock );
- if( avcodec_open( p_context, p_codec ) )
+ for ( i = 1; i < 14; i++ )
+ if (fmt->i_bitrate/1000 <= mpa_bitrate_tab[i_frequency / 3][i])
+ break;
+
+ if (fmt->i_bitrate / 1000 != mpa_bitrate_tab[i_frequency / 3][i])
{
- vlc_mutex_unlock( &avcodec_lock );
- msg_Err( p_enc, "cannot open encoder" );
- intf_UserFatal( p_enc, false,
- _("Streaming / Transcoding failed"),
- _("VLC could not open the encoder.") );
- free( p_sys );
- return VLC_EGENERIC;
+ msg_Warn( p_enc,
+ "MPEG audio doesn't support bitrate=%d, using %d",
+ fmt->i_bitrate,
+ mpa_bitrate_tab[i_frequency / 3][i] * 1000 );
+ fmt->i_bitrate = mpa_bitrate_tab[i_frequency / 3][i] * 1000;
+ p_context->bit_rate = fmt->i_bitrate;
}
}
- else
+
+ p_context->codec = NULL;
+ vlc_avcodec_lock();
+ ret = avcodec_open2( p_context, p_codec, options ? &options : NULL );
+ vlc_avcodec_unlock();
+ if( ret )
{
msg_Err( p_enc, "cannot open encoder" );
- intf_UserFatal( p_enc, false, _("Streaming / Transcoding failed"),
- _("VLC could not open the encoder.") );
- free( p_sys );
- return VLC_EGENERIC;
+ dialog_Fatal( p_enc,
+ _("Streaming / Transcoding failed"),
+ "%s", _("VLC could not open the encoder.") );
+ av_dict_free(&options);
+ goto error;
}
}
- vlc_mutex_unlock( &avcodec_lock );
- p_enc->fmt_out.i_extra = p_context->extradata_size;
- if( p_enc->fmt_out.i_extra )
+ av_dict_free(&options);
+
+ if( i_codec_id == AV_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; /* f */
+ p[1] = 0x4C; /* L */
+ p[2] = 0x61; /* a */
+ p[3] = 0x43; /* C */
+ p[4] = 0x80; /* streaminfo block, last block before audio */
+ 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;
+ }
}
- p_context->flags &= ~CODEC_FLAG_GLOBAL_HEADER;
-
- if( p_enc->fmt_in.i_cat == AUDIO_ES )
+ else
{
- p_sys->i_buffer_out = 2 * AVCODEC_MAX_AUDIO_FRAME_SIZE;
- p_sys->p_buffer_out = malloc( p_sys->i_buffer_out );
- 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;
+ 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 );
+ 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 );
+ }
}
- msg_Dbg( p_enc, "found encoder %s", psz_namecodec );
-
- return VLC_SUCCESS;
-}
+ p_context->flags &= ~CODEC_FLAG_GLOBAL_HEADER;
-/****************************************************************************
- * Ffmpeg threading system
- ****************************************************************************/
-static void* FfmpegThread( vlc_object_t *p_this )
-{
- 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 )
+ if( p_enc->fmt_in.i_cat == AUDIO_ES )
{
- vlc_mutex_lock( &p_context->lock );
- while ( !p_context->b_work && vlc_object_alive (p_context) && !p_context->b_error )
+ 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_sys->i_frame_size = p_context->frame_size > 1 ?
+ p_context->frame_size :
+ FF_MIN_BUFFER_SIZE;
+ p_sys->p_buffer = malloc( p_sys->i_frame_size * p_sys->i_sample_bytes * p_enc->fmt_in.audio.i_channels);
+ if ( unlikely( p_sys->p_buffer == NULL ) )
{
- vlc_cond_wait( &p_context->cond, &p_context->lock );
+ goto error;
}
- p_context->b_work = 0;
- vlc_mutex_unlock( &p_context->lock );
- if ( !vlc_object_alive (p_context) || p_context->b_error )
- break;
+ p_enc->fmt_out.audio.i_blockalign = p_context->block_align;
+ p_enc->fmt_out.audio.i_bitspersample = aout_BitsPerSample( p_enc->fmt_out.i_codec );
+ //b_variable tells if we can feed any size frames to encoder
+ p_sys->b_variable = p_context->frame_size ? false : true;
+
+ p_sys->i_buffer_out = p_sys->i_frame_size * p_sys->i_sample_bytes * p_enc->fmt_in.audio.i_channels;
- if ( p_context->pf_func )
+ if( p_sys->b_planar )
{
- p_context->i_ret = p_context->pf_func( p_context->p_context,
- p_context->arg );
+ p_sys->p_interleave_buf = malloc( p_sys->i_buffer_out );
+ if( unlikely( p_sys->p_interleave_buf == NULL ) )
+ goto error;
}
-
- vlc_mutex_lock( &p_context->lock );
- p_context->b_done = 1;
- vlc_cond_signal( &p_context->cond );
- vlc_mutex_unlock( &p_context->lock );
}
- vlc_restorecancel (canc);
- return NULL;
-}
-
-static int FfmpegExecute( AVCodecContext *s,
- int (*pf_func)(AVCodecContext *c2, void *arg2),
- void **arg, int *ret, int count )
-{
- struct thread_context_t ** pp_contexts =
- (struct thread_context_t **)s->thread_opaque;
- int i;
-
- /* 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++ )
+ p_sys->frame = avcodec_alloc_frame();
+ if( !p_sys->frame )
{
- vlc_mutex_lock( &pp_contexts[i]->lock );
- pp_contexts[i]->arg = arg[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 );
+ goto error;
}
- for ( i = 0; i < count; i++ )
- {
- vlc_mutex_lock( &pp_contexts[i]->lock );
- while ( !pp_contexts[i]->b_done )
- {
- vlc_cond_wait( &pp_contexts[i]->cond, &pp_contexts[i]->lock );
- }
- pp_contexts[i]->b_done = 0;
- pp_contexts[i]->pf_func = NULL;
- vlc_mutex_unlock( &pp_contexts[i]->lock );
+ msg_Dbg( p_enc, "found encoder %s", psz_namecodec );
+
+ p_enc->pf_encode_video = EncodeVideo;
+ p_enc->pf_encode_audio = EncodeAudio;
- if ( ret )
- {
- ret[i] = pp_contexts[i]->i_ret;
- }
- }
- return 0;
+ return VLC_SUCCESS;
+error:
+ free( p_enc->fmt_out.p_extra );
+ free( p_sys->p_buffer );
+ free( p_sys->p_interleave_buf );
+ 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;
-
- if ( !p_sys->b_inited && p_enc->i_threads >= 1 )
- {
- struct thread_context_t ** pp_contexts;
- int i;
+ int i_out, i_plane, i_got_packet=1;
- p_sys->b_inited = 1;
- pp_contexts = malloc( sizeof(struct thread_context_t *)
- * p_enc->i_threads );
- p_sys->p_context->thread_opaque = (void *)pp_contexts;
-
- for ( i = 0; i < p_enc->i_threads; i++ )
+ /* 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 );
+
+#if (LIBAVCODEC_VERSION_MAJOR >= 54)
+ AVPacket av_pkt;
+ /*We don't use av_pkt with major_version < 54, so no point init it*/
+ av_init_packet( &av_pkt );
+ av_pkt.data = p_block->p_buffer;
+ av_pkt.size = p_block->i_buffer;
+#endif
+ if( likely(p_pict) ) {
+ avcodec_get_frame_defaults( p_sys->frame );
+ for( i_plane = 0; i_plane < p_pict->i_planes; i_plane++ )
{
- pp_contexts[i] = vlc_object_create( p_enc,
- sizeof(struct thread_context_t) );
- pp_contexts[i]->p_context = p_sys->p_context;
- vlc_mutex_init( &pp_contexts[i]->lock );
- 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 ) )
- {
- msg_Err( p_enc, "cannot spawn encoder thread, expect to die soon" );
- return NULL;
- }
+ p_sys->frame->data[i_plane] = p_pict->p[i_plane].p_pixels;
+ p_sys->frame->linesize[i_plane] = p_pict->p[i_plane].i_pitch;
}
- p_sys->p_context->execute = FfmpegExecute;
- }
+ /* Let libavcodec select the frame type */
+ p_sys->frame->pict_type = 0;
- 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;
- }
+ p_sys->frame->repeat_pict = p_pict->i_nb_fields - 2;
+ p_sys->frame->interlaced_frame = !p_pict->b_progressive;
+ p_sys->frame->top_field_first = !!p_pict->b_top_field_first;
- /* Let ffmpeg select the frame type */
- frame.pict_type = 0;
+ /* Set the pts of the frame being encoded */
+ p_sys->frame->pts = p_pict->date ? p_pict->date : (int64_t)AV_NOPTS_VALUE;
- 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_FOURCC( 'm', 'p', '4', 'v' ) )
- {
- 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 )
+ if ( p_sys->b_hurry_up && p_sys->frame->pts != (int64_t)AV_NOPTS_VALUE )
{
mtime_t current_date = mdate();
- if ( current_date + HURRY_UP_GUARD3 > frame.pts )
+ if ( current_date + HURRY_UP_GUARD3 > p_sys->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
{
p_sys->p_context->mb_decision = p_sys->i_hq;
- if ( current_date + HURRY_UP_GUARD2 > frame.pts )
+ if ( current_date + HURRY_UP_GUARD2 > p_sys->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;
+ + (HURRY_UP_GUARD2 + current_date - p_sys->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;
+ p_sys->i_noise_reduction;
}
}
- if ( current_date + HURRY_UP_GUARD1 > frame.pts )
+ if ( current_date + HURRY_UP_GUARD1 > p_sys->frame->pts )
{
- frame.pict_type = FF_P_TYPE;
+ p_sys->frame->pict_type = AV_PICTURE_TYPE_P;
/* msg_Dbg( p_enc, "hurry up mode 1 %lld", current_date + HURRY_UP_GUARD1 - frame.pts ); */
}
}
+
+ if ( p_sys->frame->pts != (int64_t)AV_NOPTS_VALUE && p_sys->frame->pts != 0 )
+ {
+ if ( p_sys->i_last_pts == p_sys->frame->pts )
+ {
+ msg_Warn( p_enc, "almost fed libavcodec with two frames with the "
+ "same PTS (%"PRId64 ")", p_sys->frame->pts );
+ return NULL;
+ }
+ else if ( p_sys->i_last_pts > p_sys->frame->pts )
+ {
+ msg_Warn( p_enc, "almost fed libavcodec with a frame in the "
+ "past (current: %"PRId64 ", last: %"PRId64")",
+ p_sys->frame->pts, p_sys->i_last_pts );
+ return NULL;
+ }
+ else
+ {
+ p_sys->i_last_pts = p_sys->frame->pts;
+ }
+ }
+
+ p_sys->frame->quality = p_sys->i_quality;
+
+#if (LIBAVCODEC_VERSION_MAJOR < 54)
+ i_out = avcodec_encode_video( p_sys->p_context, p_block->p_buffer, p_block->i_buffer, p_sys->frame );
+#else
+ i_out = avcodec_encode_video2( p_sys->p_context, &av_pkt, p_sys->frame, &i_got_packet );
+#endif
}
else
{
- frame.pts = (int64_t)AV_NOPTS_VALUE;
+#if (LIBAVCODEC_VERSION_MAJOR < 54)
+ i_out = avcodec_encode_video( p_sys->p_context, p_block->p_buffer, p_block->i_buffer, NULL);
+#else
+ i_out = avcodec_encode_video2( p_sys->p_context, &av_pkt, NULL, &i_got_packet );
+#endif
}
- if ( frame.pts != (int64_t)AV_NOPTS_VALUE && frame.pts != 0 )
+ if( unlikely( i_out < 0 || i_got_packet == 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;
- }
+ block_Release( p_block );
+ return NULL;
}
- 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 */
+#if (LIBAVCODEC_VERSION_MAJOR < 54)
+ p_block->i_buffer = i_out;
- i_out = avcodec_encode_video( p_sys->p_context, p_sys->p_buffer_out,
- p_sys->i_buffer_out, &frame );
+ /* 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( i_out > 0 )
+ 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 );
-
- /* 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;
+ /* 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->max_b_frames || !p_sys->p_context->delay )
+ 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 )
{
- /* No delay -> output pts == input pts */
- p_block->i_pts = p_block->i_dts = p_pict->date;
+ 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 */
+ if( p_sys->i_last_ref_pts )
{
- 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_dts = p_sys->i_last_ref_pts;
}
- /* 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 )
+ else
{
+ /* Let's put something sensible */
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
- {
- /* Buggy libavcodec which doesn't update coded_frame->pts
- * correctly */
- p_block->i_dts = p_block->i_pts = p_pict->date;
+ 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;
+ }
+#else
+ p_block->i_buffer = av_pkt.size;
- 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_block->i_length = av_pkt.duration / p_sys->p_context->time_base.den;
+
+ p_block->i_pts = av_pkt.pts;
+ p_block->i_dts = av_pkt.dts;
+ if( unlikely( av_pkt.flags & AV_PKT_FLAG_CORRUPT ) )
+ p_block->i_flags |= BLOCK_FLAG_CORRUPTED;
+#endif
- return p_block;
+ switch ( p_sys->p_context->coded_frame->pict_type )
+ {
+ case AV_PICTURE_TYPE_I:
+ case AV_PICTURE_TYPE_SI:
+ p_block->i_flags |= BLOCK_FLAG_TYPE_I;
+ break;
+ case AV_PICTURE_TYPE_P:
+ case AV_PICTURE_TYPE_SP:
+ p_block->i_flags |= BLOCK_FLAG_TYPE_P;
+ break;
+ case AV_PICTURE_TYPE_B:
+ case AV_PICTURE_TYPE_BI:
+ p_block->i_flags |= BLOCK_FLAG_TYPE_B;
+ break;
+ default:
+ p_block->i_flags |= BLOCK_FLAG_TYPE_PB;
}
- 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;
+ int got_packet,i_out;
+ size_t buffer_delay = 0, i_samples_left = 0;
+
+ //i_bytes_left is amount of bytes we get
+ i_samples_left = p_aout_buf ? p_aout_buf->i_nb_samples : 0;
+ buffer_delay = p_sys->i_samples_delay * p_sys->i_sample_bytes * p_enc->fmt_in.audio.i_channels;
+
+ //p_sys->i_buffer_out = p_sys->i_frame_size * chan * p_sys->i_sample_bytes
+ //Calculate how many bytes we would need from current buffer to fill frame
+ size_t leftover_samples = __MAX(0,__MIN((ssize_t)i_samples_left, (ssize_t)(p_sys->i_frame_size - p_sys->i_samples_delay)));
+
+ // Check if we have enough samples in delay_buffer and current p_aout_buf to fill frame
+ // Or if we are cleaning up
+ if( ( buffer_delay > 0 ) &&
+ ( ( p_aout_buf && ( leftover_samples <= p_aout_buf->i_nb_samples ) &&
+ ( (leftover_samples + p_sys->i_samples_delay ) >= p_sys->i_frame_size )
+ ) ||
+ ( !p_aout_buf )
+ )
+ )
+ {
+ //How much we need to copy from new packet
+ const int leftover = leftover_samples * p_enc->fmt_in.audio.i_channels * p_sys->i_sample_bytes;
- 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;
+#if LIBAVUTIL_VERSION_CHECK( 51,27,2,46,100 )
+ const int align = 0;
+#else
+ const int align = 1;
+#endif
- p_sys->i_pts = p_aout_buf->start_date -
- (mtime_t)1000000 * (mtime_t)p_sys->i_samples_delay /
- (mtime_t)p_enc->fmt_in.audio.i_rate;
+ AVPacket packet = {0};
+ avcodec_get_frame_defaults( p_sys->frame );
+ p_sys->frame->format = p_sys->p_context->sample_fmt;
+ p_sys->frame->pts = date_Get( &p_sys->buffer_date );
+ p_sys->frame->nb_samples = leftover_samples + p_sys->i_samples_delay;
+ date_Increment( &p_sys->buffer_date, p_sys->i_frame_size );
- p_sys->i_samples_delay += i_samples;
+ if( likely( p_aout_buf ) )
+ {
+ p_aout_buf->i_nb_samples -= leftover_samples;
+ memcpy( p_sys->p_buffer+buffer_delay, p_aout_buf->p_buffer, leftover );
- while( p_sys->i_samples_delay >= p_sys->p_context->frame_size )
- {
- int16_t *p_samples;
- int i_out;
+ // We need to deinterleave from p_aout_buf to p_buffer the leftover bytes
+ if( p_sys->b_planar )
+ aout_Deinterleave( p_sys->p_interleave_buf, p_sys->p_buffer,
+ p_sys->i_frame_size, p_enc->fmt_in.audio.i_channels, p_enc->fmt_in.i_codec );
+ else
+ memcpy( p_sys->p_buffer + buffer_delay, p_aout_buf->p_buffer, leftover);
- if( i_samples_delay )
+ p_aout_buf->p_buffer += leftover;
+ p_aout_buf->i_buffer -= leftover;
+ p_aout_buf->i_pts = date_Get( &p_sys->buffer_date );
+ }
+ if(unlikely( ( (leftover + buffer_delay) < p_sys->i_buffer_out ) &&
+ !(p_sys->p_codec->capabilities & CODEC_CAP_SMALL_LAST_FRAME ))
+ )
{
- /* Take care of the left-over from last time */
- int i_delay_size = i_samples_delay * 2 *
- p_sys->p_context->channels;
- int i_size = p_sys->i_frame_size - i_delay_size;
-
- p_samples = (int16_t *)p_sys->p_buffer;
- memcpy( p_sys->p_buffer + i_delay_size, p_buffer, i_size );
- p_buffer -= i_delay_size;
- i_samples += i_samples_delay;
- i_samples_delay = 0;
+ msg_Dbg( p_enc, "No small last frame support, padding");
+ size_t padding_size = p_sys->i_buffer_out - (leftover+buffer_delay);
+ memset( p_sys->p_buffer + (leftover+buffer_delay), 0, padding_size );
+ buffer_delay += padding_size;
}
- else
+ if( avcodec_fill_audio_frame( p_sys->frame, p_enc->fmt_in.audio.i_channels,
+ p_sys->p_context->sample_fmt, p_sys->b_planar ? p_sys->p_interleave_buf : p_sys->p_buffer,
+ leftover + buffer_delay,
+ align) < 0 )
+ msg_Err( p_enc, "filling error on fillup" );
+
+ buffer_delay = 0;
+ p_sys->i_samples_delay = 0;
+
+ 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, p_sys->frame, &got_packet );
+
+ if( unlikely( !got_packet || ( i_out < 0 ) || !packet.size ) )
{
- p_samples = (int16_t *)p_buffer;
+ if( i_out < 0 )
+ {
+ msg_Err( p_enc,"Encoding problem..");
+ return p_chain;
+ }
+ block_Release( p_block );
+ return NULL;
}
- i_out = avcodec_encode_audio( p_sys->p_context, p_sys->p_buffer_out,
- p_sys->i_buffer_out, p_samples );
+ p_block->i_buffer = packet.size;
+ p_block->i_length = (mtime_t)1000000 *
+ (mtime_t)p_sys->frame->nb_samples /
+ (mtime_t)p_sys->p_context->sample_rate;
+
+ p_block->i_dts = p_block->i_pts = packet.pts;
+
+ block_ChainAppend( &p_chain, p_block );
+ }
-#if 0
- msg_Warn( p_enc, "avcodec_encode_audio: %d", i_out );
+ if( unlikely( !p_aout_buf ) )
+ {
+ msg_Dbg(p_enc,"Flushing..");
+ do {
+ AVPacket packet = {0};
+ 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 >= 0 && got_packet )
+ block_ChainAppend( &p_chain, p_block );
+ } while( got_packet && (i_out>=0) );
+ return p_chain;
+ }
+
+
+ while( ( p_aout_buf->i_nb_samples >= p_sys->i_frame_size ) ||
+ ( p_sys->b_variable && p_aout_buf->i_nb_samples ) )
+ {
+ AVPacket packet = {0};
+#if LIBAVUTIL_VERSION_CHECK( 51,27,2,46,100 )
+ const int align = 0;
+#else
+ const int align = 1;
#endif
- if( i_out < 0 ) break;
- p_buffer += p_sys->i_frame_size;
- p_sys->i_samples_delay -= p_sys->p_context->frame_size;
- i_samples -= p_sys->p_context->frame_size;
+ if( unlikely( p_aout_buf->i_pts > VLC_TS_INVALID &&
+ p_aout_buf->i_pts != date_Get( &p_sys->buffer_date ) ) )
+ date_Set( &p_sys->buffer_date, p_aout_buf->i_pts );
- if( i_out == 0 ) continue;
+ avcodec_get_frame_defaults( p_sys->frame );
+ if( p_sys->b_variable )
+ p_sys->frame->nb_samples = p_aout_buf->i_nb_samples;
+ else
+ p_sys->frame->nb_samples = p_sys->i_frame_size;
+ p_sys->frame->format = p_sys->p_context->sample_fmt;
+ p_sys->frame->pts = date_Get( &p_sys->buffer_date );
- p_block = block_New( p_enc, i_out );
- memcpy( p_block->p_buffer, p_sys->p_buffer_out, i_out );
+ if( p_sys->b_planar )
+ {
+ aout_Deinterleave( p_sys->p_buffer, p_aout_buf->p_buffer,
+ p_sys->frame->nb_samples, p_enc->fmt_in.audio.i_channels, p_enc->fmt_in.i_codec );
+
+ }
+
+ if( avcodec_fill_audio_frame( p_sys->frame, p_enc->fmt_in.audio.i_channels,
+ p_sys->p_context->sample_fmt,
+ p_sys->b_planar ? p_sys->p_buffer : p_aout_buf->p_buffer,
+ __MIN(p_sys->i_buffer_out, p_aout_buf->i_buffer),
+ align) < 0 )
+ msg_Err( p_enc, "filling error on encode" );
+
+ p_aout_buf->p_buffer += (p_sys->frame->nb_samples * p_enc->fmt_in.audio.i_channels * p_sys->i_sample_bytes);
+ p_aout_buf->i_buffer -= (p_sys->frame->nb_samples * p_enc->fmt_in.audio.i_channels * p_sys->i_sample_bytes);
+ p_aout_buf->i_nb_samples -= p_sys->frame->nb_samples;
+ date_Increment( &p_sys->buffer_date, p_sys->frame->nb_samples );
+
+
+ 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, p_sys->frame, &got_packet );
+ p_block->i_buffer = packet.size;
+
+ 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->i_buffer = packet.size;
p_block->i_length = (mtime_t)1000000 *
- (mtime_t)p_sys->p_context->frame_size /
+ (mtime_t)p_sys->frame->nb_samples /
(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 );
}
- /* 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( p_aout_buf->i_nb_samples > 0 )
{
- memcpy( p_sys->p_buffer + i_samples_delay * 2 *
- p_sys->p_context->channels, p_buffer,
- i_samples * 2 * p_sys->p_context->channels );
+ memcpy( p_sys->p_buffer + buffer_delay, p_aout_buf->p_buffer,
+ p_aout_buf->i_nb_samples * p_sys->i_sample_bytes * p_enc->fmt_in.audio.i_channels);
+ p_sys->i_samples_delay += p_aout_buf->i_nb_samples;
}
return p_chain;
}
/*****************************************************************************
- * CloseEncoder: ffmpeg encoder destruction
+ * CloseEncoder: libavcodec encoder destruction
*****************************************************************************/
void CloseEncoder( vlc_object_t *p_this )
{
encoder_t *p_enc = (encoder_t *)p_this;
encoder_sys_t *p_sys = p_enc->p_sys;
- if ( p_sys->b_inited && p_enc->i_threads >= 1 )
- {
- int i;
- struct thread_context_t ** pp_contexts =
- (struct thread_context_t **)p_sys->p_context->thread_opaque;
- for ( i = 0; i < p_enc->i_threads; i++ )
- {
- 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_release( pp_contexts[i] );
- }
-
- free( pp_contexts );
- }
+ /*FIXME: we should use avcodec_free_frame, but we don't require so new avcodec that has it*/
+ av_freep( &p_sys->frame );
- vlc_mutex_lock( &avcodec_lock );
+ vlc_avcodec_lock();
avcodec_close( p_sys->p_context );
- vlc_mutex_unlock( &avcodec_lock );
+ vlc_avcodec_unlock();
av_free( p_sys->p_context );
+
+ free( p_sys->p_interleave_buf );
free( p_sys->p_buffer );
- free( p_sys->p_buffer_out );
free( p_sys );
}
projects / vlc / blobdiff