X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fcodec%2Favcodec%2Fvideo.c;h=d88fc26261c6552134535f5ea0d0c997126fc1ec;hb=faca3e7c1b56dcb2e26ee82d55ea55f4ee2316d3;hp=8acbcaae892bf1ad289af1be2762b0f2fcb4e1f8;hpb=66bd92014e5d721d8fe74bfd69f601bfd228012a;p=vlc diff --git a/modules/codec/avcodec/video.c b/modules/codec/avcodec/video.c index 8acbcaae89..d88fc26261 100644 --- a/modules/codec/avcodec/video.c +++ b/modules/codec/avcodec/video.c @@ -31,12 +31,19 @@ #include #include -#include /* BITMAPINFOHEADER */ #include +#include +#include /* ffmpeg header */ #ifdef HAVE_LIBAVCODEC_AVCODEC_H # include +# ifdef HAVE_AVCODEC_VAAPI +# include +# endif +# ifdef HAVE_AVCODEC_DXVA2 +# include +# endif #elif defined(HAVE_FFMPEG_AVCODEC_H) # include #else @@ -44,6 +51,13 @@ #endif #include "avcodec.h" +#include "va.h" +#if defined(HAVE_AVCODEC_VAAPI) || defined(HAVE_AVCODEC_DXVA2) +# define HAVE_AVCODEC_VA +#endif +#if defined(FF_THREAD_FRAME) +# define HAVE_AVCODEC_MT +#endif /***************************************************************************** * decoder_sys_t : decoder descriptor @@ -53,8 +67,6 @@ struct decoder_sys_t FFMPEG_COMMON_MEMBERS /* Video decoder specific part */ - mtime_t input_pts; - mtime_t input_dts; mtime_t i_pts; AVFrame *p_ff_pic; @@ -70,22 +82,33 @@ struct decoder_sys_t /* for direct rendering */ bool b_direct_rendering; + int i_direct_rendering_used; bool b_has_b_frames; /* 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; /* */ bool b_flush; + + /* VA API */ + vlc_va_t *p_va; + + vlc_sem_t sem_mt; }; +#ifdef HAVE_AVCODEC_MT +# define wait_mt(s) vlc_sem_wait( &s->sem_mt ) +# define post_mt(s) vlc_sem_post( &s->sem_mt ) +#else +# define wait_mt(s) +# define post_mt(s) +#endif + /* FIXME (dummy palette for now) */ static const AVPaletteControl palette_control; @@ -98,7 +121,11 @@ static void ffmpeg_CopyPicture ( decoder_t *, picture_t *, AVFrame * ); static int ffmpeg_GetFrameBuf ( struct AVCodecContext *, AVFrame * ); static int ffmpeg_ReGetFrameBuf( struct AVCodecContext *, AVFrame * ); static void ffmpeg_ReleaseFrameBuf( struct AVCodecContext *, AVFrame * ); -static void ffmpeg_NextPts( decoder_t * ); + +#ifdef HAVE_AVCODEC_VA +static enum PixelFormat ffmpeg_GetFormat( AVCodecContext *, + const enum PixelFormat * ); +#endif static uint32_t ffmpeg_CodecTag( vlc_fourcc_t fcc ) { @@ -114,7 +141,7 @@ static uint32_t ffmpeg_CodecTag( vlc_fourcc_t fcc ) static inline picture_t *ffmpeg_NewPictBuf( decoder_t *p_dec, AVCodecContext *p_context ) { - picture_t *p_pic; + decoder_sys_t *p_sys = p_dec->p_sys; p_dec->fmt_out.video.i_width = p_context->width; p_dec->fmt_out.video.i_height = p_context->height; @@ -124,30 +151,30 @@ static inline picture_t *ffmpeg_NewPictBuf( decoder_t *p_dec, return NULL; /* invalid display size */ } - if( GetVlcChroma( &p_dec->fmt_out.video, p_context->pix_fmt ) != VLC_SUCCESS ) + if( !p_sys->p_va && GetVlcChroma( &p_dec->fmt_out.video, p_context->pix_fmt ) ) { - /* we are doomed, but not really, because most codecs set their pix_fmt much later */ - p_dec->fmt_out.i_codec = VLC_CODEC_I420; + /* we are doomed, but not really, because most codecs set their pix_fmt + * much later + * FIXME does it make sense here ? */ + p_dec->fmt_out.video.i_chroma = VLC_CODEC_I420; } p_dec->fmt_out.i_codec = p_dec->fmt_out.video.i_chroma; /* If an aspect-ratio was specified in the input format then force it */ - if( p_dec->fmt_in.video.i_aspect ) + if( p_dec->fmt_in.video.i_sar_num > 0 && p_dec->fmt_in.video.i_sar_den > 0 ) { - p_dec->fmt_out.video.i_aspect = p_dec->fmt_in.video.i_aspect; + p_dec->fmt_out.video.i_sar_num = p_dec->fmt_in.video.i_sar_num; + p_dec->fmt_out.video.i_sar_den = p_dec->fmt_in.video.i_sar_den; } else { - 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; - if( p_dec->fmt_out.video.i_aspect == 0 ) + if( !p_dec->fmt_out.video.i_sar_num || !p_dec->fmt_out.video.i_sar_den ) { - p_dec->fmt_out.video.i_aspect = - VOUT_ASPECT_FACTOR * p_context->width / p_context->height; + p_dec->fmt_out.video.i_sar_num = 1; + p_dec->fmt_out.video.i_sar_den = 1; } } @@ -165,9 +192,7 @@ static inline picture_t *ffmpeg_NewPictBuf( decoder_t *p_dec, p_dec->fmt_out.video.i_frame_rate_base = p_context->time_base.num; } - p_pic = decoder_NewPicture( p_dec ); - - return p_pic; + return decoder_NewPicture( p_dec ); } /***************************************************************************** @@ -180,64 +205,55 @@ int InitVideoDec( decoder_t *p_dec, AVCodecContext *p_context, 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; p_sys->psz_namecodec = psz_namecodec; p_sys->p_ff_pic = avcodec_alloc_frame(); p_sys->b_delayed_open = true; + p_sys->p_va = NULL; + vlc_sem_init( &p_sys->sem_mt, 0 ); /* ***** Fill p_context with init values ***** */ p_sys->p_context->codec_tag = ffmpeg_CodecTag( p_dec->fmt_in.i_original_fourcc ?: p_dec->fmt_in.i_codec ); /* ***** 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) - p_sys->p_context->error_resilience = - config_GetInt( p_dec, "ffmpeg-error-resilience" ); -#else + var_InheritInteger( p_dec, "ffmpeg-workaround-bugs" ); p_sys->p_context->error_recognition = - config_GetInt( p_dec, "ffmpeg-error-resilience" ); -#endif + var_InheritInteger( p_dec, "ffmpeg-error-resilience" ); - 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; @@ -260,9 +276,7 @@ int InitVideoDec( decoder_t *p_dec, AVCodecContext *p_context, } 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; @@ -287,13 +301,9 @@ int InitVideoDec( decoder_t *p_dec, AVCodecContext *p_context, /* ***** 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) && - /* 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->i_codec_id != CODEC_ID_H264 && + p_sys->i_direct_rendering_used = -1; + if( var_CreateGetBool( p_dec, "ffmpeg-dr" ) && + (p_sys->p_codec->capabilities & CODEC_CAP_DR1) && /* No idea why ... but this fixes flickering on some TSCC streams */ p_sys->i_codec_id != CODEC_ID_TSCC && !p_sys->p_context->debug_mv ) @@ -307,9 +317,13 @@ int InitVideoDec( decoder_t *p_dec, AVCodecContext *p_context, //if( p_sys->b_hurry_up ) p_sys->b_direct_rendering = false; if( p_sys->b_direct_rendering ) { - msg_Dbg( p_dec, "using direct rendering" ); + msg_Dbg( p_dec, "trying to use direct rendering" ); p_sys->p_context->flags |= CODEC_FLAG_EMU_EDGE; } + else + { + msg_Dbg( p_dec, "direct rendering is disabled" ); + } /* Always use our get_buffer wrapper so we can calculate the * PTS correctly */ @@ -318,21 +332,32 @@ int InitVideoDec( decoder_t *p_dec, AVCodecContext *p_context, p_sys->p_context->release_buffer = ffmpeg_ReleaseFrameBuf; p_sys->p_context->opaque = p_dec; +#ifdef HAVE_AVCODEC_MT + int i_thread_count = var_InheritInteger( p_dec, "ffmpeg-threads" ); + if( i_thread_count <= 0 ) + i_thread_count = vlc_GetCPUCount(); + msg_Dbg( p_dec, "allowing %d thread(s) for decoding", i_thread_count ); + p_sys->p_context->thread_count = i_thread_count; +#endif + +#ifdef HAVE_AVCODEC_VA + const bool b_use_hw = var_CreateGetBool( p_dec, "ffmpeg-hw" ); + if( b_use_hw ) + { +#ifdef HAVE_AVCODEC_MT + msg_Err( p_dec, "ffmpeg-hw is not compatible with ffmpeg-mt" ); +#else + p_sys->p_context->get_format = ffmpeg_GetFormat; +#endif + } +#endif + /* ***** misc init ***** */ - p_sys->input_pts = p_sys->input_dts = 0; - p_sys->i_pts = 0; + p_sys->i_pts = VLC_TS_INVALID; p_sys->b_has_b_frames = false; 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 ) - { - free( p_sys ); - return VLC_ENOMEM; - } /* Set output properties */ p_dec->fmt_out.i_cat = VIDEO_ES; @@ -380,7 +405,8 @@ int InitVideoDec( decoder_t *p_dec, AVCodecContext *p_context, if( ffmpeg_OpenCodec( p_dec ) < 0 ) { msg_Err( p_dec, "cannot open codec (%s)", p_sys->psz_namecodec ); - free( p_sys->p_buffer_orig ); + av_free( p_sys->p_ff_pic ); + vlc_sem_destroy( &p_sys->sem_mt ); free( p_sys ); return VLC_EGENERIC; } @@ -394,6 +420,7 @@ int InitVideoDec( decoder_t *p_dec, AVCodecContext *p_context, picture_t *DecodeVideo( decoder_t *p_dec, block_t **pp_block ) { decoder_sys_t *p_sys = p_dec->p_sys; + AVCodecContext *p_context = p_sys->p_context; int b_drawpicture; int b_null_size = false; block_t *p_block; @@ -401,7 +428,7 @@ picture_t *DecodeVideo( decoder_t *p_dec, block_t **pp_block ) if( !pp_block || !*pp_block ) return NULL; - if( !p_sys->p_context->extradata_size && p_dec->fmt_in.i_extra ) + if( !p_context->extradata_size && p_dec->fmt_in.i_extra ) { ffmpeg_InitCodec( p_dec ); if( p_sys->b_delayed_open ) @@ -420,16 +447,14 @@ picture_t *DecodeVideo( decoder_t *p_dec, block_t **pp_block ) 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->i_pts = VLC_TS_INVALID; /* To make sure we recover properly */ - p_sys->input_pts = p_sys->input_dts = 0; p_sys->i_late_frames = 0; - block_Release( p_block ); + if( p_block->i_flags & BLOCK_FLAG_DISCONTINUITY ) + avcodec_flush_buffers( p_context ); - //if( p_block->i_flags & BLOCK_FLAG_CORRUPTED ) - //avcodec_flush_buffers( p_sys->p_context ); + block_Release( p_block ); return NULL; } @@ -444,26 +469,17 @@ picture_t *DecodeVideo( decoder_t *p_dec, block_t **pp_block ) if( !p_dec->b_pace_control && (p_sys->i_late_frames > 0) && (mdate() - p_sys->i_late_frames_start > INT64_C(5000000)) ) { - if( p_sys->i_pts ) + if( p_sys->i_pts > VLC_TS_INVALID ) { msg_Err( p_dec, "more than 5 seconds of late video -> " "dropping frame (computer too slow ?)" ); - p_sys->i_pts = 0; /* To make sure we recover properly */ + p_sys->i_pts = VLC_TS_INVALID; /* To make sure we recover properly */ } block_Release( p_block ); p_sys->i_late_frames--; return NULL; } - if( p_block->i_pts > 0 || p_block->i_dts > 0 ) - { - p_sys->input_pts = p_block->i_pts; - p_sys->input_dts = p_block->i_dts; - - /* Make sure we don't reuse the same timestamps twice */ - p_block->i_pts = p_block->i_dts = 0; - } - /* 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 && @@ -472,7 +488,7 @@ picture_t *DecodeVideo( decoder_t *p_dec, block_t **pp_block ) b_drawpicture = 0; if( p_sys->i_late_frames < 12 ) { - p_sys->p_context->skip_frame = + p_context->skip_frame = (p_sys->i_skip_frame <= AVDISCARD_BIDIR) ? AVDISCARD_BIDIR : p_sys->i_skip_frame; } @@ -482,24 +498,23 @@ picture_t *DecodeVideo( decoder_t *p_dec, block_t **pp_block ) * 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; } } else { if( p_sys->b_hurry_up ) - p_sys->p_context->skip_frame = p_sys->i_skip_frame; + p_context->skip_frame = p_sys->i_skip_frame; if( !(p_block->i_flags & BLOCK_FLAG_PREROLL) ) b_drawpicture = 1; else b_drawpicture = 0; } - if( p_sys->p_context->width <= 0 || p_sys->p_context->height <= 0 ) + if( p_context->width <= 0 || p_context->height <= 0 ) { if( p_sys->b_hurry_up ) - p_sys->p_context->skip_frame = p_sys->i_skip_frame; + p_context->skip_frame = p_sys->i_skip_frame; b_null_size = true; } else if( !b_drawpicture ) @@ -508,14 +523,13 @@ picture_t *DecodeVideo( decoder_t *p_dec, block_t **pp_block ) * FIXME either our parser or ffmpeg is broken */ #if 0 if( p_sys->b_hurry_up ) - p_sys->p_context->skip_frame = __MAX( p_sys->p_context->skip_frame, + p_context->skip_frame = __MAX( p_context->skip_frame, AVDISCARD_NONREF ); #endif } /* - * Do the actual decoding now - */ + * Do the actual decoding now */ /* Don't forget that ffmpeg requires a little more bytes * that the real frame size */ @@ -523,73 +537,76 @@ picture_t *DecodeVideo( decoder_t *p_dec, block_t **pp_block ) { 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, + /* Set the PTS/DTS in the context reordered_opaque field */ + if( p_block->i_pts > VLC_TS_INVALID ) + p_context->reordered_opaque = (p_block->i_pts << 1) | 0; + else if( p_block->i_dts > VLC_TS_INVALID ) + p_context->reordered_opaque = (p_block->i_dts << 1) | 1; + else + p_context->reordered_opaque = INT64_MIN; + p_sys->p_ff_pic->reordered_opaque = p_context->reordered_opaque; + + /* Make sure we don't reuse the same timestamps twice */ + p_block->i_pts = + p_block->i_dts = VLC_TS_INVALID; + + post_mt( p_sys ); + + i_used = avcodec_decode_video( 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 && - !p_sys->b_flush ) + if( b_null_size && !p_sys->b_flush && + p_context->width > 0 && p_context->height > 0 ) { /* Reparse it to not drop the I frame */ b_null_size = false; 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 ); + p_context->skip_frame = p_sys->i_skip_frame; + i_used = avcodec_decode_video( p_context, p_sys->p_ff_pic, + &b_gotpicture, p_block->p_buffer, + p_block->i_buffer ); } + wait_mt( p_sys ); 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 || + p_context->thread_count > 1 ) { - 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 ) @@ -598,14 +615,63 @@ picture_t *DecodeVideo( decoder_t *p_dec, block_t **pp_block ) continue; } - /* Set the PTS */ - if( p_sys->p_ff_pic->pts ) - p_sys->i_pts = p_sys->p_ff_pic->pts; + /* Compute the PTS */ + mtime_t i_pts = VLC_TS_INVALID; + if( p_sys->p_ff_pic->reordered_opaque != INT64_MIN ) + { + mtime_t i_ts = p_sys->p_ff_pic->reordered_opaque >> 1; + bool b_dts = p_sys->p_ff_pic->reordered_opaque & 1; + if( b_dts ) + { + if( !p_context->has_b_frames || + !p_sys->b_has_b_frames || + !p_sys->p_ff_pic->reference || + p_sys->i_pts <= VLC_TS_INVALID ) + i_pts = i_ts; + } + else + { + i_pts = i_ts; + } + } + if( i_pts <= VLC_TS_INVALID ) + i_pts = p_sys->i_pts; + + /* Interpolate the next PTS */ + if( i_pts > VLC_TS_INVALID ) + p_sys->i_pts = i_pts; + if( p_sys->i_pts > VLC_TS_INVALID ) + { + /* interpolate the next PTS */ + if( p_dec->fmt_in.video.i_frame_rate > 0 && + p_dec->fmt_in.video.i_frame_rate_base > 0 ) + { + p_sys->i_pts += INT64_C(1000000) * + (2 + p_sys->p_ff_pic->repeat_pict) * + p_dec->fmt_in.video.i_frame_rate_base / + (2 * p_dec->fmt_in.video.i_frame_rate); + } + else if( p_context->time_base.den > 0 ) + { +#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52,20,0) + int i_tick = p_context->ticks_per_frame; + if( i_tick <= 0 ) + i_tick = 1; +#else + int i_tick = 1; +#endif + + p_sys->i_pts += INT64_C(1000000) * + (2 + p_sys->p_ff_pic->repeat_pict) * + i_tick * p_context->time_base.num / + (2 * p_context->time_base.den); + } + } /* Update frame late count (except when doing preroll) */ mtime_t i_display_date = 0; if( !(p_block->i_flags & BLOCK_FLAG_PREROLL) ) - i_display_date = decoder_GetDisplayDate( p_dec, p_sys->i_pts ); + i_display_date = decoder_GetDisplayDate( p_dec, i_pts ); if( i_display_date > 0 && i_display_date <= mdate() ) { @@ -618,21 +684,13 @@ picture_t *DecodeVideo( decoder_t *p_dec, block_t **pp_block ) p_sys->i_late_frames = 0; } - 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 ) - decoder_DeletePicture( p_dec, p_pic ); - - ffmpeg_NextPts( p_dec ); + if( !b_drawpicture || ( !p_sys->p_va && !p_sys->p_ff_pic->linesize[0] ) ) continue; - } if( !p_sys->p_ff_pic->opaque ) { /* Get a new picture */ - p_pic = ffmpeg_NewPictBuf( p_dec, p_sys->p_context ); + p_pic = ffmpeg_NewPictBuf( p_dec, p_context ); if( !p_pic ) { block_Release( p_block ); @@ -646,6 +704,7 @@ picture_t *DecodeVideo( decoder_t *p_dec, block_t **pp_block ) else { p_pic = (picture_t *)p_sys->p_ff_pic->opaque; + decoder_LinkPicture( p_dec, p_pic ); } /* Sanity check (seems to be needed for some streams) */ @@ -654,31 +713,25 @@ picture_t *DecodeVideo( decoder_t *p_dec, block_t **pp_block ) p_sys->b_has_b_frames = true; } - if( !p_dec->fmt_in.video.i_aspect ) + if( !p_dec->fmt_in.video.i_sar_num || !p_dec->fmt_in.video.i_sar_den ) { /* Fetch again the aspect ratio in case it changed */ - p_dec->fmt_out.video.i_aspect = - VOUT_ASPECT_FACTOR - * ( av_q2d(p_sys->p_context->sample_aspect_ratio) - * p_sys->p_context->width / p_sys->p_context->height ); p_dec->fmt_out.video.i_sar_num - = p_sys->p_context->sample_aspect_ratio.num; + = p_context->sample_aspect_ratio.num; p_dec->fmt_out.video.i_sar_den - = p_sys->p_context->sample_aspect_ratio.den; + = p_context->sample_aspect_ratio.den; - if( p_dec->fmt_out.video.i_aspect == 0 ) + if( !p_dec->fmt_out.video.i_sar_num || !p_dec->fmt_out.video.i_sar_den ) { - p_dec->fmt_out.video.i_aspect = VOUT_ASPECT_FACTOR - * p_sys->p_context->width / p_sys->p_context->height; + p_dec->fmt_out.video.i_sar_num = 1; + p_dec->fmt_out.video.i_sar_den = 1; } } /* Send decoded frame to vout */ - if( p_sys->i_pts ) + if( i_pts > VLC_TS_INVALID) { - p_pic->date = p_sys->i_pts; - - ffmpeg_NextPts( p_dec ); + p_pic->date = i_pts; if( p_sys->b_first_frame ) { @@ -731,8 +784,19 @@ void EndVideoDec( decoder_t *p_dec ) { decoder_sys_t *p_sys = p_dec->p_sys; + post_mt( p_sys ); + + /* 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 ); + + wait_mt( p_sys ); + if( p_sys->p_ff_pic ) av_free( p_sys->p_ff_pic ); - free( p_sys->p_buffer_orig ); + + if( p_sys->p_va ) + vlc_va_Delete( p_sys->p_va ); + vlc_sem_destroy( &p_sys->sem_mt ); } /***************************************************************************** @@ -819,11 +883,7 @@ static int ffmpeg_OpenCodec( decoder_t *p_dec ) } p_sys->p_context->width = p_dec->fmt_in.video.i_width; p_sys->p_context->height = p_dec->fmt_in.video.i_height; -#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) - p_sys->p_context->bits_per_sample = p_dec->fmt_in.video.i_bits_per_pixel; -#else p_sys->p_context->bits_per_coded_sample = p_dec->fmt_in.video.i_bits_per_pixel; -#endif int ret; vlc_avcodec_lock(); @@ -832,6 +892,27 @@ static int ffmpeg_OpenCodec( decoder_t *p_dec ) if( ret < 0 ) return VLC_EGENERIC; msg_Dbg( p_dec, "ffmpeg codec (%s) started", p_sys->psz_namecodec ); +#ifdef HAVE_AVCODEC_MT + switch( p_sys->p_context->active_thread_type ) + { + case FF_THREAD_FRAME: + msg_Dbg( p_dec, "using frame thread mode with %d threads", + p_sys->p_context->thread_count ); + break; + case FF_THREAD_SLICE: + msg_Dbg( p_dec, "using slice thread mode with %d threads", + p_sys->p_context->thread_count ); + break; + case 0: + if( p_sys->p_context->thread_count > 1 ) + msg_Warn( p_dec, "failed to enable threaded decoding" ); + break; + default: + msg_Warn( p_dec, "using unknown thread mode with %d threads", + p_sys->p_context->thread_count ); + break; + } +#endif p_sys->b_delayed_open = false; @@ -846,7 +927,11 @@ static void ffmpeg_CopyPicture( decoder_t *p_dec, { decoder_sys_t *p_sys = p_dec->p_sys; - if( TestFfmpegChroma( p_sys->p_context->pix_fmt, -1 ) == VLC_SUCCESS ) + if( p_sys->p_va ) + { + vlc_va_Extract( p_sys->p_va, p_pic, p_ff_pic ); + } + else if( TestFfmpegChroma( p_sys->p_context->pix_fmt, -1 ) == VLC_SUCCESS ) { int i_plane, i_size, i_line; uint8_t *p_dst, *p_src; @@ -883,8 +968,6 @@ static void ffmpeg_CopyPicture( decoder_t *p_dec, * It is used for direct rendering as well as to get the right PTS for each * decoded picture (even in indirect rendering mode). *****************************************************************************/ -static void ffmpeg_SetFrameBufferPts( decoder_t *p_dec, AVFrame *p_ff_pic ); - static int ffmpeg_GetFrameBuf( struct AVCodecContext *p_context, AVFrame *p_ff_pic ) { @@ -892,18 +975,45 @@ static int ffmpeg_GetFrameBuf( struct AVCodecContext *p_context, decoder_sys_t *p_sys = p_dec->p_sys; picture_t *p_pic; - /* Set picture PTS */ - ffmpeg_SetFrameBufferPts( p_dec, p_ff_pic ); - /* */ - p_ff_pic->opaque = 0; + p_ff_pic->reordered_opaque = p_context->reordered_opaque; + p_ff_pic->opaque = NULL; + + if( p_sys->p_va ) + { +#ifdef HAVE_AVCODEC_VA + /* hwaccel_context is not present in old fffmpeg version */ + if( vlc_va_Setup( p_sys->p_va, + &p_sys->p_context->hwaccel_context, &p_dec->fmt_out.video.i_chroma, + p_sys->p_context->width, p_sys->p_context->height ) ) + { + msg_Err( p_dec, "vlc_va_Setup failed" ); + return -1; + } +#else + assert(0); +#endif + + /* */ + p_ff_pic->type = FF_BUFFER_TYPE_USER; + /* FIXME what is that, should give good value */ + p_ff_pic->age = 256*256*256*64; // FIXME FIXME from ffmpeg - /* Not much to do in indirect rendering mode */ - if( !p_sys->b_direct_rendering ) + if( vlc_va_Get( p_sys->p_va, p_ff_pic ) ) + { + msg_Err( p_dec, "VaGrabSurface failed" ); + return -1; + } + return 0; + } + else if( !p_sys->b_direct_rendering ) { + /* Not much to do in indirect rendering mode. */ return avcodec_default_get_buffer( p_context, p_ff_pic ); } + wait_mt( p_sys ); + /* Some codecs set pix_fmt only after the 1st frame has been decoded, * so we need to check for direct rendering again. */ @@ -912,25 +1022,58 @@ static int ffmpeg_GetFrameBuf( struct AVCodecContext *p_context, avcodec_align_dimensions( p_sys->p_context, &i_width, &i_height ); if( GetVlcChroma( &p_dec->fmt_out.video, p_context->pix_fmt ) != VLC_SUCCESS || - p_sys->p_context->width % 16 || p_sys->p_context->height % 16 || - /* We only pad picture up to 16 */ - PAD(p_sys->p_context->width,16) < i_width || PAD(p_sys->p_context->height,16) < i_height || p_context->pix_fmt == PIX_FMT_PAL8 ) - { - msg_Dbg( p_dec, "disabling direct rendering" ); - p_sys->b_direct_rendering = false; - return avcodec_default_get_buffer( p_context, p_ff_pic ); - } + goto no_dr; + p_dec->fmt_out.i_codec = p_dec->fmt_out.video.i_chroma; /* Get a new picture */ - //p_sys->p_vout->render.b_allow_modify_pics = 0; p_pic = ffmpeg_NewPictBuf( p_dec, p_sys->p_context ); if( !p_pic ) + goto no_dr; + bool b_compatible = true; + if( p_pic->p[0].i_pitch / p_pic->p[0].i_pixel_pitch < i_width || + p_pic->p[0].i_lines < i_height ) + b_compatible = false; + for( int i = 0; i < p_pic->i_planes && b_compatible; i++ ) { - p_sys->b_direct_rendering = false; - return avcodec_default_get_buffer( p_context, p_ff_pic ); + unsigned i_align; + switch( p_sys->i_codec_id ) + { + case CODEC_ID_SVQ1: + case CODEC_ID_VP5: + case CODEC_ID_VP6: + case CODEC_ID_VP6F: + case CODEC_ID_VP6A: + i_align = 16; + break; + default: + i_align = i == 0 ? 16 : 8; + break; + } + if( p_pic->p[i].i_pitch % i_align ) + b_compatible = false; + if( (intptr_t)p_pic->p[i].p_pixels % i_align ) + b_compatible = false; + } + if( p_context->pix_fmt == PIX_FMT_YUV422P && b_compatible ) + { + if( 2 * p_pic->p[1].i_pitch != p_pic->p[0].i_pitch || + 2 * p_pic->p[2].i_pitch != p_pic->p[0].i_pitch ) + b_compatible = false; } + if( !b_compatible ) + { + decoder_DeletePicture( p_dec, p_pic ); + goto no_dr; + } + + if( p_sys->i_direct_rendering_used != 1 ) + { + msg_Dbg( p_dec, "using direct rendering" ); + p_sys->i_direct_rendering_used = 1; + } + p_sys->p_context->draw_horiz_band = NULL; p_ff_pic->opaque = (void*)p_pic; @@ -945,107 +1088,147 @@ static int ffmpeg_GetFrameBuf( struct AVCodecContext *p_context, p_ff_pic->linesize[2] = p_pic->p[2].i_pitch; p_ff_pic->linesize[3] = 0; - decoder_LinkPicture( p_dec, p_pic ); - /* FIXME what is that, should give good value */ p_ff_pic->age = 256*256*256*64; // FIXME FIXME from ffmpeg + post_mt( p_sys ); return 0; + +no_dr: + if( p_sys->i_direct_rendering_used != 0 ) + { + msg_Warn( p_dec, "disabling direct rendering" ); + p_sys->i_direct_rendering_used = 0; + } + post_mt( p_sys ); + return avcodec_default_get_buffer( p_context, p_ff_pic ); } static int ffmpeg_ReGetFrameBuf( struct AVCodecContext *p_context, AVFrame *p_ff_pic ) { - decoder_t *p_dec = (decoder_t *)p_context->opaque; - int i_ret; - - /* */ - p_ff_pic->pts = AV_NOPTS_VALUE; + p_ff_pic->reordered_opaque = p_context->reordered_opaque; /* We always use default reget function, it works perfectly fine */ - i_ret = avcodec_default_reget_buffer( p_context, p_ff_pic ); - - /* Set picture PTS if avcodec_default_reget_buffer didn't set it (through a - * ffmpeg_GetFrameBuf call) */ - if( !i_ret && p_ff_pic->pts == AV_NOPTS_VALUE ) - ffmpeg_SetFrameBufferPts( p_dec, p_ff_pic ); - - return i_ret; + return avcodec_default_reget_buffer( p_context, p_ff_pic ); } -static void ffmpeg_SetFrameBufferPts( decoder_t *p_dec, AVFrame *p_ff_pic ) +static void ffmpeg_ReleaseFrameBuf( struct AVCodecContext *p_context, + AVFrame *p_ff_pic ) { + decoder_t *p_dec = (decoder_t *)p_context->opaque; decoder_sys_t *p_sys = p_dec->p_sys; - /* Set picture PTS */ - if( p_sys->input_pts ) + if( p_sys->p_va ) { - p_ff_pic->pts = p_sys->input_pts; + vlc_va_Release( p_sys->p_va, p_ff_pic ); + + /* */ + for( int i = 0; i < 4; i++ ) + p_ff_pic->data[i] = NULL; } - else if( p_sys->input_dts ) + else if( !p_ff_pic->opaque ) { - /* Some demuxers only set the dts so let's try to find a useful - * timestamp from this */ - if( !p_sys->p_context->has_b_frames || !p_sys->b_has_b_frames || - !p_ff_pic->reference || !p_sys->i_pts ) - { - p_ff_pic->pts = p_sys->input_dts; - } - else - { - p_ff_pic->pts = 0; - } + avcodec_default_release_buffer( p_context, p_ff_pic ); } else { - p_ff_pic->pts = 0; - } + picture_t *p_pic = (picture_t*)p_ff_pic->opaque; - if( p_sys->i_pts ) /* make sure 1st frame has a pts > 0 */ - { - p_sys->input_pts = p_sys->input_dts = 0; + decoder_UnlinkPicture( p_dec, p_pic ); + + /* */ + for( int i = 0; i < 4; i++ ) + p_ff_pic->data[i] = NULL; } } -static void ffmpeg_ReleaseFrameBuf( struct AVCodecContext *p_context, - AVFrame *p_ff_pic ) +#ifdef HAVE_AVCODEC_VA +static enum PixelFormat ffmpeg_GetFormat( AVCodecContext *p_codec, + const enum PixelFormat *pi_fmt ) { - decoder_t *p_dec = (decoder_t *)p_context->opaque; + decoder_t *p_dec = p_codec->opaque; + decoder_sys_t *p_sys = p_dec->p_sys; - if( !p_ff_pic->opaque ) + if( p_sys->p_va ) { - avcodec_default_release_buffer( p_context, p_ff_pic ); - return; + vlc_va_Delete( p_sys->p_va ); + p_sys->p_va = NULL; } - picture_t *p_pic = (picture_t*)p_ff_pic->opaque; - decoder_UnlinkPicture( p_dec, p_pic ); - - p_ff_pic->data[0] = NULL; - p_ff_pic->data[1] = NULL; - p_ff_pic->data[2] = NULL; - p_ff_pic->data[3] = NULL; -} + /* Try too look for a supported hw acceleration */ + for( int i = 0; pi_fmt[i] != PIX_FMT_NONE; i++ ) + { + static const char *ppsz_name[PIX_FMT_NB] = { + [PIX_FMT_VDPAU_H264] = "PIX_FMT_VDPAU_H264", + [PIX_FMT_VAAPI_IDCT] = "PIX_FMT_VAAPI_IDCT", + [PIX_FMT_VAAPI_VLD] = "PIX_FMT_VAAPI_VLD", + [PIX_FMT_VAAPI_MOCO] = "PIX_FMT_VAAPI_MOCO", +#ifdef HAVE_AVCODEC_DXVA2 + [PIX_FMT_DXVA2_VLD] = "PIX_FMT_DXVA2_VLD", +#endif + [PIX_FMT_YUYV422] = "PIX_FMT_YUYV422", + [PIX_FMT_YUV420P] = "PIX_FMT_YUV420P", + }; + msg_Dbg( p_dec, "Available decoder output format %d (%s)", pi_fmt[i], ppsz_name[pi_fmt[i]] ?: "Unknown" ); -static void ffmpeg_NextPts( decoder_t *p_dec ) -{ - decoder_sys_t *p_sys = p_dec->p_sys; + /* Only VLD supported */ + if( pi_fmt[i] == PIX_FMT_VAAPI_VLD ) + { + if( !var_InheritBool( p_dec, "xlib" ) ) + { + msg_Warn( p_dec, "Ignoring VA API" ); + continue; + } +#ifdef HAVE_AVCODEC_VAAPI + msg_Dbg( p_dec, "Trying VA API" ); + p_sys->p_va = vlc_va_NewVaapi( p_sys->i_codec_id ); + if( !p_sys->p_va ) + msg_Warn( p_dec, "Failed to open VA API" ); +#else + continue; +#endif + } +#ifdef HAVE_AVCODEC_DXVA2 + if( pi_fmt[i] == PIX_FMT_DXVA2_VLD ) + { + msg_Dbg( p_dec, "Trying DXVA2" ); + p_sys->p_va = vlc_va_NewDxva2( VLC_OBJECT(p_dec), p_sys->i_codec_id ); + if( !p_sys->p_va ) + msg_Warn( p_dec, "Failed to open DXVA2" ); + } +#endif - if( p_sys->i_pts <= 0 ) - return; + if( p_sys->p_va && + p_sys->p_context->width > 0 && p_sys->p_context->height > 0 ) + { + /* We try to call vlc_va_Setup when possible to detect errors when + * possible (later is too late) */ + if( vlc_va_Setup( p_sys->p_va, + &p_sys->p_context->hwaccel_context, + &p_dec->fmt_out.video.i_chroma, + p_sys->p_context->width, p_sys->p_context->height ) ) + { + msg_Err( p_dec, "vlc_va_Setup failed" ); + vlc_va_Delete( p_sys->p_va ); + p_sys->p_va = NULL; + } + } - /* interpolate the next PTS */ - if( p_dec->fmt_in.video.i_frame_rate > 0 && - p_dec->fmt_in.video.i_frame_rate_base > 0 ) - { - p_sys->i_pts += INT64_C(1000000) * - (2 + p_sys->p_ff_pic->repeat_pict) * - p_dec->fmt_in.video.i_frame_rate_base / - (2 * p_dec->fmt_in.video.i_frame_rate); - } - else if( p_sys->p_context->time_base.den > 0 ) - { - p_sys->i_pts += INT64_C(1000000) * - (2 + p_sys->p_ff_pic->repeat_pict) * - p_sys->p_context->time_base.num / - (2 * p_sys->p_context->time_base.den); + if( p_sys->p_va ) + { + if( p_sys->p_va->description ) + msg_Info( p_dec, "Using %s for hardware decoding.", p_sys->p_va->description ); + + /* FIXME this will disabled direct rendering + * even if a new pixel format is renegociated + */ + p_sys->b_direct_rendering = false; + p_sys->p_context->draw_horiz_band = NULL; + return pi_fmt[i]; + } } + + /* Fallback to default behaviour */ + return avcodec_default_get_format( p_codec, pi_fmt ); } +#endif +