/*****************************************************************************
* Preamble
*****************************************************************************/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
#include <vlc/vlc.h>
-#include <vlc/decoder.h>
-#include <vlc/input.h> /* hmmm, just for INPUT_RATE_DEFAULT */
+#include <vlc_codec.h>
+#include <vlc_vout.h>
+#include <vlc_input.h> /* hmmm, just for INPUT_RATE_DEFAULT */
/* ffmpeg header */
-#ifdef HAVE_FFMPEG_AVCODEC_H
+#ifdef HAVE_LIBAVCODEC_AVCODEC_H
+# include <libavcodec/avcodec.h>
+#elif defined(HAVE_FFMPEG_AVCODEC_H)
# include <ffmpeg/avcodec.h>
#else
# include <avcodec.h>
*****************************************************************************/
struct decoder_sys_t
{
- /* Common part between video and audio decoder */
- int i_cat;
- int i_codec_id;
- char *psz_namecodec;
-
- AVCodecContext *p_context;
- AVCodec *p_codec;
+ FFMPEG_COMMON_MEMBERS
/* Video decoder specific part */
mtime_t input_pts;
/* for frame skipping algo */
int b_hurry_up;
- int i_frame_skip;
+ enum AVDiscard i_skip_frame;
+ enum AVDiscard i_skip_idct;
/* how many decoded frames are late */
int i_late_frames;
return VLC_FOURCC('R','V','2','4');
case PIX_FMT_RGBA32:
return VLC_FOURCC('R','V','3','2');
+#ifdef PIX_FMT_RGBA
+ case PIX_FMT_RGBA:
+ return VLC_FOURCC('R','G','B','A');
+#endif
case PIX_FMT_GRAY8:
return VLC_FOURCC('G','R','E','Y');
}
else
{
-#if LIBAVCODEC_BUILD >= 4687
p_dec->fmt_out.video.i_aspect =
VOUT_ASPECT_FACTOR * ( av_q2d(p_context->sample_aspect_ratio) *
p_context->width / p_context->height );
p_dec->fmt_out.video.i_sar_num = p_context->sample_aspect_ratio.num;
p_dec->fmt_out.video.i_sar_den = p_context->sample_aspect_ratio.den;
-#else
- p_dec->fmt_out.video.i_aspect =
- VOUT_ASPECT_FACTOR * p_context->aspect_ratio;
-#endif
+
if( p_dec->fmt_out.video.i_aspect == 0 )
{
p_dec->fmt_out.video.i_aspect =
p_dec->fmt_out.video.i_frame_rate =
p_dec->fmt_in.video.i_frame_rate;
p_dec->fmt_out.video.i_frame_rate_base =
- p_dec->fmt_out.video.i_frame_rate_base;
+ p_dec->fmt_in.video.i_frame_rate_base;
}
- else
-#if LIBAVCODEC_BUILD >= 4754
- if( p_context->time_base.num > 0 && p_context->time_base.den > 0 )
+ else if( p_context->time_base.num > 0 && p_context->time_base.den > 0 )
{
p_dec->fmt_out.video.i_frame_rate = p_context->time_base.den;
p_dec->fmt_out.video.i_frame_rate_base = p_context->time_base.num;
}
-#else
- if( p_context->frame_rate > 0 && p_context->frame_rate_base > 0 )
- {
- p_dec->fmt_out.video.i_frame_rate = p_context->frame_rate;
- p_dec->fmt_out.video.i_frame_rate_base = p_context->frame_rate_base;
- }
-#endif
p_pic = p_dec->pf_vout_buffer_new( p_dec );
-#ifdef LIBAVCODEC_PP
if( p_sys->p_pp && p_sys->b_pp && !p_sys->b_pp_init )
{
- E_(InitPostproc)( p_dec, p_sys->p_pp, p_context->width,
+ E_(InitPostproc)( p_sys->p_pp, p_context->width,
p_context->height, p_context->pix_fmt );
p_sys->b_pp_init = VLC_TRUE;
}
-#endif
return p_pic;
}
* opened (done after the first decoded frame).
*****************************************************************************/
int E_(InitVideoDec)( decoder_t *p_dec, AVCodecContext *p_context,
- AVCodec *p_codec, int i_codec_id, char *psz_namecodec )
+ AVCodec *p_codec, int i_codec_id, const char *psz_namecodec )
{
decoder_sys_t *p_sys;
- vlc_value_t lockval;
vlc_value_t val;
- var_Get( p_dec->p_libvlc, "avcodec", &lockval );
-
/* Allocate the memory needed to store the decoder's structure */
if( ( p_dec->p_sys = p_sys =
(decoder_sys_t *)malloc(sizeof(decoder_sys_t)) ) == NULL )
{
msg_Err( p_dec, "out of memory" );
- return VLC_EGENERIC;
+ return VLC_ENOMEM;
}
+ memset( p_sys, 0, sizeof(decoder_sys_t) );
p_dec->p_sys->p_context = p_context;
p_dec->p_sys->p_codec = p_codec;
var_Create( p_dec, "ffmpeg-vismv", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
var_Get( p_dec, "ffmpeg-vismv", &val );
-#if LIBAVCODEC_BUILD >= 4698
if( val.i_int ) p_sys->p_context->debug_mv = val.i_int;
-#endif
var_Create( p_dec, "ffmpeg-lowres", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
var_Get( p_dec, "ffmpeg-lowres", &val );
-#if LIBAVCODEC_BUILD >= 4723
if( val.i_int > 0 && val.i_int <= 2 ) p_sys->p_context->lowres = val.i_int;
-#endif
var_Create( p_dec, "ffmpeg-skiploopfilter",
VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
var_Get( p_dec, "ffmpeg-skiploopfilter", &val );
-#if LIBAVCODEC_BUILD >= 4758
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;
-#endif
/* ***** 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;
+ 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 )
+ {
+ case -1:
+ p_sys->p_context->skip_frame = AVDISCARD_NONE;
+ break;
+ case 0:
+ p_sys->p_context->skip_frame = AVDISCARD_DEFAULT;
+ break;
+ case 1:
+ p_sys->p_context->skip_frame = AVDISCARD_BIDIR;
+ break;
+ case 2:
+ p_sys->p_context->skip_frame = AVDISCARD_NONKEY;
+ break;
+ case 3:
+ p_sys->p_context->skip_frame = AVDISCARD_ALL;
+ break;
+ default:
+ p_sys->p_context->skip_frame = AVDISCARD_NONE;
+ break;
+ }
+ 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 )
+ {
+ case -1:
+ p_sys->p_context->skip_idct = AVDISCARD_NONE;
+ break;
+ case 0:
+ p_sys->p_context->skip_idct = AVDISCARD_DEFAULT;
+ break;
+ case 1:
+ p_sys->p_context->skip_idct = AVDISCARD_BIDIR;
+ break;
+ case 2:
+ p_sys->p_context->skip_idct = AVDISCARD_NONKEY;
+ break;
+ case 3:
+ p_sys->p_context->skip_idct = AVDISCARD_ALL;
+ break;
+ default:
+ p_sys->p_context->skip_idct = AVDISCARD_NONE;
+ break;
+ }
+ p_sys->i_skip_idct = p_sys->p_context->skip_idct;
+
/* ***** ffmpeg direct rendering ***** */
p_sys->b_direct_rendering = 0;
var_Create( p_dec, "ffmpeg-dr", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
p_sys->p_context->pix_fmt != PIX_FMT_YUV422P &&
/* H264 uses too many reference frames */
p_sys->i_codec_id != CODEC_ID_H264 &&
-#if LIBAVCODEC_BUILD >= 4698
!p_sys->p_context->debug_mv )
-#else
- 1 )
-#endif
{
/* Some codecs set pix_fmt only after the 1st frame has been decoded,
* so we need to do another check in ffmpeg_GetFrameBuf() */
p_sys->b_direct_rendering = 1;
}
-#ifdef LIBAVCODEC_PP
p_sys->p_pp = NULL;
p_sys->b_pp = p_sys->b_pp_async = p_sys->b_pp_init = VLC_FALSE;
p_sys->p_pp = E_(OpenPostproc)( p_dec, &p_sys->b_pp_async );
-#endif
/* ffmpeg doesn't properly release old pictures when frames are skipped */
//if( p_sys->b_hurry_up ) p_sys->b_direct_rendering = 0;
p_dec->fmt_out.i_codec = ffmpeg_PixFmtToChroma( p_context->pix_fmt );
/* Setup palette */
-#if LIBAVCODEC_BUILD >= 4688
if( p_dec->fmt_in.video.p_palette )
p_sys->p_context->palctrl =
(AVPaletteControl *)p_dec->fmt_in.video.p_palette;
else
p_sys->p_context->palctrl = &palette_control;
-#endif
/* ***** Open the codec ***** */
- vlc_mutex_lock( lockval.p_address );
+ vlc_mutex_t *lock = var_AcquireMutex( "avcodec" );
+ if( lock == NULL )
+ {
+ free( p_sys );
+ return VLC_ENOMEM;
+ }
+
if( avcodec_open( p_sys->p_context, p_sys->p_codec ) < 0 )
{
- vlc_mutex_unlock( lockval.p_address );
+ vlc_mutex_unlock( lock );
msg_Err( p_dec, "cannot open codec (%s)", p_sys->psz_namecodec );
free( p_sys );
return VLC_EGENERIC;
}
- vlc_mutex_unlock( lockval.p_address );
+ vlc_mutex_unlock( lock );
msg_Dbg( p_dec, "ffmpeg codec (%s) started", p_sys->psz_namecodec );
p_sys->i_late_frames = 0;
block_Release( p_block );
+
+ //if( p_block->i_flags & BLOCK_FLAG_CORRUPTED )
+ //avcodec_flush_buffers( p_sys->p_context );
return NULL;
}
p_sys->i_late_frames = 0;
}
- if( !p_dec->b_pace_control && p_sys->i_late_frames > 0 &&
- mdate() - p_sys->i_late_frames_start > I64C(5000000) )
+ if( !p_dec->b_pace_control && (p_sys->i_late_frames > 0) &&
+ (mdate() - p_sys->i_late_frames_start > I64C(5000000)) )
{
if( p_sys->i_pts )
{
p_block->i_pts = p_block->i_dts = 0;
}
- /* TODO implement it in a better way */
/* A good idea could be to decode all I pictures and see for the other */
if( !p_dec->b_pace_control &&
- p_sys->b_hurry_up && p_sys->i_late_frames > 4 )
+ p_sys->b_hurry_up &&
+ (p_sys->i_late_frames > 4) )
{
b_drawpicture = 0;
if( p_sys->i_late_frames < 8 )
{
- p_sys->p_context->hurry_up = 2;
+ p_sys->p_context->skip_frame =
+ (p_sys->i_skip_frame <= AVDISCARD_BIDIR) ?
+ AVDISCARD_BIDIR : p_sys->i_skip_frame;
}
else
{
/* picture too late, won't decode
* 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;
}
else
{
- if (!(p_block->i_flags & BLOCK_FLAG_PREROLL))
- {
+ if( p_sys->b_hurry_up )
+ p_sys->p_context->skip_frame = p_sys->i_skip_frame;
+ if( !(p_block->i_flags & BLOCK_FLAG_PREROLL) )
b_drawpicture = 1;
- p_sys->p_context->hurry_up = 0;
- }
else
- {
b_drawpicture = 0;
- p_sys->p_context->hurry_up = 1;
- }
}
-
if( p_sys->p_context->width <= 0 || p_sys->p_context->height <= 0 )
{
- p_sys->p_context->hurry_up = 5;
+ if( p_sys->b_hurry_up )
+ p_sys->p_context->skip_frame = p_sys->i_skip_frame;
b_null_size = VLC_TRUE;
}
}
p_sys->p_buffer = p_sys->p_buffer_orig;
p_sys->i_buffer = p_block->i_buffer;
- p_dec->p_vlc->pf_memcpy( p_sys->p_buffer, p_block->p_buffer,
+ p_dec->p_libvlc->pf_memcpy( p_sys->p_buffer, p_block->p_buffer,
p_block->i_buffer );
memset( p_sys->p_buffer + p_block->i_buffer, 0,
FF_INPUT_BUFFER_PADDING_SIZE );
i_used = avcodec_decode_video( p_sys->p_context, p_sys->p_ff_pic,
&b_gotpicture,
- p_sys->p_buffer, p_sys->i_buffer );
+ (uint8_t*)p_sys->p_buffer, p_sys->i_buffer );
if( b_null_size && p_sys->p_context->width > 0 &&
p_sys->p_context->height > 0 )
{
/* Reparse it to not drop the I frame */
b_null_size = VLC_FALSE;
- p_sys->p_context->hurry_up = 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,
- p_sys->p_buffer, p_sys->i_buffer );
+ (uint8_t*)p_sys->p_buffer, p_sys->i_buffer );
}
if( i_used < 0 )
}
/* Update frame late count (except when doing preroll) */
- if( p_sys->i_pts && p_sys->i_pts <= mdate() &&
+ if( p_sys->i_pts && decoder_GetDisplayDate(p_dec, p_sys->i_pts) <= mdate() &&
!(p_block->i_flags & BLOCK_FLAG_PREROLL) )
{
p_sys->i_late_frames++;
if( !b_drawpicture || !p_sys->p_ff_pic->linesize[0] )
{
/* Do not display the picture */
+ p_pic = (picture_t *)p_sys->p_ff_pic->opaque;
+ if( !b_drawpicture && p_pic )
+ p_dec->pf_vout_buffer_del( p_dec, p_pic );
continue;
}
if( !p_dec->fmt_in.video.i_aspect )
{
/* Fetch again the aspect ratio in case it changed */
-#if LIBAVCODEC_BUILD >= 4687
p_dec->fmt_out.video.i_aspect =
VOUT_ASPECT_FACTOR
* ( av_q2d(p_sys->p_context->sample_aspect_ratio)
= p_sys->p_context->sample_aspect_ratio.num;
p_dec->fmt_out.video.i_sar_den
= p_sys->p_context->sample_aspect_ratio.den;
-#else
- p_dec->fmt_out.video.i_aspect =
- VOUT_ASPECT_FACTOR * p_sys->p_context->aspect_ratio;
-#endif
+
if( p_dec->fmt_out.video.i_aspect == 0 )
{
p_dec->fmt_out.video.i_aspect = VOUT_ASPECT_FACTOR
p_pic->date = p_sys->i_pts;
/* interpolate the next PTS */
-#if LIBAVCODEC_BUILD >= 4754
if( p_dec->fmt_in.video.i_frame_rate > 0 &&
p_dec->fmt_in.video.i_frame_rate_base > 0 )
{
p_block->i_rate / INPUT_RATE_DEFAULT /
(2 * p_sys->p_context->time_base.den);
}
-#else
- if( p_sys->p_context->frame_rate > 0 )
- {
- p_sys->i_pts += I64C(1000000) *
- (2 + p_sys->p_ff_pic->repeat_pict) *
- p_sys->p_context->frame_rate_base *
- p_block->i_rate / INPUT_RATE_DEFAULT /
- (2 * p_sys->p_context->frame_rate);
- }
-#endif
if( p_sys->b_first_frame )
{
}
p_pic->i_nb_fields = 2 + p_sys->p_ff_pic->repeat_pict;
-#if LIBAVCODEC_BUILD >= 4685
p_pic->b_progressive = !p_sys->p_ff_pic->interlaced_frame;
p_pic->b_top_field_first = p_sys->p_ff_pic->top_field_first;
-#endif
return p_pic;
}
decoder_sys_t *p_sys = p_dec->p_sys;
if( p_sys->p_ff_pic ) av_free( p_sys->p_ff_pic );
-
-#ifdef LIBAVCODEC_PP
E_(ClosePostproc)( p_dec, p_sys->p_pp );
-#endif
-
free( p_sys->p_buffer_orig );
}
/* Now remove all atoms before the SMI one */
if( p_sys->p_context->extradata_size > 0x5a &&
- strncmp( &p[0x56], "SMI ", 4 ) )
+ strncmp( (char*)&p[0x56], "SMI ", 4 ) )
{
uint8_t *psz = &p[0x52];
/* FIXME handle 1 as long size */
break;
}
- if( !strncmp( &psz[4], "SMI ", 4 ) )
+ if( !strncmp( (char*)&psz[4], "SMI ", 4 ) )
{
memmove( &p[0x52], psz,
&p[p_sys->p_context->extradata_size] - psz );
uint8_t *p_dst, *p_src;
int i_src_stride, i_dst_stride;
-#ifdef LIBAVCODEC_PP
if( p_sys->p_pp && p_sys->b_pp )
- E_(PostprocPict)( p_dec, p_sys->p_pp, p_pic, p_ff_pic );
+ E_(PostprocPict)( p_sys->p_pp, p_pic, p_ff_pic );
else
-#endif
- for( i_plane = 0; i_plane < p_pic->i_planes; i_plane++ )
{
- p_src = p_ff_pic->data[i_plane];
- p_dst = p_pic->p[i_plane].p_pixels;
- i_src_stride = p_ff_pic->linesize[i_plane];
- i_dst_stride = p_pic->p[i_plane].i_pitch;
-
- i_size = __MIN( i_src_stride, i_dst_stride );
- for( i_line = 0; i_line < p_pic->p[i_plane].i_visible_lines;
- i_line++ )
+ for( i_plane = 0; i_plane < p_pic->i_planes; i_plane++ )
{
- p_dec->p_vlc->pf_memcpy( p_dst, p_src, i_size );
- p_src += i_src_stride;
- p_dst += i_dst_stride;
+ p_src = p_ff_pic->data[i_plane];
+ p_dst = p_pic->p[i_plane].p_pixels;
+ i_src_stride = p_ff_pic->linesize[i_plane];
+ i_dst_stride = p_pic->p[i_plane].i_pitch;
+
+ i_size = __MIN( i_src_stride, i_dst_stride );
+ for( i_line = 0; i_line < p_pic->p[i_plane].i_visible_lines;
+ i_line++ )
+ {
+ p_dec->p_libvlc->pf_memcpy( p_dst, p_src, i_size );
+ p_src += i_src_stride;
+ p_dst += i_dst_stride;
+ }
}
}
}
dest_pic.data[i] = p_pic->p[i].p_pixels;
dest_pic.linesize[i] = p_pic->p[i].i_pitch;
}
+#if !defined(HAVE_LIBSWSCALE_SWSCALE_H) && !defined(HAVE_FFMPEG_SWSCALE_H) && !defined(HAVE_LIBSWSCALE_TREE)
img_convert( &dest_pic, PIX_FMT_YUV420P,
(AVPicture *)p_ff_pic,
p_sys->p_context->pix_fmt,
p_sys->p_context->width,
p_sys->p_context->height );
+#endif
break;
default:
msg_Err( p_dec, "don't know how to convert chroma %i",
projects / vlc / blobdiff