* transcode.c
*****************************************************************************
* Copyright (C) 2001, 2002 VideoLAN
- * $Id: transcode.c,v 1.33 2003/10/03 18:17:55 gbazin Exp $
+ * $Id: transcode.c,v 1.49 2003/11/05 18:59:01 gbazin Exp $
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
+ * Gildas Bazin <gbazin@netcourrier.com>
*
* 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
#include <vlc/vlc.h>
#include <vlc/input.h>
#include <vlc/sout.h>
+#include <vlc/vout.h>
+#include <vlc/decoder.h>
/* ffmpeg header */
#ifdef HAVE_FFMPEG_AVCODEC_H
# include <avcodec.h>
#endif
-/* vorbis header */
-#ifdef HAVE_VORBIS_VORBISENC_H
-# include <vorbis/vorbisenc.h>
-# ifndef OV_ECTL_RATEMANAGE_AVG
-# define OV_ECTL_RATEMANAGE_AVG 0x0
-# endif
-#endif
-
/*****************************************************************************
* Exported prototypes
*****************************************************************************/
static int transcode_video_ffmpeg_getframebuf( struct AVCodecContext *, AVFrame *);
+static int pi_channels_maps[6] =
+{
+ 0,
+ AOUT_CHAN_CENTER, AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT,
+ AOUT_CHAN_CENTER | AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT,
+ AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_REARLEFT
+ | AOUT_CHAN_REARRIGHT,
+ AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_CENTER
+ | AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT
+};
+
/*****************************************************************************
* Module descriptor
*****************************************************************************/
mtime_t i_input_pts;
mtime_t i_output_pts;
- mtime_t i_last_ref_pts;
-
- mtime_t i_buggy_pts_detect;
};
/*****************************************************************************
/*****************************************************************************
* Close:
*****************************************************************************/
-
static void Close( vlc_object_t * p_this )
{
sout_stream_t *p_stream = (sout_stream_t*)p_this;
vlc_fourcc_t b_transcode;
sout_format_t f_src; /* only if transcoding */
sout_format_t f_dst; /* " " " */
+ unsigned int i_inter_pixfmt; /* intermediary format when transcoding */
/* id of the out stream */
void *id;
+ /* Encoder */
+ encoder_t *p_encoder;
+ vlc_fourcc_t b_enc_inited;
+
/* ffmpeg part */
AVCodec *ff_dec;
AVCodecContext *ff_dec_c;
-
- vlc_fourcc_t b_enc_inited;
- AVCodec *ff_enc;
- AVCodecContext *ff_enc_c;
-
mtime_t i_dts;
mtime_t i_length;
- int i_buffer_in;
- int i_buffer_in_pos;
- uint8_t *p_buffer_in;
-
int i_buffer;
int i_buffer_pos;
uint8_t *p_buffer;
- int i_buffer_out;
- int i_buffer_out_pos;
- uint8_t *p_buffer_out;
-
AVFrame *p_ff_pic;
AVFrame *p_ff_pic_tmp0; /* to do deinterlace */
AVFrame *p_ff_pic_tmp1; /* to do pix conversion */
AVFrame *p_ff_pic_tmp2; /* to do resample */
ImgReSampleContext *p_vresample;
-
-#ifdef HAVE_VORBIS_VORBISENC_H
-
- /* Vorbis part */
- vorbis_info *p_vi;
- vorbis_dsp_state *p_vd;
- vorbis_block *p_vb;
- vorbis_comment *p_vc;
- int i_last_block_size;
- int i_samples_delay;
- vlc_bool_t b_headers_sent;
-#endif
};
id = malloc( sizeof( sout_stream_id_t ) );
id->i_dts = 0;
id->id = NULL;
+ id->p_encoder = NULL;
+
if( p_fmt->i_cat == AUDIO_ES && p_sys->i_acodec != 0 )
{
msg_Dbg( p_stream,
/* audio */
{ VLC_FOURCC( 'm', 'p', 'g', 'a' ), CODEC_ID_MP2 },
{ VLC_FOURCC( 'm', 'p', '3', ' ' ), CODEC_ID_MP3LAME },
+ { VLC_FOURCC( 'm', 'p', '4', 'a' ), CODEC_ID_AAC },
{ VLC_FOURCC( 'a', '5', '2', ' ' ), CODEC_ID_AC3 },
{ VLC_FOURCC( 'a', 'c', '3', ' ' ), CODEC_ID_AC3 },
{ VLC_FOURCC( 'w', 'm', 'a', '1' ), CODEC_ID_WMAV1 },
}
}
- /* find encoder */
- id->i_buffer_in = 2 * AVCODEC_MAX_AUDIO_FRAME_SIZE;
- id->i_buffer_in_pos = 0;
- id->p_buffer_in = malloc( id->i_buffer_in );
-
id->i_buffer = 2 * AVCODEC_MAX_AUDIO_FRAME_SIZE;
id->i_buffer_pos = 0;
id->p_buffer = malloc( id->i_buffer );
- id->i_buffer_out = 2 * AVCODEC_MAX_AUDIO_FRAME_SIZE;
- id->i_buffer_out_pos = 0;
- id->p_buffer_out = malloc( id->i_buffer_out );
-
/* Sanity check for audio channels */
id->f_dst.i_channels = __MIN( id->f_dst.i_channels, id->f_src.i_channels );
-#ifdef HAVE_VORBIS_VORBISENC_H
- if( id->f_dst.i_fourcc == VLC_FOURCC('v','o','r','b') )
- {
- id->p_vi = (vorbis_info *)malloc( sizeof(vorbis_info) );
- id->p_vd = (vorbis_dsp_state *)malloc( sizeof(vorbis_dsp_state) );
- id->p_vb = (vorbis_block *)malloc( sizeof(vorbis_block) );
- id->p_vc = (vorbis_comment *)malloc( sizeof(vorbis_comment) );
-
- vorbis_info_init( id->p_vi );
-
- if( vorbis_encode_setup_managed( id->p_vi, id->f_dst.i_channels,
- id->f_dst.i_sample_rate, -1, id->f_dst.i_bitrate, -1 ) ||
- vorbis_encode_ctl( id->p_vi, OV_ECTL_RATEMANAGE_AVG, NULL ) ||
- vorbis_encode_setup_init( id->p_vi ) ){}
-
- /* add a comment */
- vorbis_comment_init( id->p_vc);
- vorbis_comment_add_tag( id->p_vc, "ENCODER", "VLC media player");
-
- /* set up the analysis state and auxiliary encoding storage */
- vorbis_analysis_init( id->p_vd, id->p_vi );
- vorbis_block_init( id->p_vd, id->p_vb );
-
- id->b_headers_sent = VLC_FALSE;
- id->i_last_block_size = 0;
- id->i_samples_delay = 0;
-
- return VLC_SUCCESS;
- }
-#endif
-
- i_ff_codec = get_ff_codec( id->f_dst.i_fourcc );
- if( i_ff_codec == 0 )
+ /* find encoder */
+ id->p_encoder = vlc_object_create( p_stream, VLC_OBJECT_ENCODER );
+ id->p_encoder->i_fourcc = id->f_dst.i_fourcc;
+ id->p_encoder->format.audio.i_format = AOUT_FMT_S16_NE;
+ id->p_encoder->format.audio.i_rate = id->f_dst.i_sample_rate;
+ id->p_encoder->format.audio.i_physical_channels =
+ id->p_encoder->format.audio.i_original_channels =
+ pi_channels_maps[id->f_dst.i_channels];
+ id->p_encoder->i_bitrate = id->f_dst.i_bitrate;
+ id->p_encoder->i_extra_data = 0;
+ id->p_encoder->p_extra_data = NULL;
+
+ id->p_encoder->p_module =
+ module_Need( id->p_encoder, "audio encoder", NULL );
+ if( !id->p_encoder->p_module )
{
- msg_Err( p_stream, "cannot find encoder id" );
+ vlc_object_destroy( id->p_encoder );
+ msg_Err( p_stream, "cannot open encoder" );
return VLC_EGENERIC;
}
- id->ff_enc = avcodec_find_encoder( i_ff_codec );
- if( !id->ff_enc )
- {
- msg_Err( p_stream, "cannot find encoder (avcodec)" );
- return VLC_EGENERIC;
- }
+ id->b_enc_inited = VLC_FALSE;
+
+ id->f_dst.i_extra_data = id->p_encoder->i_extra_data;
+ id->f_dst.p_extra_data = id->p_encoder->p_extra_data;
/* Hack for mp3 transcoding support */
if( id->f_dst.i_fourcc == VLC_FOURCC( 'm','p','3',' ' ) )
id->f_dst.i_fourcc = VLC_FOURCC( 'm','p','g','a' );
}
- id->ff_enc_c = avcodec_alloc_context();
- id->ff_enc_c->bit_rate = id->f_dst.i_bitrate;
- id->ff_enc_c->sample_rate = id->f_dst.i_sample_rate;
- id->ff_enc_c->channels = id->f_dst.i_channels;
-
- /* Make sure we get extradata filled by the encoder */
- id->ff_enc_c->extradata_size = 0;
- id->ff_enc_c->extradata = NULL;
- id->ff_enc_c->flags |= CODEC_FLAG_GLOBAL_HEADER;
-
- if( avcodec_open( id->ff_enc_c, id->ff_enc ) )
- {
- if( id->ff_enc_c->channels > 2 )
- {
- id->ff_enc_c->channels = 2;
- id->f_dst.i_channels = 2;
- if( avcodec_open( id->ff_enc_c, id->ff_enc ) )
- {
- msg_Err( p_stream, "cannot open encoder" );
- return VLC_EGENERIC;
- }
- msg_Warn( p_stream, "stereo mode selected (codec limitation)" );
- }
- else
- {
- msg_Err( p_stream, "cannot open encoder" );
- return VLC_EGENERIC;
- }
- }
-
- id->f_dst.i_extra_data = id->ff_enc_c->extradata_size;
- id->f_dst.p_extra_data = id->ff_enc_c->extradata;
- id->ff_enc_c->flags &= ~CODEC_FLAG_GLOBAL_HEADER;
-
return VLC_SUCCESS;
}
if( id->ff_dec )
{
avcodec_close( id->ff_dec_c );
+ free( id->ff_dec_c );
}
-#ifdef HAVE_VORBIS_VORBISENC_H
- if( id->f_dst.i_fourcc == VLC_FOURCC('v','o','r','b') )
- {
- vorbis_block_clear( id->p_vb );
- vorbis_dsp_clear( id->p_vd );
- vorbis_comment_clear( id->p_vc );
- vorbis_info_clear( id->p_vi ); /* must be called last */
-
- free( id->p_vi );
- free( id->p_vd );
- free( id->p_vb );
- free( id->p_vc );
- }
- else
-#endif
- avcodec_close( id->ff_enc_c );
+ module_Unneed( id->p_encoder, id->p_encoder->p_module );
+ vlc_object_destroy( id->p_encoder );
- free( id->ff_dec_c );
- if( id->f_dst.i_fourcc != VLC_FOURCC('v','o','r','b') )
- free( id->ff_enc_c );
-
- free( id->p_buffer_in );
free( id->p_buffer );
- free( id->p_buffer_out );
}
static int transcode_audio_ffmpeg_process( sout_stream_t *p_stream,
sout_buffer_t *in,
sout_buffer_t **out )
{
- vlc_bool_t b_again = VLC_FALSE;
-
+ aout_buffer_t aout_buf;
+ block_t *p_block;
+ int i_buffer = in->i_size;
+ char *p_buffer = in->p_buffer;
+ id->i_dts = in->i_dts;
*out = NULL;
- /* gather data into p_buffer_in */
-#ifdef HAVE_VORBIS_VORBISENC_H
- if( id->f_dst.i_fourcc == VLC_FOURCC( 'v', 'o', 'r', 'b' ) )
- id->i_dts = in->i_dts -
- (mtime_t)1000000 * (mtime_t)id->i_samples_delay /
- (mtime_t)id->f_dst.i_sample_rate;
- else
-#endif
- id->i_dts = in->i_dts -
- (mtime_t)1000000 *
- (mtime_t)(id->i_buffer_pos / 2 / id->ff_dec_c->channels )/
- (mtime_t)id->ff_dec_c->sample_rate;
-
- if( id->i_buffer_in_pos + (int)in->i_size > id->i_buffer_in )
- {
- /* extend buffer_in */
- id->i_buffer_in = id->i_buffer_in_pos + in->i_size + 1024;
- id->p_buffer_in = realloc( id->p_buffer_in, id->i_buffer_in );
- }
- memcpy( &id->p_buffer_in[id->i_buffer_in_pos],
- in->p_buffer, in->i_size );
- id->i_buffer_in_pos += in->i_size;
-
- do
+ while( i_buffer )
{
- int i_buffer_pos;
+ id->i_buffer_pos = 0;
/* decode as much data as possible */
if( id->ff_dec )
{
- for( ;; )
- {
- int i_buffer_size;
- int i_used;
-
- i_buffer_size = id->i_buffer - id->i_buffer_pos;
-
- i_used = avcodec_decode_audio( id->ff_dec_c,
- (int16_t*)&id->p_buffer[id->i_buffer_pos],
- &i_buffer_size, id->p_buffer_in,
- id->i_buffer_in_pos );
+ int i_used;
- /* msg_Warn( p_stream, "avcodec_decode_audio: %d used",
- i_used ); */
- id->i_buffer_pos += i_buffer_size;
-
- if( i_used < 0 )
- {
- msg_Warn( p_stream, "error");
- id->i_buffer_in_pos = 0;
- break;
- }
- else if( i_used < id->i_buffer_in_pos )
- {
- memmove( id->p_buffer_in,
- &id->p_buffer_in[i_used],
- id->i_buffer_in - i_used );
- id->i_buffer_in_pos -= i_used;
- }
- else
- {
- id->i_buffer_in_pos = 0;
- break;
- }
+ i_used = avcodec_decode_audio( id->ff_dec_c,
+ (int16_t*)id->p_buffer, &id->i_buffer_pos,
+ p_buffer, i_buffer );
- if( id->i_buffer_pos >= AVCODEC_MAX_AUDIO_FRAME_SIZE )
- {
- /* buffer full */
- b_again = VLC_TRUE;
- break;
- }
+#if 0
+ msg_Warn( p_stream, "avcodec_decode_audio: %d used on %d",
+ i_used, i_buffer );
+#endif
+ if( i_used < 0 )
+ {
+ msg_Warn( p_stream, "error audio decoding");
+ break;
}
+
+ i_buffer -= i_used;
+ p_buffer += i_used;
}
else
{
- int16_t *sout = (int16_t*)&id->p_buffer[id->i_buffer_pos];
- int i_used = 0;
+ int16_t *sout = (int16_t*)id->p_buffer;
- if( id->f_src.i_fourcc == VLC_FOURCC( 's', '8', ' ', ' ' ) )
- {
- int8_t *sin = (int8_t*)id->p_buffer_in;
- int i_samples = __MIN( ( id->i_buffer - id->i_buffer_pos )
- / 2, id->i_buffer_in_pos );
- i_used = i_samples;
- while( i_samples > 0 )
- {
- *sout++ = ( *sin++ ) << 8;
- i_samples--;
- }
- }
- else if( id->f_src.i_fourcc == VLC_FOURCC( 'u', '8', ' ', ' ' ) )
+ if( id->f_src.i_fourcc == VLC_FOURCC( 's', '8', ' ', ' ' ) ||
+ id->f_src.i_fourcc == VLC_FOURCC( 'u', '8', ' ', ' ' ) )
{
- int8_t *sin = (int8_t*)id->p_buffer_in;
- int i_samples = __MIN( ( id->i_buffer - id->i_buffer_pos )
- / 2, id->i_buffer_in_pos );
- i_used = i_samples;
- while( i_samples > 0 )
- {
- *sout++ = ( *sin++ - 128 ) << 8;
- i_samples--;
- }
+ int8_t *sin = (int8_t*)p_buffer;
+ int i_used = __MIN( id->i_buffer/2, i_buffer );
+ int i_samples = i_used;
+
+ if( id->f_src.i_fourcc == VLC_FOURCC( 's', '8', ' ', ' ' ) )
+ while( i_samples > 0 )
+ {
+ *sout++ = ( *sin++ ) << 8;
+ i_samples--;
+ }
+ else
+ while( i_samples > 0 )
+ {
+ *sout++ = ( *sin++ - 128 ) << 8;
+ i_samples--;
+ }
+
+ i_buffer -= i_used;
+ p_buffer += i_used;
+ id->i_buffer_pos = i_used * 2;
}
- else if( id->f_src.i_fourcc == VLC_FOURCC( 's', '1', '6', 'l' ) )
+ else if( id->f_src.i_fourcc == VLC_FOURCC( 's', '1', '6', 'l' ) ||
+ id->f_src.i_fourcc == VLC_FOURCC( 's', '1', '6', 'b' ) )
{
- int i_samples = __MIN( ( id->i_buffer - id->i_buffer_pos )
- / 2, id->i_buffer_in_pos / 2);
-#ifdef WORDS_BIGENDIAN
- uint8_t *sin = (uint8_t*)id->p_buffer_in;
- i_used = i_samples * 2;
- while( i_samples > 0 )
- {
- uint8_t tmp[2];
-
- tmp[1] = *sin++;
- tmp[0] = *sin++;
- *sout++ = *(int16_t*)tmp;
- i_samples--;
- }
+ 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_fourcc == VLC_FOURCC( 's', '1', '6', 'l' ) )
+#ifdef WORDS_BIGENDIAN
+ b_invert_indianness = 1;
#else
- memcpy( sout, id->p_buffer_in, i_samples * 2 );
- sout += i_samples;
- i_used = i_samples * 2;
+ b_invert_indianness = 0;
#endif
- }
- else if( id->f_src.i_fourcc == VLC_FOURCC( 's', '1', '6', 'b' ) )
- {
- int i_samples = __MIN( ( id->i_buffer - id->i_buffer_pos )
- / 2, id->i_buffer_in_pos / 2);
+ else
#ifdef WORDS_BIGENDIAN
- memcpy( sout, id->p_buffer_in, i_samples * 2 );
- sout += i_samples;
- i_used = i_samples * 2;
+ b_invert_indianness = 0;
#else
- uint8_t *sin = (uint8_t*)id->p_buffer_in;
- i_used = i_samples * 2;
- while( i_samples > 0 )
- {
- uint8_t tmp[2];
-
- tmp[1] = *sin++;
- tmp[0] = *sin++;
- *sout++ = *(int16_t*)tmp;
- i_samples--;
- }
+ b_invert_indianness = 1;
#endif
- }
-
- id->i_buffer_pos = (uint8_t*)sout - id->p_buffer;
- if( i_used < id->i_buffer_in_pos )
- {
- memmove( id->p_buffer_in,
- &id->p_buffer_in[i_used],
- id->i_buffer_in - i_used );
- }
- id->i_buffer_in_pos -= i_used;
- }
- i_buffer_pos = id->i_buffer_pos;
-
- /* encode as much data as possible */
-
-#ifdef HAVE_VORBIS_VORBISENC_H
- if( id->i_buffer_pos == 0 );
- else if( id->f_dst.i_fourcc == VLC_FOURCC( 'v', 'o', 'r', 'b' ) )
- {
- float **buffer;
- int i, j, i_samples;
- sout_buffer_t *p_out;
- ogg_packet op;
-
- if( !id->b_headers_sent )
- {
- ogg_packet header[3];
- vorbis_analysis_headerout( id->p_vd, id->p_vc,
- &header[0], &header[1], &header[2]);
- for( i = 0; i < 3; i++ )
+ if( b_invert_indianness )
{
- p_out = sout_BufferNew( p_stream->p_sout, header[i].bytes);
- memcpy( p_out->p_buffer, header[i].packet,
- header[i].bytes );
-
- p_out->i_size = header[i].bytes;
- p_out->i_length = 0;
-
- p_out->i_dts = p_out->i_pts = 0;
+ while( i_samples > 0 )
+ {
+ uint8_t tmp[2];
- sout_BufferChain( out, p_out );
+ tmp[1] = *sin++;
+ tmp[0] = *sin++;
+ *sout++ = *(int16_t*)tmp;
+ i_samples--;
+ }
}
- id->b_headers_sent = VLC_TRUE;
- }
-
- i_samples = id->i_buffer_pos / id->f_src.i_channels / 2;
- id->i_samples_delay += i_samples;
- id->i_buffer_pos = 0;
-
- buffer = vorbis_analysis_buffer( id->p_vd, i_samples );
-
- /* convert samples to float and uninterleave */
- for( i = 0; i < id->f_dst.i_channels; i++ )
- {
- for( j = 0 ; j < i_samples ; j++ )
+ else
{
- buffer[i][j]= ((float)( ((int16_t *)id->p_buffer)
- [j*id->f_src.i_channels + i ] ))/ 32768.f;
+ memcpy( sout, sin, i_used );
+ sout += i_samples;
}
- }
-
- vorbis_analysis_wrote( id->p_vd, i_samples );
-
- while( vorbis_analysis_blockout( id->p_vd, id->p_vb ) == 1 )
- {
- vorbis_analysis( id->p_vb, NULL );
- vorbis_bitrate_addblock( id->p_vb );
-
- while( vorbis_bitrate_flushpacket( id->p_vd, &op ) )
- {
- int i_block_size;
- p_out = sout_BufferNew( p_stream->p_sout, op.bytes );
- memcpy( p_out->p_buffer, op.packet, op.bytes );
-
- i_block_size = vorbis_packet_blocksize( id->p_vi, &op );
- if( i_block_size < 0 ) i_block_size = 0;
- i_samples = ( id->i_last_block_size +
- i_block_size ) >> 2;
- id->i_last_block_size = i_block_size;
-
- p_out->i_size = op.bytes;
- p_out->i_length = (mtime_t)1000000 *
- (mtime_t)i_samples /
- (mtime_t)id->f_dst.i_sample_rate;
-
- //msg_Err( p_stream, "i_dts: %lld", id->i_dts );
-
- /* FIXME */
- p_out->i_dts = id->i_dts;
- p_out->i_pts = id->i_dts;
-
- id->i_samples_delay -= i_samples;
-
- /* update dts */
- id->i_dts += p_out->i_length;
- sout_BufferChain( out, p_out );
-
- }
+ i_buffer -= i_used;
+ p_buffer += i_used;
+ id->i_buffer_pos = i_used;
}
}
- else
-#endif
-
- for( ;; )
- {
- int i_frame_size = id->ff_enc_c->frame_size * 2 *
- id->ff_dec_c->channels;
- int i_out_size, i, j;
- sout_buffer_t *p_out;
- int16_t *p_buffer = (int16_t *)(id->p_buffer + i_buffer_pos -
- id->i_buffer_pos);
- if( id->i_buffer_pos < i_frame_size )
- {
- break;
- }
+ if( id->i_buffer_pos == 0 ) continue;
- if( id->ff_dec_c->channels != id->ff_enc_c->channels )
+ /* Encode as much data as possible */
+ if( !id->b_enc_inited && id->p_encoder->pf_header )
+ {
+ p_block = id->p_encoder->pf_header( id->p_encoder );
+ while( p_block )
{
- /* dumb downmixing */
- for( i = 0; i < id->ff_enc_c->frame_size; i++ )
- {
- for( j = 0 ; j < id->f_dst.i_channels; j++ )
- {
- p_buffer[i*id->f_dst.i_channels+j] = p_buffer[i*id->f_src.i_channels+j];
- }
- }
- }
+ sout_buffer_t *p_out;
+ block_t *p_prev_block = p_block;
- /* msg_Warn( p_stream, "avcodec_encode_audio: frame size%d",
- i_frame_size); */
- i_out_size = avcodec_encode_audio( id->ff_enc_c,
- id->p_buffer_out, id->i_buffer_out, p_buffer );
+ 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 );
- if( i_out_size <= 0 )
- {
- break;
+ p_block = p_block->p_next;
+ block_Release( p_prev_block );
}
- id->i_buffer_pos -= i_frame_size;
-
- p_out = sout_BufferNew( p_stream->p_sout, i_out_size );
- memcpy( p_out->p_buffer, id->p_buffer_out, i_out_size );
- p_out->i_size = i_out_size;
- p_out->i_length = (mtime_t)1000000 *
- (mtime_t)id->ff_enc_c->frame_size /
- (mtime_t)id->ff_enc_c->sample_rate;
+ id->b_enc_inited = VLC_TRUE;
+ }
- /* FIXME */
- p_out->i_dts = id->i_dts;
- p_out->i_pts = id->i_dts;
+ aout_buf.p_buffer = id->p_buffer;
+ aout_buf.i_nb_bytes = id->i_buffer_pos;
+ aout_buf.i_nb_samples = id->i_buffer_pos / 2 / id->f_src.i_channels;
+ aout_buf.start_date = id->i_dts;
+ aout_buf.end_date = id->i_dts;
- /* update dts */
- id->i_dts += p_out->i_length;
+ id->i_dts += ( I64C(1000000) * id->i_buffer_pos / 2 /
+ id->f_src.i_channels / id->f_src.i_sample_rate );
- /* msg_Warn( p_stream, "frame dts=%lld len %lld out=%d",
- p_out->i_dts, p_out->i_length, i_out_size ); */
+ p_block = id->p_encoder->pf_encode_audio( id->p_encoder, &aout_buf );
+ 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;
sout_BufferChain( out, p_out );
- }
- /* Copy the remaining raw samples */
- if( id->i_buffer_pos != 0 )
- {
- memmove( id->p_buffer,
- &id->p_buffer[i_buffer_pos - id->i_buffer_pos],
- id->i_buffer_pos );
+ p_block = p_block->p_next;
+ block_Release( p_prev_block );
}
-
- } while( b_again );
+ }
return VLC_SUCCESS;
}
int i_ff_codec;
+ /* Open decoder */
if( id->f_src.i_fourcc == VLC_FOURCC( 'I', '4', '2', '0' ) ||
id->f_src.i_fourcc == VLC_FOURCC( 'I', '4', '2', '2' ) ||
id->f_src.i_fourcc == VLC_FOURCC( 'I', '4', '4', '4' ) ||
id->f_src.i_fourcc == VLC_FOURCC( 'R', 'V', '3', '2' ) ||
id->f_src.i_fourcc == VLC_FOURCC( 'G', 'R', 'E', 'Y' ) )
{
- id->ff_dec = NULL;
+ id->ff_dec = NULL;
id->ff_dec_c = avcodec_alloc_context();
id->ff_dec_c->width = id->f_src.i_width;
id->ff_dec_c->height = id->f_src.i_height;
}
}
-
- /* find encoder */
- i_ff_codec = get_ff_codec( id->f_dst.i_fourcc );
- if( i_ff_codec == 0 )
+ /* Open encoder */
+ id->p_encoder = vlc_object_create( p_stream, VLC_OBJECT_ENCODER );
+ id->p_encoder->i_fourcc = id->f_dst.i_fourcc;
+ id->p_encoder->format.video.i_width = p_sys->i_width;
+ id->p_encoder->format.video.i_height = p_sys->i_height;
+ id->p_encoder->i_bitrate = p_sys->i_vbitrate;
+
+ id->p_encoder->i_vtolerance = p_sys->i_vtolerance;
+ id->p_encoder->i_key_int = p_sys->i_key_int;
+ id->p_encoder->i_b_frames = p_sys->i_b_frames;
+ 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;
+
+ if( id->p_encoder->format.video.i_width <= 0 )
{
- msg_Err( p_stream, "cannot find encoder" );
- return VLC_EGENERIC;
+ id->p_encoder->format.video.i_width = id->f_dst.i_width =
+ id->ff_dec_c->width - p_sys->i_crop_left - p_sys->i_crop_right;
}
-
- id->ff_enc = avcodec_find_encoder( i_ff_codec );
- if( !id->ff_enc )
+ if( id->p_encoder->format.video.i_height <= 0 )
{
- msg_Err( p_stream, "cannot find encoder" );
- return VLC_EGENERIC;
+ id->p_encoder->format.video.i_height = id->f_dst.i_height =
+ id->ff_dec_c->height - p_sys->i_crop_top - p_sys->i_crop_bottom;
}
- if( id->f_dst.i_fourcc == VLC_FOURCC( 'm','p','1','v' )||
- id->f_dst.i_fourcc == VLC_FOURCC( 'm','p','2','v' ) )
- {
- id->f_dst.i_fourcc = VLC_FOURCC( 'm','p','g','v' );
- }
-
- id->ff_enc_c = avcodec_alloc_context();
- id->ff_enc_c->width = id->f_dst.i_width;
- id->ff_enc_c->height = id->f_dst.i_height;
- id->ff_enc_c->bit_rate = id->f_dst.i_bitrate;
+ id->p_ff_pic = avcodec_alloc_frame();
+ id->p_ff_pic_tmp0 = NULL;
+ id->p_ff_pic_tmp1 = NULL;
+ id->p_ff_pic_tmp2 = NULL;
+ id->p_vresample = NULL;
if( id->ff_dec )
{
- id->ff_enc_c->frame_rate = id->ff_dec_c->frame_rate;
+ id->p_encoder->i_frame_rate = id->ff_dec_c->frame_rate;
#if LIBAVCODEC_BUILD >= 4662
- id->ff_enc_c->frame_rate_base= id->ff_dec_c->frame_rate_base;
+ id->p_encoder->i_frame_rate_base= id->ff_dec_c->frame_rate_base;
#endif
+
+#if LIBAVCODEC_BUILD >= 4687
+ id->p_encoder->i_aspect = VOUT_ASPECT_FACTOR *
+ ( av_q2d(id->ff_dec_c->sample_aspect_ratio) *
+ id->ff_dec_c->width / id->ff_dec_c->height );
+#else
+ id->p_encoder->i_aspect = VOUT_ASPECT_FACTOR *
+ id->ff_dec_c->aspect_ratio;
+#endif
+
}
else
{
#if LIBAVCODEC_BUILD >= 4662
- id->ff_enc_c->frame_rate = 25 ; /* FIXME as it break mpeg */
- id->ff_enc_c->frame_rate_base= 1;
+ id->p_encoder->i_frame_rate = 25 ; /* FIXME as it break mpeg */
+ id->p_encoder->i_frame_rate_base= 1;
#else
- id->ff_enc_c->frame_rate = 25 * FRAME_RATE_BASE;
+ id->p_encoder->i_frame_rate = 25 * FRAME_RATE_BASE;
#endif
}
- id->ff_enc_c->gop_size = p_sys->i_key_int >= 0 ? p_sys->i_key_int : 50;
- id->ff_enc_c->max_b_frames = __MIN( p_sys->i_b_frames, FF_MAX_B_FRAMES );
- id->ff_enc_c->b_frame_strategy = 0;
- id->ff_enc_c->b_quant_factor = 2.0;
-
- if( p_sys->i_vtolerance >= 0 )
- {
- id->ff_enc_c->bit_rate_tolerance = p_sys->i_vtolerance;
- }
- id->ff_enc_c->qmin = p_sys->i_qmin;
- id->ff_enc_c->qmax = p_sys->i_qmax;
-
-#if LIBAVCODEC_BUILD >= 4673
- id->ff_enc_c->mb_decision = p_sys->i_hq;
-#else
- if( p_sys->i_hq )
- {
- id->ff_enc_c->flags |= CODEC_FLAG_HQ;
- }
-#endif
+ id->p_encoder->p_module =
+ module_Need( id->p_encoder, "video encoder", NULL );
- if( i_ff_codec == CODEC_ID_RAWVIDEO )
+ if( !id->p_encoder->p_module )
{
- id->ff_enc_c->pix_fmt = get_ff_chroma( id->f_dst.i_fourcc );
+ vlc_object_destroy( id->p_encoder );
+ msg_Err( p_stream, "cannot find encoder" );
+ return VLC_EGENERIC;
}
- /* XXX open it only when we have the first frame */
- id->b_enc_inited = VLC_FALSE;
- id->i_buffer_in = 0;
- id->i_buffer_in_pos = 0;
- id->p_buffer_in = NULL;
-
- id->i_buffer = 3*1024*1024;
- id->i_buffer_pos = 0;
- id->p_buffer = malloc( id->i_buffer );
- id->i_buffer_out = 0;
- id->i_buffer_out_pos = 0;
- id->p_buffer_out = NULL;
-
- id->p_ff_pic = avcodec_alloc_frame();
- id->p_ff_pic_tmp0 = NULL;
- id->p_ff_pic_tmp1 = NULL;
- id->p_ff_pic_tmp2 = NULL;
- id->p_vresample = NULL;
+ /* Close the encoder.
+ * We'll open it only when we have the first frame */
+ module_Unneed( id->p_encoder, id->p_encoder->p_module );
- p_sys->i_last_ref_pts = 0;
- p_sys->i_buggy_pts_detect = 0;
+ id->b_enc_inited = VLC_FALSE;
return VLC_SUCCESS;
}
-static void transcode_video_ffmpeg_close ( sout_stream_t *p_stream, sout_stream_id_t *id )
+static void transcode_video_ffmpeg_close ( sout_stream_t *p_stream,
+ sout_stream_id_t *id )
{
+ /* Close decoder */
if( id->ff_dec )
{
avcodec_close( id->ff_dec_c );
- }
- if( id->b_enc_inited )
- {
- avcodec_close( id->ff_enc_c );
+ free( id->ff_dec_c );
}
+ /* Close encoder */
+ module_Unneed( id->p_encoder, id->p_encoder->p_module );
+ vlc_object_destroy( id->p_encoder );
+
+ /* Misc cleanup */
if( id->p_ff_pic)
{
free( id->p_ff_pic );
{
free( id->p_vresample );
}
-
- free( id->ff_dec_c );
- free( id->ff_enc_c );
-
- free( id->p_buffer );
}
static int transcode_video_ffmpeg_process( sout_stream_t *p_stream,
{
sout_stream_sys_t *p_sys = p_stream->p_sys;
int i_used;
- int i_out;
int b_gotpicture;
AVFrame *frame;
i_data = in->i_size;
p_data = in->p_buffer;
-
+
for( ;; )
{
+ block_t *p_block;
+ picture_t 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,
if( !id->b_enc_inited )
{
- /* XXX hack because of copy packetizer and mpeg4video that can failed
- detecting size */
- if( id->ff_enc_c->width <= 0 )
+ /* XXX hack because of copy packetizer and mpeg4video that can fail
+ * detecting size */
+ if( id->p_encoder->format.video.i_width <= 0 )
{
- id->ff_enc_c->width =
- id->f_dst.i_width = id->ff_dec_c->width - p_sys->i_crop_left - p_sys->i_crop_right;
+ id->p_encoder->format.video.i_width = id->f_dst.i_width =
+ id->ff_dec_c->width - p_sys->i_crop_left -
+ p_sys->i_crop_right;
}
- if( id->ff_enc_c->height <= 0 )
+ if( id->p_encoder->format.video.i_height <= 0 )
{
- id->ff_enc_c->height =
- id->f_dst.i_height = id->ff_dec_c->height - p_sys->i_crop_top - p_sys->i_crop_bottom;
+ id->p_encoder->format.video.i_height = id->f_dst.i_height =
+ id->ff_dec_c->height - p_sys->i_crop_top -
+ p_sys->i_crop_bottom;
}
- /* Make sure we get extradata filled by the encoder */
- id->ff_enc_c->extradata_size = 0;
- id->ff_enc_c->extradata = NULL;
- id->ff_enc_c->flags |= CODEC_FLAG_GLOBAL_HEADER;
+ id->p_encoder->i_bitrate = p_sys->i_vbitrate;
+
+ id->p_encoder->i_extra_data = 0;
+ id->p_encoder->p_extra_data = NULL;
- if( avcodec_open( id->ff_enc_c, id->ff_enc ) )
+ id->p_encoder->p_module =
+ module_Need( id->p_encoder, "video encoder", NULL );
+ if( !id->p_encoder->p_module )
{
- msg_Err( p_stream, "cannot open encoder" );
+ vlc_object_destroy( id->p_encoder );
+ msg_Err( p_stream, "cannot find encoder" );
return VLC_EGENERIC;
}
- id->f_dst.i_extra_data = id->ff_enc_c->extradata_size;
- id->f_dst.p_extra_data = id->ff_enc_c->extradata;
- id->ff_enc_c->flags &= ~CODEC_FLAG_GLOBAL_HEADER;
+ id->f_dst.i_extra_data = id->p_encoder->i_extra_data;
+ id->f_dst.p_extra_data = id->p_encoder->p_extra_data;
+
+ /* Hack for mp2v/mp1v transcoding support */
+ if( id->f_dst.i_fourcc == VLC_FOURCC( 'm','p','1','v' ) ||
+ id->f_dst.i_fourcc == VLC_FOURCC( 'm','p','2','v' ) )
+ {
+ id->f_dst.i_fourcc = VLC_FOURCC( 'm','p','g','v' );
+ }
- if( !( id->id = p_stream->p_sys->p_out->pf_add( p_stream->p_sys->p_out, &id->f_dst ) ) )
+ if( !( id->id =
+ p_stream->p_sys->p_out->pf_add( p_stream->p_sys->p_out,
+ &id->f_dst ) ) )
{
msg_Err( p_stream, "cannot add this stream" );
transcode_video_ffmpeg_close( p_stream, id );
id->b_transcode = VLC_FALSE;
return VLC_EGENERIC;
}
+
+ while( id->p_encoder->pf_header &&
+ (p_block = id->p_encoder->pf_header( id->p_encoder )) )
+ {
+ 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 );
+ }
+
+ id->i_inter_pixfmt =
+ get_ff_chroma( id->p_encoder->format.video.i_chroma );
+
id->b_enc_inited = VLC_TRUE;
}
-
/* deinterlace */
if( p_stream->p_sys->b_deinterlace )
{
buf = malloc( i_size );
avpicture_fill( (AVPicture*)id->p_ff_pic_tmp0, buf,
- id->ff_enc_c->pix_fmt,
+ id->i_inter_pixfmt,
id->ff_dec_c->width, id->ff_dec_c->height );
}
}
/* convert pix format */
- if( id->ff_dec_c->pix_fmt != id->ff_enc_c->pix_fmt )
+ if( id->ff_dec_c->pix_fmt != id->i_inter_pixfmt )
{
if( id->p_ff_pic_tmp1 == NULL )
{
int i_size;
uint8_t *buf;
id->p_ff_pic_tmp1 = avcodec_alloc_frame();
- i_size = avpicture_get_size( id->ff_enc_c->pix_fmt,
- id->ff_dec_c->width, id->ff_dec_c->height );
+ i_size = avpicture_get_size( id->i_inter_pixfmt,
+ id->ff_dec_c->width,
+ id->ff_dec_c->height );
buf = malloc( i_size );
avpicture_fill( (AVPicture*)id->p_ff_pic_tmp1, buf,
- id->ff_enc_c->pix_fmt,
+ id->i_inter_pixfmt,
id->ff_dec_c->width, id->ff_dec_c->height );
}
- img_convert( (AVPicture*)id->p_ff_pic_tmp1, id->ff_enc_c->pix_fmt,
- (AVPicture*)frame, id->ff_dec_c->pix_fmt,
+ img_convert( (AVPicture*)id->p_ff_pic_tmp1, id->i_inter_pixfmt,
+ (AVPicture*)frame, id->ff_dec_c->pix_fmt,
id->ff_dec_c->width, id->ff_dec_c->height );
frame = id->p_ff_pic_tmp1;
}
/* convert size and crop */
- if( id->ff_dec_c->width != id->ff_enc_c->width ||
- id->ff_dec_c->height != id->ff_enc_c->height ||
+ if( id->ff_dec_c->width != id->f_dst.i_width ||
+ id->ff_dec_c->height != id->f_dst.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 )
{
int i_size;
uint8_t *buf;
id->p_ff_pic_tmp2 = avcodec_alloc_frame();
- i_size = avpicture_get_size( id->ff_enc_c->pix_fmt,
- id->ff_enc_c->width, id->ff_enc_c->height );
+ i_size = avpicture_get_size( id->i_inter_pixfmt,
+ id->f_dst.i_width,
+ id->f_dst.i_height );
buf = malloc( i_size );
avpicture_fill( (AVPicture*)id->p_ff_pic_tmp2, buf,
- id->ff_enc_c->pix_fmt,
- id->ff_enc_c->width, id->ff_enc_c->height );
+ id->i_inter_pixfmt,
+ id->f_dst.i_width, id->f_dst.i_height );
id->p_vresample =
- img_resample_full_init( id->ff_enc_c->width, id->ff_enc_c->height,
+ img_resample_full_init( id->f_dst.i_width,
+ id->f_dst.i_height,
id->ff_dec_c->width, id->ff_dec_c->height,
p_stream->p_sys->i_crop_top,
p_stream->p_sys->i_crop_bottom,
frame = id->p_ff_pic_tmp2;
}
- /* Set the pts of the frame being encoded (segfaults with mpeg4!)*/
- if( id->f_dst.i_fourcc == VLC_FOURCC( 'm', 'p', 'g', 'v' ) )
- frame->pts = p_sys->i_output_pts;
- else
- frame->pts = 0;
+ /* Encoding */
+ vout_InitPicture( VLC_OBJECT(p_stream), &pic,
+ id->p_encoder->format.video.i_chroma,
+ id->f_dst.i_width, id->f_dst.i_height,
+ id->f_dst.i_width * VOUT_ASPECT_FACTOR /
+ id->f_dst.i_height );
+
+ for( i_plane = 0; i_plane < 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];
+ }
+
+ /* Set the pts of the frame being encoded */
+ pic.date = p_sys->i_output_pts;
/* 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);
}
- /* Let ffmpeg select the frame type */
- frame->pict_type = 0;
-
- i_out = avcodec_encode_video( id->ff_enc_c, id->p_buffer,
- id->i_buffer, frame );
- if( i_out > 0 )
+ p_block = id->p_encoder->pf_encode_video( id->p_encoder, &pic );
+ while( p_block )
{
sout_buffer_t *p_out;
- p_out = sout_BufferNew( p_stream->p_sout, i_out );
-
- memcpy( p_out->p_buffer, id->p_buffer, i_out );
-
- p_out->i_size = i_out;
-
- if( id->ff_enc_c->coded_frame->pts != 0 &&
- p_sys->i_buggy_pts_detect != id->ff_enc_c->coded_frame->pts )
- {
- p_sys->i_buggy_pts_detect = id->ff_enc_c->coded_frame->pts;
-
- /* FIXME, 3-2 pulldown is not handled correctly */
- p_out->i_length = in->i_length;
- p_out->i_pts = id->ff_enc_c->coded_frame->pts;
-
- if( !id->ff_enc_c->delay ||
- ( id->ff_enc_c->coded_frame->pict_type != FF_I_TYPE &&
- id->ff_enc_c->coded_frame->pict_type != FF_P_TYPE ) )
- {
- p_out->i_dts = p_out->i_pts;
- }
- else
- {
- if( p_sys->i_last_ref_pts )
- {
- p_out->i_dts = p_sys->i_last_ref_pts;
- }
- else
- {
- /* Let's put something sensible */
- p_out->i_dts = p_out->i_pts;
- }
-
- p_sys->i_last_ref_pts = p_out->i_pts;
- }
- }
- else
- {
- /* Buggy libavcodec which doesn't update coded_frame->pts
- * correctly */
- p_out->i_length = in->i_length;
- p_out->i_dts = in->i_dts;
- p_out->i_pts = in->i_dts;
- }
+ 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;
sout_BufferChain( out, p_out );
+
+ p_block = p_block->p_next;
+ block_Release( p_prev_block );
}
if( i_data <= 0 )
projects / vlc / blobdiff