# include "config.h"
#endif
+#include <math.h>
+
#include <vlc_common.h>
#include <vlc_aout.h>
#include <vlc_sout.h>
#include <vlc_cpu.h>
#include <libavcodec/avcodec.h>
+#include <libavutil/audioconvert.h>
#include "avcodec.h"
#include "avcommon.h"
mtime_t i_pts;
date_t buffer_date;
+ /* Multichannel (>2) channel reordering */
+ uint8_t i_channels_to_reorder;
+ uint8_t pi_reorder_layout[AOUT_CHAN_MAX];
+
/* Encoding settings */
int i_key_int;
int i_b_frames;
AVFrame *frame;
};
+
+/* Taken from audio.c*/
+static const uint64_t pi_channels_map[][2] =
+{
+ { AV_CH_FRONT_LEFT, AOUT_CHAN_LEFT },
+ { AV_CH_FRONT_RIGHT, AOUT_CHAN_RIGHT },
+ { AV_CH_FRONT_CENTER, AOUT_CHAN_CENTER },
+ { AV_CH_LOW_FREQUENCY, AOUT_CHAN_LFE },
+ { AV_CH_BACK_LEFT, AOUT_CHAN_REARLEFT },
+ { AV_CH_BACK_RIGHT, AOUT_CHAN_REARRIGHT },
+ { AV_CH_FRONT_LEFT_OF_CENTER, 0 },
+ { AV_CH_FRONT_RIGHT_OF_CENTER, 0 },
+ { AV_CH_BACK_CENTER, AOUT_CHAN_REARCENTER },
+ { AV_CH_SIDE_LEFT, AOUT_CHAN_MIDDLELEFT },
+ { AV_CH_SIDE_RIGHT, AOUT_CHAN_MIDDLERIGHT },
+ { AV_CH_TOP_CENTER, 0 },
+ { AV_CH_TOP_FRONT_LEFT, 0 },
+ { AV_CH_TOP_FRONT_CENTER, 0 },
+ { AV_CH_TOP_FRONT_RIGHT, 0 },
+ { AV_CH_TOP_BACK_LEFT, 0 },
+ { AV_CH_TOP_BACK_CENTER, 0 },
+ { AV_CH_TOP_BACK_RIGHT, 0 },
+ { AV_CH_STEREO_LEFT, 0 },
+ { AV_CH_STEREO_RIGHT, 0 },
+};
+
+static const uint32_t channel_mask[][2] = {
+ {0,0},
+ {AOUT_CHAN_CENTER, AV_CH_LAYOUT_MONO},
+ {AOUT_CHANS_STEREO, AV_CH_LAYOUT_STEREO},
+ {AOUT_CHANS_2_1, AV_CH_LAYOUT_2POINT1},
+ {AOUT_CHANS_4_0, AV_CH_LAYOUT_4POINT0},
+ {AOUT_CHANS_4_1, AV_CH_LAYOUT_4POINT1},
+ {AOUT_CHANS_5_1, AV_CH_LAYOUT_5POINT1_BACK},
+ {AOUT_CHANS_7_0, AV_CH_LAYOUT_7POINT0},
+ {AOUT_CHANS_7_1, AV_CH_LAYOUT_7POINT1},
+ {AOUT_CHANS_8_1, AV_CH_LAYOUT_OCTAGONAL},
+};
+
static const char *const ppsz_enc_options[] = {
"keyint", "bframes", "vt", "qmin", "qmax", "codec", "hq",
"rc-buffer-size", "rc-buffer-aggressivity", "pre-me", "hurry-up",
23, 24, 25, 27, 28, 30, 31, 33,
};
-#if LIBAVUTIL_VERSION_CHECK( 51, 27, 2, 46, 100 )
static const int DEFAULT_ALIGN = 0;
-#else
-static const int DEFAULT_ALIGN = 1;
-#endif
/*****************************************************************************
char *psz_val;
/* Initialization must be done before avcodec_find_encoder() */
- vlc_init_avcodec();
+ vlc_init_avcodec(p_this);
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 )
+ if( p_enc->fmt_out.i_codec == VLC_CODEC_MP1V )
{
i_cat = VIDEO_ES;
i_codec_id = AV_CODEC_ID_MPEG1VIDEO;
psz_namecodec = "Raw video";
}
+ if( i_cat == UNKNOWN_ES )
+ return VLC_EGENERIC;
+
if( p_enc->fmt_out.i_cat == VIDEO_ES && i_cat != VIDEO_ES )
{
msg_Err( p_enc, "\"%s\" is not a video encoder", psz_namecodec );
p_sys->i_buffer_out = 0;
p_context = avcodec_alloc_context3(p_codec);
+ if( unlikely(p_context == NULL) )
+ {
+ free( p_sys );
+ return VLC_ENOMEM;
+ }
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 */
-#if LIBAVUTIL_VERSION_CHECK(51, 25, 0, 42, 100)
- 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_vtolerance = var_GetInteger( p_enc, ENC_CFG_PREFIX "vt" ) * 1000;
f_val = var_GetFloat( p_enc, ENC_CFG_PREFIX "qscale" );
p_sys->i_quality = 0;
- if( f_val < 0.01 || f_val > 255.0 )
- f_val = 0;
+ if( f_val < .01f || f_val > 255.f )
+ f_val = 0.f;
else
- p_sys->i_quality = (int)(FF_QP2LAMBDA * f_val + 0.5);
+ p_sys->i_quality = lroundf(FF_QP2LAMBDA * f_val);
psz_val = var_GetString( p_enc, ENC_CFG_PREFIX "hq" );
p_sys->i_hq = FF_MB_DECISION_RD;
p_sys->i_aac_profile = FF_PROFILE_AAC_MAIN;
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( psz_val, "ssr", 3 ) )
p_sys->i_aac_profile = FF_PROFILE_AAC_SSR;
-#endif
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 )
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;
+ else if( !strncmp( psz_val, "ld", 2 ) )
+ p_sys->i_aac_profile = FF_PROFILE_AAC_LD;
+ else if( !strncmp( psz_val, "eld", 3 ) )
+ p_sys->i_aac_profile = FF_PROFILE_AAC_ELD;
#endif
else
{
{
msg_Warn( p_enc, "invalid size %ix%i", p_enc->fmt_in.video.i_visible_width,
p_enc->fmt_in.video.i_visible_height );
+ avcodec_free_context( &p_context );
free( p_sys );
return VLC_EGENERIC;
}
p_enc->fmt_in.i_codec = VLC_CODEC_I420;
+
+ /* Very few application support YUV in TIFF, not even VLC */
+ if( p_enc->fmt_out.i_codec == VLC_CODEC_TIFF )
+ p_enc->fmt_in.i_codec = VLC_CODEC_RGB24;
+
p_enc->fmt_in.video.i_chroma = p_enc->fmt_in.i_codec;
GetFfmpegChroma( &p_context->pix_fmt, &p_enc->fmt_in.video );
}
- if ( p_sys->f_i_quant_factor != 0.0 )
+ if ( p_sys->f_i_quant_factor != 0.f )
p_context->i_quant_factor = p_sys->f_i_quant_factor;
p_context->noise_reduction = p_sys->i_noise_reduction;
/* 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 )
+ if( GetVlcAudioFormat( p_context->sample_fmt ) != p_enc->fmt_in.i_codec
+ && p_codec->sample_fmts )
{
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++ )
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 )
+ if( p_sys->b_planar && p_codec->sample_fmts )
{
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++ )
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 );
+ p_context->channel_layout = channel_mask[p_context->channels][1];
+
+ /* Setup Channel ordering for multichannel audio
+ * as VLC channel order isn't same as libavcodec expects
+ */
+
+ p_sys->i_channels_to_reorder = 0;
+
+ /* Specified order
+ * Copied from audio.c
+ */
+ const unsigned i_order_max = 8 * sizeof(p_context->channel_layout);
+ uint32_t pi_order_dst[AOUT_CHAN_MAX] = { };
+ int i_channels_src = 0;
+
+ if( p_context->channel_layout )
+ {
+ msg_Dbg( p_enc, "Creating channel order for reordering");
+ for( unsigned i = 0; i < sizeof(pi_channels_map)/sizeof(*pi_channels_map); i++ )
+ {
+ if( p_context->channel_layout & pi_channels_map[i][0] )
+ {
+ msg_Dbg( p_enc, "%d %"PRIx64" mapped to %"PRIx64"", i_channels_src, pi_channels_map[i][0], pi_channels_map[i][1]);
+ pi_order_dst[i_channels_src++] = pi_channels_map[i][1];
+ }
+ }
+ }
+ else
+ {
+ msg_Dbg( p_enc, "Creating default channel order for reordering");
+ /* Create default order */
+ for( unsigned int i = 0; i < __MIN( i_order_max, (unsigned)p_sys->p_context->channels ); i++ )
+ {
+ if( i < sizeof(pi_channels_map)/sizeof(*pi_channels_map) )
+ {
+ msg_Dbg( p_enc, "%d channel is %"PRIx64"", i_channels_src, pi_channels_map[i][1]);
+ pi_order_dst[i_channels_src++] = pi_channels_map[i][1];
+ }
+ }
+ }
+ if( i_channels_src != p_context->channels )
+ msg_Err( p_enc, "Channel layout not understood" );
+
+ p_sys->i_channels_to_reorder = aout_CheckChannelReorder( NULL, pi_order_dst,
+ channel_mask[p_context->channels][0], p_sys->pi_reorder_layout );
#endif
if ( p_enc->fmt_out.i_codec == VLC_CODEC_MP4A )
p_sys->i_buffer_out = av_samples_get_buffer_size(NULL,
p_sys->p_context->channels, p_sys->i_frame_size,
p_sys->p_context->sample_fmt, DEFAULT_ALIGN);
- p_sys->p_buffer = malloc( p_sys->i_buffer_out );
+ p_sys->p_buffer = av_malloc( p_sys->i_buffer_out );
if ( unlikely( p_sys->p_buffer == NULL ) )
{
goto error;
}
+ p_enc->fmt_out.audio.i_frame_length = p_context->frame_size;
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
if( p_sys->b_planar )
{
- p_sys->p_interleave_buf = malloc( p_sys->i_buffer_out );
+ p_sys->p_interleave_buf = av_malloc( p_sys->i_buffer_out );
if( unlikely( p_sys->p_interleave_buf == NULL ) )
goto error;
}
goto error;
}
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->p_interleave_buf );
+ av_free( p_sys->p_buffer );
+ av_free( p_sys->p_interleave_buf );
+ avcodec_free_context( &p_context );
free( p_sys );
return VLC_ENOMEM;
}
+typedef struct
+{
+ block_t self;
+ AVPacket packet;
+} vlc_av_packet_t;
+
+static void vlc_av_packet_Release(block_t *block)
+{
+ vlc_av_packet_t *b = (void *) block;
+
+ av_free_packet(&b->packet);
+ free(b);
+}
+
+static block_t *vlc_av_packet_Wrap(AVPacket *packet, mtime_t i_length)
+{
+ vlc_av_packet_t *b = malloc( sizeof( *b ) );
+ if( unlikely(b == NULL) )
+ return NULL;
+
+ block_t *p_block = &b->self;
+
+ block_Init( p_block, packet->data, packet->size );
+ p_block->i_nb_samples = 0;
+ p_block->pf_release = vlc_av_packet_Release;
+ b->packet = *packet;
+
+ p_block->i_length = i_length;
+ p_block->i_pts = packet->pts;
+ p_block->i_dts = packet->dts;
+ if( unlikely( packet->flags & AV_PKT_FLAG_CORRUPT ) )
+ p_block->i_flags |= BLOCK_FLAG_CORRUPTED;
+
+ return p_block;
+}
+
/****************************************************************************
* EncodeVideo: the whole thing
****************************************************************************/
{
encoder_sys_t *p_sys = p_enc->p_sys;
int 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 );
- if( unlikely(p_block == NULL) )
- return NULL;
AVFrame *frame = NULL;
if( likely(p_pict) ) {
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 : AV_NOPTS_VALUE;
+ frame->pts = (p_pict->date == VLC_TS_INVALID) ? AV_NOPTS_VALUE : p_pict->date;
if ( p_sys->b_hurry_up && frame->pts != AV_NOPTS_VALUE )
{
}
}
- if ( frame->pts != AV_NOPTS_VALUE && frame->pts != 0 )
+ if ( ( frame->pts != AV_NOPTS_VALUE ) && ( frame->pts != VLC_TS_INVALID ) )
{
if ( p_sys->i_last_pts == frame->pts )
{
frame->quality = p_sys->i_quality;
}
-#if (LIBAVCODEC_VERSION_MAJOR >= 54)
AVPacket av_pkt;
+ av_pkt.data = NULL;
+ av_pkt.size = 0;
int is_data;
av_init_packet( &av_pkt );
- av_pkt.data = p_block->p_buffer;
- av_pkt.size = p_block->i_buffer;
if( avcodec_encode_video2( p_sys->p_context, &av_pkt, frame, &is_data ) < 0
|| is_data == 0 )
{
- block_Release( p_block );
return NULL;
}
- p_block->i_buffer = av_pkt.size;
- 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;
-
-#else
- int i_out = avcodec_encode_video( p_sys->p_context, p_block->p_buffer,
- p_block->i_buffer, frame );
- if( i_out <= 0 )
+ block_t *p_block = vlc_av_packet_Wrap( &av_pkt,
+ av_pkt.duration / p_sys->p_context->time_base.den );
+ if( unlikely(p_block == NULL) )
{
- block_Release( p_block );
+ av_free_packet( &av_pkt );
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 != 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 )
- {
- 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;
- }
-#endif
-
switch ( p_sys->p_context->coded_frame->pict_type )
{
case AV_PICTURE_TYPE_I:
}
p_block->i_buffer = packet.size;
- p_block->i_length = (mtime_t)1000000 *
+ p_block->i_length = (mtime_t)CLOCK_FREQ *
(mtime_t)p_sys->i_frame_size /
(mtime_t)p_sys->p_context->sample_rate;
p_sys->frame->pts = date_Get( &p_sys->buffer_date );
+
if( likely( p_sys->frame->pts != AV_NOPTS_VALUE) )
date_Increment( &p_sys->buffer_date, p_sys->frame->nb_samples );
//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)));
- if( ( p_aout_buf && ( p_aout_buf->i_pts > VLC_TS_INVALID ) &&
- ((p_aout_buf->i_pts - p_sys->i_samples_delay) != date_Get( &p_sys->buffer_date ) ) ) )
+ if( p_aout_buf && ( p_aout_buf->i_pts > VLC_TS_INVALID ) )
{
- date_Set( &p_sys->buffer_date, p_aout_buf->i_dts );
+ date_Set( &p_sys->buffer_date, p_aout_buf->i_pts );
/* take back amount we have leftover from previous buffer*/
if( p_sys->i_samples_delay > 0 )
date_Decrement( &p_sys->buffer_date, p_sys->i_samples_delay );
}
+ /* Handle reordering here so we have p_sys->p_buffer always in correct
+ * order already */
+ if( p_aout_buf && p_sys->i_channels_to_reorder > 0 )
+ {
+ aout_ChannelReorder( p_aout_buf->p_buffer, p_aout_buf->i_buffer,
+ p_sys->i_channels_to_reorder, p_sys->pi_reorder_layout,
+ p_enc->fmt_in.i_codec );
+ }
// Check if we have enough samples in delay_buffer and current p_aout_buf to fill frame
// Or if we are cleaning up
encoder_t *p_enc = (encoder_t *)p_this;
encoder_sys_t *p_sys = p_enc->p_sys;
- /*FIXME: we should use avcodec_free_frame, but we don't require so new avcodec that has it*/
- av_freep( &p_sys->frame );
+#if (LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(54, 28, 0))
+ avcodec_free_frame( &p_sys->frame );
+#else
+ av_free( p_sys->frame );
+ p_sys->frame = NULL;
+#endif
vlc_avcodec_lock();
avcodec_close( p_sys->p_context );
vlc_avcodec_unlock();
- av_free( p_sys->p_context );
+ avcodec_free_context( &p_sys->p_context );
- free( p_sys->p_interleave_buf );
- free( p_sys->p_buffer );
+ av_free( p_sys->p_interleave_buf );
+ av_free( p_sys->p_buffer );
free( p_sys );
}
projects / vlc / blobdiff