/* Hack to force display of still pictures */
bool b_first_frame;
- int i_buffer_orig, i_buffer;
- char *p_buffer_orig, *p_buffer;
-
/* */
AVPaletteControl palette;
AVCodec *p_codec, int i_codec_id, const char *psz_namecodec )
{
decoder_sys_t *p_sys;
- vlc_value_t val;
+ int i_val;
/* Allocate the memory needed to store the decoder's structure */
if( ( p_dec->p_sys = p_sys = calloc( 1, sizeof(decoder_sys_t) ) ) == NULL )
return VLC_ENOMEM;
+ p_codec->type = CODEC_TYPE_VIDEO;
+ p_context->codec_type = CODEC_TYPE_VIDEO;
+ p_context->codec_id = i_codec_id;
p_sys->p_context = p_context;
p_sys->p_codec = p_codec;
p_sys->i_codec_id = i_codec_id;
/* ***** Get configuration of ffmpeg plugin ***** */
p_sys->p_context->workaround_bugs =
config_GetInt( p_dec, "ffmpeg-workaround-bugs" );
-#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT( 52, 0, 0 )
p_sys->p_context->error_resilience =
config_GetInt( p_dec, "ffmpeg-error-resilience" );
#else
config_GetInt( p_dec, "ffmpeg-error-resilience" );
#endif
- var_Create( p_dec, "grayscale", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
- var_Get( p_dec, "grayscale", &val );
- if( val.b_bool ) p_sys->p_context->flags |= CODEC_FLAG_GRAY;
+ if( var_CreateGetBool( p_dec, "grayscale" ) )
+ p_sys->p_context->flags |= CODEC_FLAG_GRAY;
- var_Create( p_dec, "ffmpeg-vismv", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
- var_Get( p_dec, "ffmpeg-vismv", &val );
- if( val.i_int ) p_sys->p_context->debug_mv = val.i_int;
+ i_val = var_CreateGetInteger( p_dec, "ffmpeg-vismv" );
+ if( i_val ) p_sys->p_context->debug_mv = i_val;
- var_Create( p_dec, "ffmpeg-lowres", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
- var_Get( p_dec, "ffmpeg-lowres", &val );
- if( val.i_int > 0 && val.i_int <= 2 ) p_sys->p_context->lowres = val.i_int;
+ i_val = var_CreateGetInteger( p_dec, "ffmpeg-lowres" );
+ if( i_val > 0 && i_val <= 2 ) p_sys->p_context->lowres = i_val;
- var_Create( p_dec, "ffmpeg-skiploopfilter",
- VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
- var_Get( p_dec, "ffmpeg-skiploopfilter", &val );
- if( val.i_int > 0 ) p_sys->p_context->skip_loop_filter = AVDISCARD_NONREF;
- if( val.i_int > 1 ) p_sys->p_context->skip_loop_filter = AVDISCARD_BIDIR;
- if( val.i_int > 2 ) p_sys->p_context->skip_loop_filter = AVDISCARD_NONKEY;
- if( val.i_int > 3 ) p_sys->p_context->skip_loop_filter = AVDISCARD_ALL;
+ i_val = var_CreateGetInteger( p_dec, "ffmpeg-skiploopfilter" );
+ if( i_val >= 4 ) p_sys->p_context->skip_loop_filter = AVDISCARD_ALL;
+ else if( i_val == 3 ) p_sys->p_context->skip_loop_filter = AVDISCARD_NONKEY;
+ else if( i_val == 2 ) p_sys->p_context->skip_loop_filter = AVDISCARD_BIDIR;
+ else if( i_val == 1 ) p_sys->p_context->skip_loop_filter = AVDISCARD_NONREF;
- bool b_fast = var_CreateGetBool( p_dec, "ffmpeg-fast" );
- if( b_fast ) p_sys->p_context->flags2 |= CODEC_FLAG2_FAST;
+ if( var_CreateGetBool( p_dec, "ffmpeg-fast" ) )
+ p_sys->p_context->flags2 |= CODEC_FLAG2_FAST;
/* ***** ffmpeg frame skipping ***** */
- var_Create( p_dec, "ffmpeg-hurry-up", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
- var_Get( p_dec, "ffmpeg-hurry-up", &val );
- p_sys->b_hurry_up = val.b_bool;
+ p_sys->b_hurry_up = var_CreateGetBool( p_dec, "ffmpeg-hurry-up" );
- var_Create( p_dec, "ffmpeg-skip-frame", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
- var_Get( p_dec, "ffmpeg-skip-frame", &val );
- switch( val.i_int )
+ switch( var_CreateGetInteger( p_dec, "ffmpeg-skip-frame" ) )
{
case -1:
p_sys->p_context->skip_frame = AVDISCARD_NONE;
}
p_sys->i_skip_frame = p_sys->p_context->skip_frame;
- var_Create( p_dec, "ffmpeg-skip-idct", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
- var_Get( p_dec, "ffmpeg-skip-idct", &val );
- switch( val.i_int )
+ switch( var_CreateGetInteger( p_dec, "ffmpeg-skip-idct" ) )
{
case -1:
p_sys->p_context->skip_idct = AVDISCARD_NONE;
/* ***** ffmpeg direct rendering ***** */
p_sys->b_direct_rendering = false;
- var_Create( p_dec, "ffmpeg-dr", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
- var_Get( p_dec, "ffmpeg-dr", &val );
- if( val.b_bool && (p_sys->p_codec->capabilities & CODEC_CAP_DR1) &&
+ if( var_CreateGetBool( p_dec, "ffmpeg-dr" ) &&
+ (p_sys->p_codec->capabilities & CODEC_CAP_DR1) &&
/* Apparently direct rendering doesn't work with YUV422P */
p_sys->p_context->pix_fmt != PIX_FMT_YUV422P &&
/* H264 uses too many reference frames */
p_sys->b_first_frame = true;
p_sys->b_flush = false;
p_sys->i_late_frames = 0;
- p_sys->i_buffer = 0;
- p_sys->i_buffer_orig = 1;
- p_sys->p_buffer_orig = p_sys->p_buffer = malloc( p_sys->i_buffer_orig );
- if( !p_sys->p_buffer_orig )
- {
- av_free( p_sys->p_ff_pic );
- free( p_sys );
- return VLC_ENOMEM;
- }
/* Set output properties */
p_dec->fmt_out.i_cat = VIDEO_ES;
{
msg_Err( p_dec, "cannot open codec (%s)", p_sys->psz_namecodec );
av_free( p_sys->p_ff_pic );
- free( p_sys->p_buffer_orig );
free( p_sys );
return VLC_EGENERIC;
}
if( p_block->i_flags & (BLOCK_FLAG_DISCONTINUITY|BLOCK_FLAG_CORRUPTED) )
{
- p_sys->i_buffer = 0;
p_sys->i_pts = 0; /* To make sure we recover properly */
p_sys->input_pts = p_sys->input_dts = 0;
* but break picture until a new I, and for mpeg4 ...*/
p_sys->i_late_frames--; /* needed else it will never be decrease */
block_Release( p_block );
- p_sys->i_buffer = 0;
return NULL;
}
}
{
p_sys->b_flush = ( p_block->i_flags & BLOCK_FLAG_END_OF_SEQUENCE ) != 0;
- p_sys->i_buffer = p_block->i_buffer;
- if( p_sys->i_buffer + FF_INPUT_BUFFER_PADDING_SIZE >
- p_sys->i_buffer_orig )
- {
- free( p_sys->p_buffer_orig );
- p_sys->i_buffer_orig =
- p_block->i_buffer + FF_INPUT_BUFFER_PADDING_SIZE;
- p_sys->p_buffer_orig = malloc( p_sys->i_buffer_orig );
- }
- p_sys->p_buffer = p_sys->p_buffer_orig;
- p_sys->i_buffer = p_block->i_buffer;
- if( !p_sys->p_buffer )
- {
- block_Release( p_block );
+ p_block = block_Realloc( p_block, 0,
+ p_block->i_buffer + FF_INPUT_BUFFER_PADDING_SIZE );
+ if( !p_block )
return NULL;
- }
- vlc_memcpy( p_sys->p_buffer, p_block->p_buffer, p_block->i_buffer );
- memset( p_sys->p_buffer + p_block->i_buffer, 0,
+ p_block->i_buffer -= FF_INPUT_BUFFER_PADDING_SIZE;
+ *pp_block = p_block;
+ memset( p_block->p_buffer + p_block->i_buffer, 0,
FF_INPUT_BUFFER_PADDING_SIZE );
-
- p_block->i_buffer = 0;
}
- while( p_sys->i_buffer > 0 || p_sys->b_flush )
+ while( p_block->i_buffer > 0 || p_sys->b_flush )
{
int i_used, b_gotpicture;
picture_t *p_pic;
i_used = avcodec_decode_video( p_sys->p_context, p_sys->p_ff_pic,
&b_gotpicture,
- p_sys->i_buffer <= 0 && p_sys->b_flush ? NULL : (uint8_t*)p_sys->p_buffer, p_sys->i_buffer );
+ p_block->i_buffer <= 0 && p_sys->b_flush ? NULL : p_block->p_buffer, p_block->i_buffer );
if( b_null_size && p_sys->p_context->width > 0 &&
p_sys->p_context->height > 0 &&
if( p_sys->b_hurry_up )
p_sys->p_context->skip_frame = p_sys->i_skip_frame;
i_used = avcodec_decode_video( p_sys->p_context, p_sys->p_ff_pic,
- &b_gotpicture,
- (uint8_t*)p_sys->p_buffer, p_sys->i_buffer );
+ &b_gotpicture, p_block->p_buffer,
+ p_block->i_buffer );
}
if( p_sys->b_flush )
p_sys->b_first_frame = true;
- if( p_sys->i_buffer <= 0 )
+ if( p_block->i_buffer <= 0 )
p_sys->b_flush = false;
if( i_used < 0 )
{
if( b_drawpicture )
- msg_Warn( p_dec, "cannot decode one frame (%d bytes)",
- p_sys->i_buffer );
+ msg_Warn( p_dec, "cannot decode one frame (%zu bytes)",
+ p_block->i_buffer );
block_Release( p_block );
return NULL;
}
- else if( i_used > p_sys->i_buffer )
+ else if( i_used > p_block->i_buffer )
{
- i_used = p_sys->i_buffer;
+ i_used = p_block->i_buffer;
}
/* Consumed bytes */
- p_sys->i_buffer -= i_used;
- p_sys->p_buffer += i_used;
+ p_block->i_buffer -= i_used;
+ p_block->p_buffer += i_used;
/* Nothing to display */
if( !b_gotpicture )
{
decoder_sys_t *p_sys = p_dec->p_sys;
- avcodec_flush_buffers( p_sys->p_context );
+ /* do not flush buffers if codec hasn't been opened (theora/vorbis/VC1) */
+ if( p_sys->p_context->codec )
+ avcodec_flush_buffers( p_sys->p_context );
if( p_sys->p_ff_pic ) av_free( p_sys->p_ff_pic );
- free( p_sys->p_buffer_orig );
if( p_sys->p_va )
VaDelete( p_sys->p_va );