Check "xlib" before trying vaapi.

[vlc] / modules / codec / avcodec / video.c

diff --git a/modules/codec/avcodec/video.c b/modules/codec/avcodec/video.c
index 55b205c58ef51db2fe8c62f0354d8c9e58953a61..d88fc26261c6552134535f5ea0d0c997126fc1ec 100644 (file)
--- a/modules/codec/avcodec/video.c
+++ b/modules/codec/avcodec/video.c
@@ -32,6 +32,7 @@
 #include <vlc_common.h>
 #include <vlc_codec.h>
 #include <vlc_avcodec.h>
+#include <vlc_cpu.h>
 #include <assert.h>
 
 /* ffmpeg header */
@@ -54,6 +55,9 @@
 #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
@@ -93,8 +97,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;
 
@@ -207,6 +221,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 );
@@ -317,10 +332,25 @@ 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 )
+    {
+#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->i_pts = VLC_TS_INVALID;
@@ -376,6 +406,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;
     }
@@ -420,10 +451,10 @@ picture_t *DecodeVideo( decoder_t *p_dec, block_t **pp_block )
 
         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_context );
+        block_Release( p_block );
         return NULL;
     }
 
@@ -528,11 +559,13 @@ picture_t *DecodeVideo( decoder_t *p_dec, block_t **pp_block )
             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,
@@ -549,6 +582,7 @@ picture_t *DecodeVideo( decoder_t *p_dec, block_t **pp_block )
                                            &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;
@@ -564,7 +598,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;
         }
@@ -749,14 +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 );
 
     if( p_sys->p_va )
         vlc_va_Delete( p_sys->p_va );
+    vlc_sem_destroy( &p_sys->sem_mt );
 }
 
 /*****************************************************************************
@@ -852,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;
 
@@ -951,6 +1012,8 @@ 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. */
 
@@ -1028,6 +1091,7 @@ static int ffmpeg_GetFrameBuf( struct AVCodecContext *p_context,
     /* 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:
@@ -1036,6 +1100,7 @@ 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 )
@@ -1108,6 +1173,11 @@ 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 );