#include <vlc_aout.h>
#include <vlc_sout.h>
#include <vlc_codec.h>
-#include <vlc_interface.h>
+#include <vlc_dialog.h>
+#include <vlc_avcodec.h>
/* ffmpeg header */
#define HAVE_MMX 1
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 );
+ void *arg, int *ret, int count, int );
/*****************************************************************************
* thread_context_t : for multithreaded encoding
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;
}
"*** Please check with your 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,
__MAX( __MIN( p_sys->i_b_frames, FF_MAX_B_FRAMES ), 0 );
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_enc->fmt_out.i_codec == VLC_CODEC_MP1V ) )
p_context->flags |= CODEC_FLAG_LOW_DELAY;
av_reduce( &i_aspect_num, &i_aspect_den,
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 );
if( i_codec_id == 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_enc->fmt_in.i_codec = VLC_CODEC_S16N;
p_context->sample_rate = p_enc->fmt_out.audio.i_rate;
p_context->channels = p_enc->fmt_out.audio.i_channels;
- 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_context->extradata = NULL;
p_context->flags |= CODEC_FLAG_GLOBAL_HEADER;
- vlc_mutex_lock( &avcodec_lock );
-
- if( avcodec_open( p_context, p_codec ) )
+ int ret;
+ vlc_avcodec_lock();
+ ret = avcodec_open( p_context, p_codec );
+ vlc_avcodec_unlock();
+ 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) )
}
p_context->codec = NULL;
- vlc_mutex_lock( &avcodec_lock );
- if( avcodec_open( p_context, p_codec ) )
+ vlc_avcodec_lock();
+ ret = avcodec_open( p_context, p_codec );
+ vlc_avcodec_unlock();
+ if( ret )
{
- vlc_mutex_unlock( &avcodec_lock );
msg_Err( p_enc, "cannot open encoder" );
- intf_UserFatal( p_enc, false,
+ dialog_Fatal( p_enc,
_("Streaming / Transcoding failed"),
_("VLC could not open the encoder.") );
free( p_sys );
else
{
msg_Err( p_enc, "cannot open encoder" );
- intf_UserFatal( p_enc, false, _("Streaming / Transcoding failed"),
+ dialog_Fatal( p_enc, _("Streaming / Transcoding failed"),
_("VLC could not open the encoder.") );
free( p_sys );
return VLC_EGENERIC;
}
}
- vlc_mutex_unlock( &avcodec_lock );
- p_enc->fmt_out.i_extra = p_context->extradata_size;
- if( p_enc->fmt_out.i_extra )
+ if( i_codec_id == 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;
+ p[1] = 0x4C;
+ p[2] = 0x61;
+ p[3] = 0x43;
+ p[4] = 0x00;
+ 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;
+ }
}
+ else
+ {
+ 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 );
+ memcpy( p_enc->fmt_out.p_extra, p_context->extradata,
+ p_enc->fmt_out.i_extra );
+ }
+ }
+
p_context->flags &= ~CODEC_FLAG_GLOBAL_HEADER;
if( p_enc->fmt_in.i_cat == AUDIO_ES )
static int FfmpegExecute( AVCodecContext *s,
int (*pf_func)(AVCodecContext *c2, void *arg2),
- void **arg, int *ret, int count )
+ void *arg, int *ret, int count, int size )
{
struct thread_context_t ** pp_contexts =
(struct thread_context_t **)s->thread_opaque;
- int i;
+ void **argv = arg;
/* 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++ )
+ for ( int i = 0; i < count; i++ )
{
vlc_mutex_lock( &pp_contexts[i]->lock );
- pp_contexts[i]->arg = arg[i];
+ pp_contexts[i]->arg = argv[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 );
}
- for ( i = 0; i < count; i++ )
+ for ( int i = 0; i < count; i++ )
{
vlc_mutex_lock( &pp_contexts[i]->lock );
while ( !pp_contexts[i]->b_done )
}
}
+ (void)size;
return 0;
}
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' ) )
+ if( p_enc->fmt_out.i_codec != VLC_CODEC_MP4V )
{
frame.pts = p_pict->date ? p_pict->date : (int64_t)AV_NOPTS_VALUE;
free( pp_contexts );
}
- 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_buffer );