X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=inline;f=modules%2Fcodec%2Favcodec%2Fvideo.c;h=6c9b865134cf3257412b5ed2e5a18de5050a7cca;hb=066e381ff4047e994ad2335d55e5cce33c5c90a1;hp=9f552baa6b4c229764ea5e7af42a27c3ca1b31e6;hpb=e00e93c3bc2d9cf60404ac71060d26c3447782c4;p=vlc diff --git a/modules/codec/avcodec/video.c b/modules/codec/avcodec/video.c index 9f552baa6b..6c9b865134 100644 --- a/modules/codec/avcodec/video.c +++ b/modules/codec/avcodec/video.c @@ -32,6 +32,7 @@ #include #include #include +#include #include /* ffmpeg header */ @@ -60,11 +61,9 @@ *****************************************************************************/ struct decoder_sys_t { - FFMPEG_COMMON_MEMBERS + AVCODEC_COMMON_MEMBERS /* Video decoder specific part */ - mtime_t input_pts; - mtime_t input_dts; mtime_t i_pts; AVFrame *p_ff_pic; @@ -95,8 +94,18 @@ struct decoder_sys_t /* 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; @@ -104,12 +113,10 @@ static const AVPaletteControl palette_control; * Local prototypes *****************************************************************************/ static void ffmpeg_InitCodec ( decoder_t * ); -static int ffmpeg_OpenCodec ( decoder_t * ); 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 *, @@ -200,8 +207,8 @@ int InitVideoDec( decoder_t *p_dec, AVCodecContext *p_context, 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_codec->type = AVMEDIA_TYPE_VIDEO; + p_context->codec_type = AVMEDIA_TYPE_VIDEO; p_context->codec_id = i_codec_id; p_sys->p_context = p_context; p_sys->p_codec = p_codec; @@ -210,6 +217,7 @@ int InitVideoDec( decoder_t *p_dec, AVCodecContext *p_context, 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 ); @@ -217,13 +225,8 @@ int InitVideoDec( decoder_t *p_dec, AVCodecContext *p_context, /* ***** Get configuration of ffmpeg plugin ***** */ p_sys->p_context->workaround_bugs = var_InheritInteger( p_dec, "ffmpeg-workaround-bugs" ); -#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT( 52, 0, 0 ) - p_sys->p_context->error_resilience = - var_InheritInteger( p_dec, "ffmpeg-error-resilience" ); -#else p_sys->p_context->error_recognition = var_InheritInteger( p_dec, "ffmpeg-error-resilience" ); -#endif if( var_CreateGetBool( p_dec, "grayscale" ) ) p_sys->p_context->flags |= CODEC_FLAG_GRAY; @@ -255,7 +258,7 @@ int InitVideoDec( decoder_t *p_dec, AVCodecContext *p_context, p_sys->p_context->skip_frame = AVDISCARD_DEFAULT; break; case 1: - p_sys->p_context->skip_frame = AVDISCARD_BIDIR; + p_sys->p_context->skip_frame = AVDISCARD_NONREF; break; case 2: p_sys->p_context->skip_frame = AVDISCARD_NONKEY; @@ -278,7 +281,7 @@ int InitVideoDec( decoder_t *p_dec, AVCodecContext *p_context, p_sys->p_context->skip_idct = AVDISCARD_DEFAULT; break; case 1: - p_sys->p_context->skip_idct = AVDISCARD_BIDIR; + p_sys->p_context->skip_idct = AVDISCARD_NONREF; break; case 2: p_sys->p_context->skip_idct = AVDISCARD_NONKEY; @@ -298,7 +301,12 @@ int InitVideoDec( decoder_t *p_dec, AVCodecContext *p_context, 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->i_codec_id != CODEC_ID_TSCC && p_sys->i_codec_id != CODEC_ID_CSCD && +#if (LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 52, 68, 2 ) ) && (LIBAVCODEC_VERSION_INT < AV_VERSION_INT( 52, 100, 1 ) ) + /* avcodec native vp8 decode doesn't handle EMU_EDGE flag, and I + don't have idea howto implement fallback to libvpx decoder */ + p_sys->i_codec_id != CODEC_ID_VP8 && +#endif !p_sys->p_context->debug_mv ) { /* Some codecs set pix_fmt only after the 1st frame has been decoded, @@ -325,14 +333,35 @@ 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 - if( var_CreateGetBool( p_dec, "ffmpeg-hw" ) ) + const bool b_use_hw = var_CreateGetBool( p_dec, "ffmpeg-hw" ); + if( b_use_hw && + (i_codec_id == CODEC_ID_MPEG1VIDEO || i_codec_id == CODEC_ID_MPEG2VIDEO || + i_codec_id == CODEC_ID_MPEG4 || + i_codec_id == CODEC_ID_H264 || + i_codec_id == CODEC_ID_VC1 || i_codec_id == CODEC_ID_WMV3) ) + { +#ifdef HAVE_AVCODEC_MT + if( p_sys->p_context->thread_type & FF_THREAD_FRAME ) + { + msg_Warn( p_dec, "threaded frame decoding is not compatible with ffmpeg-hw, disabled" ); + p_sys->p_context->thread_type &= ~FF_THREAD_FRAME; + } +#endif p_sys->p_context->get_format = ffmpeg_GetFormat; + } #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; @@ -385,6 +414,7 @@ int InitVideoDec( decoder_t *p_dec, AVCodecContext *p_context, { msg_Err( p_dec, "cannot open codec (%s)", p_sys->psz_namecodec ); av_free( p_sys->p_ff_pic ); + vlc_sem_destroy( &p_sys->sem_mt ); free( p_sys ); return VLC_EGENERIC; } @@ -398,6 +428,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; @@ -405,7 +436,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 ) @@ -424,15 +455,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_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; } @@ -447,26 +477,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 && @@ -475,9 +496,9 @@ 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_sys->i_skip_frame <= AVDISCARD_BIDIR) ? - AVDISCARD_BIDIR : p_sys->i_skip_frame; + p_context->skip_frame = + (p_sys->i_skip_frame <= AVDISCARD_NONREF) ? + AVDISCARD_NONREF : p_sys->i_skip_frame; } else { @@ -491,17 +512,17 @@ picture_t *DecodeVideo( decoder_t *p_dec, block_t **pp_block ) 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 ) @@ -510,14 +531,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 */ @@ -539,23 +559,40 @@ picture_t *DecodeVideo( decoder_t *p_dec, block_t **pp_block ) { int i_used, b_gotpicture; picture_t *p_pic; + AVPacket pkt; + + /* 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_sys->p_context, p_sys->p_ff_pic, - &b_gotpicture, - p_block->i_buffer <= 0 && p_sys->b_flush ? NULL : p_block->p_buffer, p_block->i_buffer ); + av_init_packet( &pkt ); + pkt.data = p_block->p_buffer; + pkt.size = p_block->i_buffer; + i_used = avcodec_decode_video2( p_context, p_sys->p_ff_pic, + &b_gotpicture, &pkt ); - 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, p_block->p_buffer, - p_block->i_buffer ); + p_context->skip_frame = p_sys->i_skip_frame; + i_used = avcodec_decode_video2( p_context, p_sys->p_ff_pic, + &b_gotpicture, &pkt ); } + wait_mt( p_sys ); if( p_sys->b_flush ) p_sys->b_first_frame = true; @@ -571,7 +608,8 @@ picture_t *DecodeVideo( decoder_t *p_dec, block_t **pp_block ) block_Release( p_block ); return NULL; } - else if( i_used > p_block->i_buffer ) + else if( i_used > p_block->i_buffer || + p_context->thread_count > 1 ) { i_used = p_block->i_buffer; } @@ -587,14 +625,74 @@ 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; + /* Sanity check (seems to be needed for some streams) */ + if( p_sys->p_ff_pic->pict_type == FF_B_TYPE ) + { + p_sys->b_has_b_frames = true; + } + + /* 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; + + /* Guess what ? The rules are different for Real Video :( */ + if( (p_dec->fmt_in.i_codec == VLC_CODEC_RV30 || + p_dec->fmt_in.i_codec == VLC_CODEC_RV40) && + p_sys->b_has_b_frames ) + { + i_pts = VLC_TS_INVALID; + if(p_sys->p_ff_pic->reference) 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 ) + { + int i_tick = p_context->ticks_per_frame; + if( i_tick <= 0 ) + i_tick = 1; + + 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() ) { @@ -608,20 +706,12 @@ picture_t *DecodeVideo( decoder_t *p_dec, block_t **pp_block ) } if( !b_drawpicture || ( !p_sys->p_va && !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 ); 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 ); @@ -635,21 +725,16 @@ picture_t *DecodeVideo( decoder_t *p_dec, block_t **pp_block ) else { p_pic = (picture_t *)p_sys->p_ff_pic->opaque; - } - - /* Sanity check (seems to be needed for some streams) */ - if( p_sys->p_ff_pic->pict_type == FF_B_TYPE ) - { - p_sys->b_has_b_frames = true; + decoder_LinkPicture( p_dec, p_pic ); } 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_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_sar_num || !p_dec->fmt_out.video.i_sar_den ) { @@ -659,11 +744,9 @@ picture_t *DecodeVideo( decoder_t *p_dec, block_t **pp_block ) } /* 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 ) { @@ -716,14 +799,22 @@ 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 ); if( p_sys->p_va ) + { vlc_va_Delete( p_sys->p_va ); + p_sys->p_va = NULL; + } + vlc_sem_destroy( &p_sys->sem_mt ); } /***************************************************************************** @@ -790,44 +881,6 @@ static void ffmpeg_InitCodec( decoder_t *p_dec ) } } -/***************************************************************************** - * ffmpeg_OpenCodec: - *****************************************************************************/ -static int ffmpeg_OpenCodec( decoder_t *p_dec ) -{ - decoder_sys_t *p_sys = p_dec->p_sys; - - if( p_sys->p_context->extradata_size <= 0 ) - { - if( p_sys->i_codec_id == CODEC_ID_VC1 || - p_sys->i_codec_id == CODEC_ID_VORBIS || - p_sys->i_codec_id == CODEC_ID_THEORA ) - { - msg_Warn( p_dec, "waiting for extra data for codec %s", - p_sys->psz_namecodec ); - return 1; - } - } - 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 < AV_VERSION_INT(52, 0, 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(); - ret = avcodec_open( p_sys->p_context, p_sys->p_codec ); - vlc_avcodec_unlock(); - if( ret < 0 ) - return VLC_EGENERIC; - msg_Dbg( p_dec, "ffmpeg codec (%s) started", p_sys->psz_namecodec ); - - p_sys->b_delayed_open = false; - - return VLC_SUCCESS; -} /***************************************************************************** * ffmpeg_CopyPicture: copy a picture from ffmpeg internal buffers to a * picture_t structure (when not in direct rendering mode). @@ -878,8 +931,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 ) { @@ -887,19 +938,17 @@ 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->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 */ + /* hwaccel_context is not present in old ffmpeg 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 ) ) + &p_context->hwaccel_context, &p_dec->fmt_out.video.i_chroma, + p_context->width, p_context->height ) ) { msg_Err( p_dec, "vlc_va_Setup failed" ); return -1; @@ -926,12 +975,13 @@ static int ffmpeg_GetFrameBuf( struct AVCodecContext *p_context, 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. */ - int i_width = p_sys->p_context->width; - int i_height = p_sys->p_context->height; - avcodec_align_dimensions( p_sys->p_context, &i_width, &i_height ); + int i_width = p_context->width; + int i_height = p_context->height; + avcodec_align_dimensions( p_context, &i_width, &i_height ); if( GetVlcChroma( &p_dec->fmt_out.video, p_context->pix_fmt ) != VLC_SUCCESS || p_context->pix_fmt == PIX_FMT_PAL8 ) @@ -940,7 +990,7 @@ static int ffmpeg_GetFrameBuf( struct AVCodecContext *p_context, p_dec->fmt_out.i_codec = p_dec->fmt_out.video.i_chroma; /* 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 ) goto no_dr; bool b_compatible = true; @@ -986,7 +1036,7 @@ static int ffmpeg_GetFrameBuf( struct AVCodecContext *p_context, p_sys->i_direct_rendering_used = 1; } - p_sys->p_context->draw_horiz_band = NULL; + p_context->draw_horiz_band = NULL; p_ff_pic->opaque = (void*)p_pic; p_ff_pic->type = FF_BUFFER_TYPE_USER; @@ -1000,11 +1050,10 @@ 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: @@ -1013,59 +1062,15 @@ no_dr: 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; -} - -static void ffmpeg_SetFrameBufferPts( decoder_t *p_dec, AVFrame *p_ff_pic ) -{ - decoder_sys_t *p_sys = p_dec->p_sys; - - /* Set picture PTS */ - if( p_sys->input_pts ) - { - p_ff_pic->pts = p_sys->input_pts; - } - else if( p_sys->input_dts ) - { - /* 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; - } - } - else - { - p_ff_pic->pts = 0; - } - - if( p_sys->i_pts ) /* make sure 1st frame has a pts > 0 */ - { - p_sys->input_pts = p_sys->input_dts = 0; - } + return avcodec_default_reget_buffer( p_context, p_ff_pic ); } static void ffmpeg_ReleaseFrameBuf( struct AVCodecContext *p_context, @@ -1077,65 +1082,31 @@ static void ffmpeg_ReleaseFrameBuf( struct AVCodecContext *p_context, if( p_sys->p_va ) { 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_ff_pic->opaque ) { - avcodec_default_release_buffer( p_context, p_ff_pic ); + /* We can end up here without the AVFrame being allocated by + * avcodec_default_get_buffer() if VA is used and the frame is + * released when the decoder is closed + */ + if( p_ff_pic->type == FF_BUFFER_TYPE_INTERNAL ) + avcodec_default_release_buffer( p_context, p_ff_pic ); } else { picture_t *p_pic = (picture_t*)p_ff_pic->opaque; decoder_UnlinkPicture( p_dec, p_pic ); - - /* */ - for( int i = 0; i < 4; i++ ) - p_ff_pic->data[i] = NULL; - } -} - -static void ffmpeg_NextPts( decoder_t *p_dec ) -{ - decoder_sys_t *p_sys = p_dec->p_sys; - - if( p_sys->i_pts <= 0 ) - return; - - /* 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 ) - { -#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52,20,0) - int i_tick = p_sys->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_sys->p_context->time_base.num / - (2 * p_sys->p_context->time_base.den); } + for( int i = 0; i < 4; i++ ) + p_ff_pic->data[i] = NULL; } #ifdef HAVE_AVCODEC_VA -static enum PixelFormat ffmpeg_GetFormat( AVCodecContext *p_codec, +static enum PixelFormat ffmpeg_GetFormat( AVCodecContext *p_context, const enum PixelFormat *pi_fmt ) { - decoder_t *p_dec = p_codec->opaque; + decoder_t *p_dec = p_context->opaque; decoder_sys_t *p_sys = p_dec->p_sys; if( p_sys->p_va ) @@ -1163,9 +1134,14 @@ static enum PixelFormat ffmpeg_GetFormat( AVCodecContext *p_codec, /* 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 ); + p_sys->p_va = vlc_va_NewVaapi( VLC_OBJECT(p_dec), p_sys->i_codec_id ); if( !p_sys->p_va ) msg_Warn( p_dec, "Failed to open VA API" ); #else @@ -1183,14 +1159,14 @@ static enum PixelFormat ffmpeg_GetFormat( AVCodecContext *p_codec, #endif if( p_sys->p_va && - p_sys->p_context->width > 0 && p_sys->p_context->height > 0 ) + p_context->width > 0 && 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_context->hwaccel_context, &p_dec->fmt_out.video.i_chroma, - p_sys->p_context->width, p_sys->p_context->height ) ) + p_context->width, p_context->height ) ) { msg_Err( p_dec, "vlc_va_Setup failed" ); vlc_va_Delete( p_sys->p_va ); @@ -1207,13 +1183,13 @@ static enum PixelFormat ffmpeg_GetFormat( AVCodecContext *p_codec, * even if a new pixel format is renegociated */ p_sys->b_direct_rendering = false; - p_sys->p_context->draw_horiz_band = NULL; + p_context->draw_horiz_band = NULL; return pi_fmt[i]; } } /* Fallback to default behaviour */ - return avcodec_default_get_format( p_codec, pi_fmt ); + return avcodec_default_get_format( p_context, pi_fmt ); } #endif