/*****************************************************************************
- * transcode.c
+ * transcode.c: transcoding stream output module
*****************************************************************************
- * Copyright (C) 2001, 2002 VideoLAN
- * $Id: transcode.c,v 1.52 2003/11/21 15:32:08 fenrir Exp $
+ * Copyright (C) 2003-2004 VideoLAN
+ * $Id$
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
* Gildas Bazin <gbazin@netcourrier.com>
# include <avcodec.h>
#endif
+#if LIBAVCODEC_BUILD < 4704
+# define AV_NOPTS_VALUE 0
+#endif
+
/*****************************************************************************
* Exported prototypes
*****************************************************************************/
static int transcode_video_ffmpeg_getframebuf( struct AVCodecContext *, AVFrame *);
+static int EncoderThread( struct sout_stream_sys_t * p_sys );
+
static int pi_channels_maps[6] =
{
0,
* Module descriptor
*****************************************************************************/
vlc_module_begin();
- set_description( _("Transcode stream") );
+ set_description( _("Transcode stream output") );
set_capability( "sout stream", 50 );
add_shortcut( "transcode" );
set_callbacks( Open, Close );
vlc_module_end();
+#define PICTURE_RING_SIZE 64
+
struct sout_stream_sys_t
{
- sout_stream_t *p_out;
+ VLC_COMMON_MEMBERS
+
+ sout_stream_t * p_out;
+ sout_stream_id_t * id_video;
+ sout_buffer_t * p_buffers;
+ vlc_mutex_t lock_out;
+ vlc_cond_t cond;
+ picture_t * pp_pics[PICTURE_RING_SIZE];
+ int i_first_pic, i_last_pic;
vlc_fourcc_t i_acodec; /* codec audio (0 if not transcode) */
int i_sample_rate;
vlc_fourcc_t i_vcodec; /* " video " " " " */
int i_vbitrate;
int i_vtolerance;
+ double f_scale;
int i_width;
int i_height;
int i_b_frames;
int i_qmax;
vlc_bool_t i_hq;
vlc_bool_t b_deinterlace;
+ vlc_bool_t b_interlace;
+ vlc_bool_t b_strict_rc;
+ vlc_bool_t b_pre_me;
+ vlc_bool_t b_hurry_up;
+ int i_rc_buffer_size;
+ float f_rc_buffer_aggressivity;
+ float f_i_quant_factor;
+ int i_noise_reduction;
+ vlc_bool_t b_mpeg4_matrix;
+ int i_threads;
+ vlc_bool_t b_trellis;
int i_crop_top;
int i_crop_bottom;
sout_stream_sys_t *p_sys;
char *codec;
- p_sys = malloc( sizeof( sout_stream_sys_t ) );
+ p_sys = vlc_object_create( p_this, sizeof( sout_stream_sys_t ) );
p_sys->p_out = sout_stream_new( p_stream->p_sout, p_stream->psz_next );
- p_sys->i_acodec = 0;
- p_sys->i_sample_rate = 0;
- p_sys->i_channels = 0;
- p_sys->i_abitrate = 0;
-
- p_sys->i_vcodec = 0;
- p_sys->i_vbitrate = 0;
+ p_sys->f_scale = 1;
p_sys->i_vtolerance = -1;
- p_sys->i_width = 0;
- p_sys->i_height = 0;
p_sys->i_key_int = -1;
- p_sys->i_b_frames = 0;
p_sys->i_qmin = 2;
p_sys->i_qmax = 31;
+ p_sys->f_i_quant_factor = 0.0;
#if LIBAVCODEC_BUILD >= 4673
p_sys->i_hq = FF_MB_DECISION_SIMPLE;
#else
p_sys->i_hq = VLC_FALSE;
#endif
- p_sys->b_deinterlace= VLC_FALSE;
-
- p_sys->i_crop_top = 0;
- p_sys->i_crop_bottom= 0;
- p_sys->i_crop_right = 0;
- p_sys->i_crop_left = 0;
+ p_sys->i_rc_buffer_size = 224*1024*8 * 3/2;
+ p_sys->f_rc_buffer_aggressivity = 0.1;
+ p_sys->i_threads = 0;
+ p_sys->b_trellis = 0;
if( ( codec = sout_cfg_find_value( p_stream->p_cfg, "acodec" ) ) )
{
char fcc[4] = " ";
char *val;
- memcpy( fcc, codec, strlen( codec ) );
+ memcpy( fcc, codec, __MIN( strlen( codec ), 4 ) );
p_sys->i_acodec = VLC_FOURCC( fcc[0], fcc[1], fcc[2], fcc[3] );
msg_Dbg( p_stream, "codec audio=%4.4s %dHz %d channels %dKb/s", fcc,
p_sys->i_sample_rate, p_sys->i_channels,
- p_sys->i_abitrate / 1024 );
+ p_sys->i_abitrate / 1000 );
}
if( ( codec = sout_cfg_find_value( p_stream->p_cfg, "vcodec" ) ) )
char fcc[4] = " ";
char *val;
- memcpy( fcc, codec, strlen( codec ) );
+ memcpy( fcc, codec, __MIN( strlen( codec ), 4 ) );
p_sys->i_vcodec = VLC_FOURCC( fcc[0], fcc[1], fcc[2], fcc[3] );
+ if( ( val = sout_cfg_find_value( p_stream->p_cfg, "scale" ) ) )
+ {
+ p_sys->f_scale = atof( val );
+ }
if( ( val = sout_cfg_find_value( p_stream->p_cfg, "width" ) ) )
{
p_sys->i_width = atoi( val );
{
p_sys->b_deinterlace = VLC_TRUE;
}
+ if( sout_cfg_find( p_stream->p_cfg, "interlace" ) )
+ {
+ p_sys->b_interlace = VLC_TRUE;
+ }
+ if( sout_cfg_find( p_stream->p_cfg, "strict_rc" ) )
+ {
+ p_sys->b_strict_rc = VLC_TRUE;
+ }
+ if( sout_cfg_find( p_stream->p_cfg, "pre_me" ) )
+ {
+ p_sys->b_pre_me = VLC_TRUE;
+ }
+ if( sout_cfg_find( p_stream->p_cfg, "hurry_up" ) )
+ {
+ p_sys->b_hurry_up = VLC_TRUE;
+ /* hurry up mode needs noise reduction, even small */
+ p_sys->i_noise_reduction = 1;
+ }
+ if( ( val = sout_cfg_find_value( p_stream->p_cfg, "rc_buffer_size" ) ) )
+ {
+ p_sys->i_rc_buffer_size = atoi( val );
+ }
+ if( ( val = sout_cfg_find_value( p_stream->p_cfg, "rc_buffer_aggressivity" ) ) )
+ {
+ p_sys->f_rc_buffer_aggressivity = atof( val );
+ }
+ if( ( val = sout_cfg_find_value( p_stream->p_cfg, "i_quant_factor" ) ) )
+ {
+ p_sys->f_i_quant_factor = atof( val );
+ }
+ if( ( val = sout_cfg_find_value( p_stream->p_cfg, "noise_reduction" ) ) )
+ {
+ p_sys->i_noise_reduction = atoi( val );
+ }
+ if( ( val = sout_cfg_find_value( p_stream->p_cfg, "mpeg4_matrix" ) ) )
+ {
+ p_sys->b_mpeg4_matrix = VLC_TRUE;
+ }
/* crop */
if( ( val = sout_cfg_find_value( p_stream->p_cfg, "croptop" ) ) )
{
{
p_sys->i_qmax = atoi( val );
}
+ if( ( val = sout_cfg_find_value( p_stream->p_cfg, "threads" ) ) )
+ {
+ p_sys->i_threads = atoi( val );
+ }
+ if( sout_cfg_find( p_stream->p_cfg, "trellis" ) )
+ {
+ p_sys->b_trellis = VLC_TRUE;
+ }
- msg_Dbg( p_stream, "codec video=%4.4s %dx%d %dkb/s",
- fcc,
- p_sys->i_width, p_sys->i_height,
- p_sys->i_vbitrate / 1024 );
+ msg_Dbg( p_stream, "codec video=%4.4s %dx%d scaling: %f %dkb/s",
+ fcc, p_sys->i_width, p_sys->i_height, p_sys->f_scale,
+ p_sys->i_vbitrate / 1000 );
}
if( !p_sys->p_out )
free( p_sys );
return VLC_EGENERIC;
}
+
p_stream->pf_add = Add;
p_stream->pf_del = Del;
p_stream->pf_send = Send;
-
p_stream->p_sys = p_sys;
avcodec_init();
sout_stream_sys_t *p_sys = p_stream->p_sys;
sout_stream_delete( p_sys->p_out );
- free( p_sys );
+ vlc_object_destroy( p_sys );
}
struct sout_stream_id_t
memcpy( &id->f_src, p_fmt, sizeof( es_format_t ) );
/* create dst format */
- id->f_dst.i_cat = AUDIO_ES;
- id->f_dst.i_codec = p_sys->i_acodec;
+ es_format_Init( &id->f_dst, AUDIO_ES, p_sys->i_acodec );
+ id->f_dst.i_id = id->f_src.i_id;
+ id->f_dst.i_group = id->f_src.i_group;
+ if( id->f_src.psz_language ) id->f_dst.psz_language = strdup( id->f_src.psz_language );
id->f_dst.audio.i_rate = p_sys->i_sample_rate > 0 ? p_sys->i_sample_rate : id->f_src.audio.i_rate;
id->f_dst.audio.i_channels = p_sys->i_channels > 0 ? p_sys->i_channels : id->f_src.audio.i_channels;
id->f_dst.i_bitrate = p_sys->i_abitrate > 0 ? p_sys->i_abitrate : 64000;
memcpy( &id->f_src, p_fmt, sizeof( es_format_t ) );
/* create dst format */
- id->f_dst.i_cat = VIDEO_ES;
- id->f_dst.i_codec = p_sys->i_vcodec;
- id->f_dst.video.i_width = p_sys->i_width ; /* > 0 ? p_sys->i_width : id->f_src.i_width; */
- id->f_dst.video.i_height= p_sys->i_height; /* > 0 ? p_sys->i_height: id->f_src.i_height; */
+ es_format_Init( &id->f_dst, VIDEO_ES, p_sys->i_vcodec );
+ id->f_dst.i_id = id->f_src.i_id;
+ id->f_dst.i_group = id->f_src.i_group;
+ if( id->f_src.psz_language ) id->f_dst.psz_language = strdup( id->f_src.psz_language );
+ id->f_dst.video.i_width = p_sys->i_width;
+ id->f_dst.video.i_height= p_sys->i_height;
id->f_dst.i_bitrate = p_sys->i_vbitrate > 0 ? p_sys->i_vbitrate : 800*1000;
id->f_dst.i_extra = 0;
id->f_dst.p_extra = NULL;
sout_buffer_t *p_buffer_out;
if( id->f_src.i_cat == AUDIO_ES )
{
- transcode_audio_ffmpeg_process( p_stream, id, p_buffer, &p_buffer_out );
+ transcode_audio_ffmpeg_process( p_stream, id, p_buffer,
+ &p_buffer_out );
}
else if( id->f_src.i_cat == VIDEO_ES )
{
- transcode_video_ffmpeg_process( p_stream, id, p_buffer, &p_buffer_out );
+ if( transcode_video_ffmpeg_process( p_stream, id, p_buffer,
+ &p_buffer_out ) != VLC_SUCCESS )
+ {
+ sout_BufferDelete( p_stream->p_sout, p_buffer );
+ return VLC_EGENERIC;
+ }
}
sout_BufferDelete( p_stream->p_sout, p_buffer );
{ VLC_FOURCC( 'R', 'V', '2', '4' ), CODEC_ID_RAWVIDEO },
{ VLC_FOURCC( 'R', 'V', '3', '2' ), CODEC_ID_RAWVIDEO },
{ VLC_FOURCC( 'Y', 'U', 'Y', '2' ), CODEC_ID_RAWVIDEO },
+ { VLC_FOURCC( 'Y', 'V', '1', '2' ), CODEC_ID_RAWVIDEO },
+ { VLC_FOURCC( 'I', 'Y', 'U', 'V' ), CODEC_ID_RAWVIDEO },
{ VLC_FOURCC( 0, 0, 0, 0 ), 0 }
};
{
switch( i_chroma )
{
+ case VLC_FOURCC( 'Y', 'V', '1', '2' ):
+ case VLC_FOURCC( 'I', 'Y', 'U', 'V' ):
case VLC_FOURCC( 'I', '4', '2', '0' ):
return PIX_FMT_YUV420P;
case VLC_FOURCC( 'I', '4', '2', '2' ):
case VLC_FOURCC( 'R', 'V', '1', '6' ):
return PIX_FMT_RGB565;
case VLC_FOURCC( 'R', 'V', '2', '4' ):
- return PIX_FMT_RGB24;
+ return PIX_FMT_BGR24;
case VLC_FOURCC( 'R', 'V', '3', '2' ):
return PIX_FMT_RGBA32;
case VLC_FOURCC( 'G', 'R', 'E', 'Y' ):
id->p_encoder->fmt_out.i_bitrate = id->f_dst.i_bitrate;
id->p_encoder->p_module =
- module_Need( id->p_encoder, "encoder", NULL );
+ module_Need( id->p_encoder, "encoder", NULL, 0 );
if( !id->p_encoder->p_module )
{
vlc_object_destroy( id->p_encoder );
i_buffer -= i_used;
p_buffer += i_used;
+
+ if ( id->i_buffer_pos < 0 )
+ {
+ msg_Warn( p_stream, "weird error audio decoding");
+ break;
+ }
}
else
{
int16_t *sin = (int16_t*)p_buffer;
int i_used = __MIN( id->i_buffer, i_buffer );
int i_samples = i_used / 2;
- int b_invert_indianness;
- if( id->f_src.i_codec == VLC_FOURCC( 's', '1', '6', 'l' ) )
-#ifdef WORDS_BIGENDIAN
- b_invert_indianness = 1;
-#else
- b_invert_indianness = 0;
-#endif
- else
+ /* first copy */
+ memcpy( sout, sin, i_used );
+
#ifdef WORDS_BIGENDIAN
- b_invert_indianness = 0;
+ if( id->f_src.i_codec == VLC_FOURCC( 's', '1', '6', 'l' ) )
#else
- b_invert_indianness = 1;
+ if( id->f_src.i_codec == VLC_FOURCC( 's', '1', '6', 'b' ) )
#endif
-
- if( b_invert_indianness )
{
+ uint8_t *dat = (uint8_t*)sout;
+
while( i_samples > 0 )
{
- uint8_t tmp[2];
+ uint8_t tmp;
+ tmp = dat[0];
+ dat[0] = dat[1];
+ dat[1] = tmp;
+
+ dat += 2;
- tmp[1] = *sin++;
- tmp[0] = *sin++;
- *sout++ = *(int16_t*)tmp;
i_samples--;
}
}
- else
- {
- memcpy( sout, sin, i_used );
- sout += i_samples;
- }
i_buffer -= i_used;
p_buffer += i_used;
id->i_dts += ( I64C(1000000) * id->i_buffer_pos / 2 /
id->f_src.audio.i_channels / id->f_src.audio.i_rate );
+ if( id->f_src.audio.i_channels !=
+ id->p_encoder->fmt_in.audio.i_channels )
+ {
+ unsigned int i;
+ int j;
+
+ /* This is for liba52 which is what ffmpeg uses to decode ac3 */
+ static const int translation[7][6] =
+ {{ 0, 0, 0, 0, 0, 0 }, /* 0 channels (rarely used) */
+ { 0, 0, 0, 0, 0, 0 }, /* 1 ch */
+ { 0, 1, 0, 0, 0, 0 }, /* 2 */
+ { 1, 2, 0, 0, 0, 0 }, /* 3 */
+ { 1, 3, 2, 0, 0, 0 }, /* 4 */
+ { 1, 3, 4, 2, 0, 0 }, /* 5 */
+ { 1, 3, 4, 5, 2, 0 }}; /* 6 */
+
+ /* dumb downmixing */
+ for( i = 0; i < aout_buf.i_nb_samples; i++ )
+ {
+ uint16_t *p_buffer = (uint16_t *)aout_buf.p_buffer;
+ for( j = 0 ; j < id->p_encoder->fmt_in.audio.i_channels; j++ )
+ {
+ p_buffer[i*id->p_encoder->fmt_in.audio.i_channels+j] =
+ p_buffer[i*id->f_src.audio.i_channels+
+ translation[id->f_src.audio.i_channels][j]];
+ }
+ }
+ aout_buf.i_nb_bytes = i*id->p_encoder->fmt_in.audio.i_channels * 2;
+ }
+
p_block = id->p_encoder->pf_encode_audio( id->p_encoder, &aout_buf );
while( p_block )
{
if( id->f_src.i_codec == VLC_FOURCC( 'I', '4', '2', '0' ) ||
id->f_src.i_codec == VLC_FOURCC( 'I', '4', '2', '2' ) ||
id->f_src.i_codec == VLC_FOURCC( 'I', '4', '4', '4' ) ||
+ id->f_src.i_codec == VLC_FOURCC( 'Y', 'V', '1', '2' ) ||
id->f_src.i_codec == VLC_FOURCC( 'Y', 'U', 'Y', '2' ) ||
+ id->f_src.i_codec == VLC_FOURCC( 'I', 'Y', 'U', 'V' ) ||
id->f_src.i_codec == VLC_FOURCC( 'R', 'V', '1', '5' ) ||
id->f_src.i_codec == VLC_FOURCC( 'R', 'V', '1', '6' ) ||
id->f_src.i_codec == VLC_FOURCC( 'R', 'V', '2', '4' ) ||
id->ff_dec_c->width = id->f_src.video.i_width;
id->ff_dec_c->height = id->f_src.video.i_height;
id->ff_dec_c->pix_fmt = get_ff_chroma( id->f_src.i_codec );
+
+#if LIBAVCODEC_BUILD >= 4687
+ if( id->ff_dec_c->width )
+ id->ff_dec_c->sample_aspect_ratio =
+ av_d2q( id->f_src.video.i_aspect / (double)VOUT_ASPECT_FACTOR *
+ id->ff_dec_c->height / id->ff_dec_c->width, 255 );
+#else
+ id->ff_dec_c->aspect_ratio =
+ id->f_src.video.i_aspect / (float)VOUT_ASPECT_FACTOR;
+#endif
}
else
{
id->ff_dec_c = avcodec_alloc_context();
id->ff_dec_c->width = id->f_src.video.i_width;
id->ff_dec_c->height = id->f_src.video.i_height;
+ id->ff_dec_c->bits_per_sample=id->f_src.video.i_bits_per_pixel;
/* id->ff_dec_c->bit_rate = id->f_src.i_bitrate; */
- id->ff_dec_c->extradata_size= id->f_src.i_extra;
- id->ff_dec_c->extradata = id->f_src.p_extra;
+
+ if( id->f_src.i_extra > 0 )
+ {
+ if( i_ff_codec == CODEC_ID_SVQ3 )
+ {
+ int i_size = id->f_src.i_extra;
+ uint8_t *p;
+
+ id->ff_dec_c->extradata_size = i_size + 12;
+ p = id->ff_dec_c->extradata = malloc( i_size + 12 );
+
+ memcpy( &p[0], "SVQ3", 4 );
+ memset( &p[4], 0, 8 );
+ memcpy( &p[12], id->f_src.p_extra, i_size );
+
+ /* Now remove all atoms before the SMI one */
+ if( id->ff_dec_c->extradata_size > 0x5a && strncmp( &p[0x56], "SMI ", 4 ) )
+ {
+ uint8_t *psz = &p[0x52];
+
+ while( psz < &p[id->ff_dec_c->extradata_size - 8] )
+ {
+ int i_size = GetDWBE( psz );
+ if( i_size <= 1 )
+ {
+ /* FIXME handle 1 as long size */
+ break;
+ }
+ if( !strncmp( &psz[4], "SMI ", 4 ) )
+ {
+ memmove( &p[0x52], psz, &p[id->ff_dec_c->extradata_size] - psz );
+ break;
+ }
+ psz += i_size;
+ }
+ }
+ }
+ else
+ {
+ id->ff_dec_c->extradata_size= id->f_src.i_extra;
+ id->ff_dec_c->extradata = malloc( id->f_src.i_extra + FF_INPUT_BUFFER_PADDING_SIZE );
+
+ memcpy( id->ff_dec_c->extradata, id->f_src.p_extra, id->f_src.i_extra );
+ memset( (uint8_t*)id->ff_dec_c->extradata + id->f_src.i_extra, 0, FF_INPUT_BUFFER_PADDING_SIZE );
+ }
+ }
id->ff_dec_c->workaround_bugs = FF_BUG_AUTODETECT;
id->ff_dec_c->error_resilience= -1;
id->ff_dec_c->get_buffer = transcode_video_ffmpeg_getframebuf;
msg_Err( p_stream, "cannot open decoder" );
return VLC_EGENERIC;
}
-
+#if 0
if( i_ff_codec == CODEC_ID_MPEG4 && id->ff_dec_c->extradata_size > 0 )
{
int b_gotpicture;
id->ff_dec_c->extradata_size );
free( p_vol );
}
+#endif
}
/* Open encoder */
/* Initialization of encoder format structures */
es_format_Init( &id->p_encoder->fmt_in,
- id->f_src.i_cat, get_vlc_chroma(id->ff_dec_c->pix_fmt) );
+ id->f_src.i_cat, get_vlc_chroma(id->ff_dec_c->pix_fmt) );
- id->p_encoder->fmt_in.video.i_width = id->f_dst.video.i_width;
- id->p_encoder->fmt_in.video.i_height = id->f_dst.video.i_height;
-
- if( id->p_encoder->fmt_in.video.i_width <= 0 )
- {
- id->p_encoder->fmt_in.video.i_width = id->f_dst.video.i_width =
- id->ff_dec_c->width - p_sys->i_crop_left - p_sys->i_crop_right;
- }
- if( id->p_encoder->fmt_in.video.i_height <= 0 )
- {
- id->p_encoder->fmt_in.video.i_height = id->f_dst.video.i_height =
- id->ff_dec_c->height - p_sys->i_crop_top - p_sys->i_crop_bottom;
- }
+ /* The dimensions will be set properly later on.
+ * Just put sensible values so we can test if there is an encoder. */
+ id->p_encoder->fmt_in.video.i_width = 16;
+ id->p_encoder->fmt_in.video.i_height = 16;
id->p_encoder->fmt_in.video.i_frame_rate = 25; /* FIXME as it break mpeg */
id->p_encoder->fmt_in.video.i_frame_rate_base= 1;
#endif
#if LIBAVCODEC_BUILD >= 4687
+ if( id->ff_dec_c->height )
id->p_encoder->fmt_in.video.i_aspect = VOUT_ASPECT_FACTOR *
( av_q2d(id->ff_dec_c->sample_aspect_ratio) *
id->ff_dec_c->width / id->ff_dec_c->height );
id->p_encoder->fmt_in.video.i_aspect = VOUT_ASPECT_FACTOR *
id->ff_dec_c->aspect_ratio;
#endif
+ }
+ /* Check whether a particular aspect ratio was requested */
+ if( id->f_src.video.i_aspect )
+ {
+ id->p_encoder->fmt_in.video.i_aspect = id->f_src.video.i_aspect;
+ id->f_dst.video.i_aspect = id->f_src.video.i_aspect;
}
id->p_encoder->fmt_out = id->p_encoder->fmt_in;
id->p_encoder->i_qmin = p_sys->i_qmin;
id->p_encoder->i_qmax = p_sys->i_qmax;
id->p_encoder->i_hq = p_sys->i_hq;
+ id->p_encoder->b_strict_rc = p_sys->b_strict_rc;
+ id->p_encoder->b_pre_me = p_sys->b_pre_me;
+ id->p_encoder->b_hurry_up = p_sys->b_hurry_up;
+ id->p_encoder->b_interlace = p_sys->b_interlace;
+ id->p_encoder->i_rc_buffer_size = p_sys->i_rc_buffer_size;
+ id->p_encoder->f_rc_buffer_aggressivity = p_sys->f_rc_buffer_aggressivity;
+ id->p_encoder->f_i_quant_factor = p_sys->f_i_quant_factor;
+ id->p_encoder->i_noise_reduction = p_sys->i_noise_reduction;
+ id->p_encoder->b_mpeg4_matrix = p_sys->b_mpeg4_matrix;
+ id->p_encoder->i_threads = p_sys->i_threads;
+ id->p_encoder->b_trellis = p_sys->b_trellis;
id->p_ff_pic = avcodec_alloc_frame();
id->p_ff_pic_tmp0 = NULL;
id->p_vresample = NULL;
id->p_encoder->p_module =
- module_Need( id->p_encoder, "encoder", NULL );
+ module_Need( id->p_encoder, "encoder", NULL, 0 );
if( !id->p_encoder->p_module )
{
/* Close the encoder.
* We'll open it only when we have the first frame */
module_Unneed( id->p_encoder, id->p_encoder->p_module );
+ id->p_encoder->p_module = NULL;
id->b_enc_inited = VLC_FALSE;
+ if ( p_sys->i_threads >= 1 )
+ {
+ p_sys->id_video = id;
+ vlc_mutex_init( p_stream, &p_sys->lock_out );
+ vlc_cond_init( p_stream, &p_sys->cond );
+ memset( p_sys->pp_pics, 0, sizeof(p_sys->pp_pics) );
+ p_sys->i_first_pic = 0;
+ p_sys->i_last_pic = 0;
+ p_sys->p_buffers = NULL;
+ p_sys->b_die = p_sys->b_error = 0;
+ if( vlc_thread_create( p_sys, "encoder", EncoderThread,
+ VLC_THREAD_PRIORITY_VIDEO, VLC_FALSE ) )
+ {
+ vlc_object_destroy( id->p_encoder );
+ msg_Err( p_stream, "cannot spawn encoder thread" );
+ return VLC_EGENERIC;
+ }
+ }
+
return VLC_SUCCESS;
}
static void transcode_video_ffmpeg_close ( sout_stream_t *p_stream,
sout_stream_id_t *id )
{
+ if ( p_stream->p_sys->i_threads >= 1 )
+ {
+ vlc_mutex_lock( &p_stream->p_sys->lock_out );
+ p_stream->p_sys->b_die = 1;
+ vlc_cond_signal( &p_stream->p_sys->cond );
+ vlc_mutex_unlock( &p_stream->p_sys->lock_out );
+ vlc_thread_join( p_stream->p_sys );
+ vlc_mutex_destroy( &p_stream->p_sys->lock_out );
+ vlc_cond_destroy( &p_stream->p_sys->cond );
+ }
+
/* Close decoder */
if( id->ff_dec )
{
}
/* Close encoder */
- module_Unneed( id->p_encoder, id->p_encoder->p_module );
+ if( id->p_encoder->p_module )
+ module_Unneed( id->p_encoder, id->p_encoder->p_module );
vlc_object_destroy( id->p_encoder );
/* Misc cleanup */
}
if( id->p_vresample )
{
- free( id->p_vresample );
+ img_resample_close( id->p_vresample );
}
}
for( ;; )
{
block_t *p_block;
- picture_t pic;
+ picture_t * p_pic;
int i_plane;
/* decode frame */
frame = id->p_ff_pic;
p_sys->i_input_pts = in->i_pts;
- if( id->ff_dec )
+ if( id->ff_dec )
{
i_used = avcodec_decode_video( id->ff_dec_c, frame,
&b_gotpicture,
else
{
/* raw video */
- avpicture_fill( (AVPicture*)frame,
- p_data,
+ avpicture_fill( (AVPicture*)frame, p_data,
id->ff_dec_c->pix_fmt,
id->ff_dec_c->width, id->ff_dec_c->height );
i_used = i_data;
b_gotpicture = 1;
/* Set PTS */
- frame->pts = p_sys->i_input_pts;
+ frame->pts = p_sys->i_input_pts ? p_sys->i_input_pts :
+ AV_NOPTS_VALUE;
}
if( i_used < 0 )
/* Get the pts of the decoded frame if any, otherwise keep the
* interpolated one */
- if( frame->pts > 0 )
+ if( frame->pts != AV_NOPTS_VALUE )
{
p_sys->i_output_pts = frame->pts;
}
if( !id->b_enc_inited )
{
- /* XXX hack because of copy packetizer and mpeg4video that can fail
- * detecting size */
- if( id->p_encoder->fmt_in.video.i_width <= 0 )
+ /* Hack because of the copy packetizer which can fail to detect the
+ * proper size (which forces us to wait until the 1st frame
+ * is decoded) */
+ int i_width = id->ff_dec_c->width - p_sys->i_crop_left -
+ p_sys->i_crop_right;
+ int i_height = id->ff_dec_c->height - p_sys->i_crop_top -
+ p_sys->i_crop_bottom;
+
+ if( id->f_dst.video.i_width <= 0 && id->f_dst.video.i_height <= 0
+ && p_sys->f_scale )
+ {
+ /* Apply the scaling */
+ id->f_dst.video.i_width = i_width * p_sys->f_scale;
+ id->f_dst.video.i_height = i_height * p_sys->f_scale;
+ }
+ else if( id->f_dst.video.i_width > 0 &&
+ id->f_dst.video.i_height <= 0 )
{
- id->p_encoder->fmt_in.video.i_width =
- id->p_encoder->fmt_out.video.i_width = id->f_dst.video.i_width =
- id->ff_dec_c->width - p_sys->i_crop_left -
- p_sys->i_crop_right;
+ id->f_dst.video.i_height =
+ id->f_dst.video.i_width / (double)i_width * i_height;
}
- if( id->p_encoder->fmt_in.video.i_height <= 0 )
+ else if( id->f_dst.video.i_width <= 0 &&
+ id->f_dst.video.i_height > 0 )
{
- id->p_encoder->fmt_in.video.i_height =
- id->p_encoder->fmt_out.video.i_height = id->f_dst.video.i_height =
- id->ff_dec_c->height - p_sys->i_crop_top -
- p_sys->i_crop_bottom;
+ id->f_dst.video.i_width =
+ id->f_dst.video.i_height / (double)i_height * i_width;
}
+ id->p_encoder->fmt_in.video.i_width =
+ id->p_encoder->fmt_out.video.i_width =
+ id->f_dst.video.i_width;
+ id->p_encoder->fmt_in.video.i_height =
+ id->p_encoder->fmt_out.video.i_height =
+ id->f_dst.video.i_height;
+
id->p_encoder->fmt_out.i_extra = 0;
id->p_encoder->fmt_out.p_extra = NULL;
id->p_encoder->p_module =
- module_Need( id->p_encoder, "encoder", NULL );
+ module_Need( id->p_encoder, "encoder", NULL, 0 );
if( !id->p_encoder->p_module )
{
vlc_object_destroy( id->p_encoder );
msg_Err( p_stream, "cannot find encoder" );
+ id->b_transcode = VLC_FALSE;
return VLC_EGENERIC;
}
return VLC_EGENERIC;
}
- while( id->p_encoder->pf_header &&
- (p_block = id->p_encoder->pf_header( id->p_encoder )) )
+ if( id->p_encoder->pf_header )
{
- sout_buffer_t *p_out;
- p_out = sout_BufferNew( p_stream->p_sout, p_block->i_buffer );
- memcpy( p_out->p_buffer, p_block->p_buffer, p_block->i_buffer);
- p_out->i_dts = in->i_dts;
- p_out->i_pts = in->i_dts;
- p_out->i_length = 0;
- sout_BufferChain( out, p_out );
+ p_block = id->p_encoder->pf_header( id->p_encoder );
+ while( p_block )
+ {
+ sout_buffer_t *p_out;
+ block_t *p_prev_block = p_block;
+
+ p_out = sout_BufferNew( p_stream->p_sout,
+ p_block->i_buffer );
+ memcpy( p_out->p_buffer, p_block->p_buffer,
+ p_block->i_buffer);
+ p_out->i_dts = p_out->i_pts = in->i_dts;
+ p_out->i_length = 0;
+ sout_BufferChain( out, p_out );
+
+ p_block = p_block->p_next;
+ block_Release( p_prev_block );
+ }
}
id->i_inter_pixfmt =
id->ff_dec_c->pix_fmt,
id->ff_dec_c->width, id->ff_dec_c->height );
+#if LIBAVCODEC_BUILD >= 4685
+ id->p_ff_pic_tmp0->interlaced_frame = 0;
+#endif
+ id->p_ff_pic_tmp0->repeat_pict = frame->repeat_pict;
frame = id->p_ff_pic_tmp0;
}
(AVPicture*)frame, id->ff_dec_c->pix_fmt,
id->ff_dec_c->width, id->ff_dec_c->height );
+ id->p_ff_pic_tmp1->repeat_pict = frame->repeat_pict;
+#if LIBAVCODEC_BUILD >= 4685
+ id->p_ff_pic_tmp1->interlaced_frame = frame->interlaced_frame;
+ id->p_ff_pic_tmp1->top_field_first = frame->top_field_first;
+#endif
frame = id->p_ff_pic_tmp1;
}
if( id->ff_dec_c->width != id->f_dst.video.i_width ||
id->ff_dec_c->height != id->f_dst.video.i_height ||
p_sys->i_crop_top > 0 || p_sys->i_crop_bottom > 0 ||
- p_sys->i_crop_left > 0 || p_sys->i_crop_right )
+ p_sys->i_crop_left > 0 || p_sys->i_crop_right > 0 )
{
if( id->p_ff_pic_tmp2 == NULL )
{
img_resample( id->p_vresample, (AVPicture*)id->p_ff_pic_tmp2,
(AVPicture*)frame );
+ id->p_ff_pic_tmp2->repeat_pict = frame->repeat_pict;
+#if LIBAVCODEC_BUILD >= 4685
+ id->p_ff_pic_tmp2->interlaced_frame = frame->interlaced_frame;
+ id->p_ff_pic_tmp2->top_field_first = frame->top_field_first;
+#endif
frame = id->p_ff_pic_tmp2;
}
/* Encoding */
- vout_InitPicture( VLC_OBJECT(p_stream), &pic,
+ p_pic = malloc(sizeof(picture_t));
+ vout_InitPicture( VLC_OBJECT(p_stream), p_pic,
id->p_encoder->fmt_in.i_codec,
id->f_dst.video.i_width, id->f_dst.video.i_height,
id->f_dst.video.i_width * VOUT_ASPECT_FACTOR /
id->f_dst.video.i_height );
- for( i_plane = 0; i_plane < pic.i_planes; i_plane++ )
+ for( i_plane = 0; i_plane < p_pic->i_planes; i_plane++ )
{
- pic.p[i_plane].p_pixels = frame->data[i_plane];
- pic.p[i_plane].i_pitch = frame->linesize[i_plane];
+ p_pic->p[i_plane].i_pitch = frame->linesize[i_plane];
+ if ( p_sys->i_threads >= 1 )
+ {
+ p_pic->p[i_plane].p_pixels = malloc(p_pic->p[i_plane].i_lines *
+ p_pic->p[i_plane].i_pitch);
+ p_stream->p_vlc->pf_memcpy( p_pic->p[i_plane].p_pixels,
+ frame->data[i_plane], p_pic->p[i_plane].i_lines *
+ p_pic->p[i_plane].i_pitch );
+ }
+ else
+ {
+ p_pic->p[i_plane].p_pixels = frame->data[i_plane];
+ }
}
/* Set the pts of the frame being encoded */
- pic.date = p_sys->i_output_pts;
+ p_pic->date = p_sys->i_output_pts;
+
+ p_pic->i_nb_fields = frame->repeat_pict;
+#if LIBAVCODEC_BUILD >= 4685
+ p_pic->b_progressive = !frame->interlaced_frame;
+ p_pic->b_top_field_first = frame->top_field_first;
+#endif
/* Interpolate the next PTS
* (needed by the mpeg video packetizer which can send pts <= 0 ) */
id->ff_dec_c->frame_rate_base / (2 * id->ff_dec_c->frame_rate);
}
- p_block = id->p_encoder->pf_encode_video( id->p_encoder, &pic );
+ if ( p_sys->i_threads >= 1 )
+ {
+ vlc_mutex_lock( &p_sys->lock_out );
+ p_sys->pp_pics[p_sys->i_last_pic++] = p_pic;
+ p_sys->i_last_pic %= PICTURE_RING_SIZE;
+ *out = p_sys->p_buffers;
+ p_sys->p_buffers = NULL;
+ vlc_cond_signal( &p_sys->cond );
+ vlc_mutex_unlock( &p_sys->lock_out );
+ }
+ else
+ {
+ block_t *p_block;
+ p_block = id->p_encoder->pf_encode_video( id->p_encoder, p_pic );
+ while( p_block )
+ {
+ sout_buffer_t *p_out;
+ block_t *p_prev_block = p_block;
+
+ p_out = sout_BufferNew( p_stream->p_sout, p_block->i_buffer );
+ memcpy( p_out->p_buffer, p_block->p_buffer, p_block->i_buffer);
+ p_out->i_dts = p_block->i_dts;
+ p_out->i_pts = p_block->i_pts;
+ p_out->i_length = p_block->i_length;
+ p_out->i_flags =
+ (p_block->i_flags << SOUT_BUFFER_FLAGS_BLOCK_SHIFT)
+ & SOUT_BUFFER_FLAGS_BLOCK_MASK;
+ sout_BufferChain( out, p_out );
+
+ p_block = p_block->p_next;
+ block_Release( p_prev_block );
+ }
+ free( p_pic );
+ }
+
+ if( i_data <= 0 )
+ {
+ return VLC_SUCCESS;
+ }
+ }
+
+ return VLC_SUCCESS;
+}
+
+static int EncoderThread( sout_stream_sys_t * p_sys )
+{
+ sout_stream_t * p_stream = p_sys->p_out;
+ sout_stream_id_t * id = p_sys->id_video;
+ picture_t * p_pic;
+ int i_plane;
+ sout_buffer_t * p_buffer;
+
+ while ( !p_sys->b_die && !p_sys->b_error )
+ {
+ block_t *p_block;
+
+ vlc_mutex_lock( &p_sys->lock_out );
+ while ( p_sys->i_last_pic == p_sys->i_first_pic )
+ {
+ vlc_cond_wait( &p_sys->cond, &p_sys->lock_out );
+ if ( p_sys->b_die || p_sys->b_error )
+ break;
+ }
+ if ( p_sys->b_die || p_sys->b_error )
+ {
+ vlc_mutex_unlock( &p_sys->lock_out );
+ break;
+ }
+
+ p_pic = p_sys->pp_pics[p_sys->i_first_pic++];
+ p_sys->i_first_pic %= PICTURE_RING_SIZE;
+ vlc_mutex_unlock( &p_sys->lock_out );
+
+ p_block = id->p_encoder->pf_encode_video( id->p_encoder, p_pic );
+ vlc_mutex_lock( &p_sys->lock_out );
while( p_block )
{
sout_buffer_t *p_out;
p_out->i_dts = p_block->i_dts;
p_out->i_pts = p_block->i_pts;
p_out->i_length = p_block->i_length;
- sout_BufferChain( out, p_out );
+ p_out->i_flags =
+ (p_block->i_flags << SOUT_BUFFER_FLAGS_BLOCK_SHIFT)
+ & SOUT_BUFFER_FLAGS_BLOCK_MASK;
+ sout_BufferChain( &p_sys->p_buffers, p_out );
p_block = p_block->p_next;
block_Release( p_prev_block );
}
+ vlc_mutex_unlock( &p_sys->lock_out );
- if( i_data <= 0 )
+ for( i_plane = 0; i_plane < p_pic->i_planes; i_plane++ )
{
- return VLC_SUCCESS;
+ free( p_pic->p[i_plane].p_pixels );
}
+ free( p_pic );
}
- return VLC_SUCCESS;
+ while ( p_sys->i_last_pic != p_sys->i_first_pic )
+ {
+ p_pic = p_sys->pp_pics[p_sys->i_first_pic++];
+ p_sys->i_first_pic %= PICTURE_RING_SIZE;
+
+ for( i_plane = 0; i_plane < p_pic->i_planes; i_plane++ )
+ {
+ free( p_pic->p[i_plane].p_pixels );
+ }
+ free( p_pic );
+ }
+
+ p_buffer = p_sys->p_buffers;
+ while ( p_buffer != NULL )
+ {
+ sout_buffer_t * p_next = p_buffer->p_next;
+ sout_BufferDelete( p_stream->p_sout, p_buffer );
+ p_buffer = p_next;
+ }
+
+ return 0;
}
/*****************************************************************************
sout_stream_sys_t *p_sys = (sout_stream_sys_t *)p_context->opaque;
/* Set PTS */
- p_frame->pts = p_sys->i_input_pts;
+ p_frame->pts = p_sys->i_input_pts ? p_sys->i_input_pts : AV_NOPTS_VALUE;
return avcodec_default_get_buffer( p_context, p_frame );
}
projects / vlc / blobdiff