update vaapi - vainfo

- add enable vainfo detection checkbox in config
- defined PT_DYN_INT to load integer field from function
- PT_DYN_INT must be paired with dyn_i
- show only VAAPI codecs advertised by vainfo
- defined two invisible fields: ui and uilp used for UI enable/disable features
- check if bitrate is greater than max_bitrate (fix to avoid tvh crash)
- vp8, vp9 separate Global Quality from Quality
- load quality and max B frames filters from vainfo
- UI has several constrains or warnings implemented using vainfo
- separated 'b_depth' from 'bf'

Author: uknunknown

src/config.c

@@ -56,6 +56,9 @@ struct config config;
 static char config_lock[PATH_MAX];
 static int config_lock_fd;
 static int config_scanfile_ok;
+#if ENABLE_VAAPI
+int vainfo_probe_enabled;
+#endif
 
 /* *************************************************************************
  * Config migration
@@ -1896,6 +1899,9 @@ config_init ( int backup )
     if (config_migrate(backup))
       config_check();
   }
+#if ENABLE_VAAPI
+  vainfo_probe_enabled = config.enable_vainfo;
+#endif
   tvhinfo(LS_CONFIG, "loaded");
 }
 
@@ -2754,6 +2760,19 @@ const idclass_t config_class = {
       .opts   = PO_EXPERT,
       .group  = 7,
     },
+#if ENABLE_VAAPI
+    {
+      .type   = PT_BOOL,
+      .id     = "enable_vainfo",
+      .name   = N_("Enable vainfo detection"),
+      .desc   = N_("Enable vainfo detection in order to show only "
+                   "encoders that are advertised by VAAPI driver.\n"
+                   "NOTE: After save, Tvheadend restart is required!"),
+      .off    = offsetof(config_t, enable_vainfo),
+      .opts   = PO_EXPERT,
+      .group  = 7,
+    },
+#endif
     {
       .type   = PT_STR,
       .id     = "wizard",

src/config.h

@@ -78,6 +78,9 @@ typedef struct config {
   uint32_t hdhomerun_server_tuner_count;
   char *hdhomerun_server_model_name;
   int hdhomerun_server_enable;
+#if ENABLE_VAAPI
+  int enable_vainfo;
+  #endif
 } config_t;
 
 extern const idclass_t config_class;

src/idnode.c

@@ -391,6 +391,7 @@ idnode_get_u32
       ptr = ((void*)self) + p->off;
     switch (p->type) {
       case PT_INT:
+      case PT_DYN_INT:
       case PT_BOOL:
         *u32 = *(int*)ptr;
         return 0;
@@ -425,6 +426,7 @@ idnode_get_s64
       ptr = ((void*)self) + p->off;
     switch (p->type) {
       case PT_INT:
+      case PT_DYN_INT:
       case PT_BOOL:
         *s64 = *(int*)ptr;
         return 0;
@@ -495,6 +497,7 @@ idnode_get_dbl
       ptr = ((void*)self) + p->off;
     switch (p->type) {
       case PT_INT:
+      case PT_DYN_INT:
       case PT_BOOL:
         *dbl = *(int*)ptr;
         return 0;
@@ -761,6 +764,7 @@ idnode_cmp_sort
       }
       break;
     case PT_INT:
+    case PT_DYN_INT:
     case PT_U16:
     case PT_BOOL:
     case PT_PERM:

src/main.c

@@ -804,7 +804,9 @@ main(int argc, char **argv)
   } randseed;
   struct rlimit rl;
   extern int dvb_bouquets_parse;
-
+#if ENABLE_VAAPI
+  extern int vainfo_probe_enabled;
+#endif
   main_tid = pthread_self();
 
   /* Setup global mutexes */
@@ -1293,7 +1295,11 @@ main(int argc, char **argv)
   tvhftrace(LS_MAIN, fsmonitor_init);
   tvhftrace(LS_MAIN, libav_init);
   tvhftrace(LS_MAIN, tvhtime_init);
+#if ENABLE_VAAPI
+  tvhftrace(LS_MAIN, codec_init, vainfo_probe_enabled);
+#else
   tvhftrace(LS_MAIN, codec_init);
+#endif
   tvhftrace(LS_MAIN, profile_init);
   tvhftrace(LS_MAIN, imagecache_init);
   tvhftrace(LS_MAIN, http_client_init);

src/prop.c

@@ -46,6 +46,7 @@ static const struct strtab typetab[] = {
   { "s64",     PT_S64_ATOMIC },
   { "dbl",     PT_DBL },
   { "time",    PT_TIME },
+  { "int",     PT_DYN_INT },
   { "langstr", PT_LANGSTR },
   { "perm",    PT_PERM },
 };
@@ -84,6 +85,7 @@ prop_write_values
   uint32_t u32, opts;
   uint16_t u16;
   time_t tm;
+  int dyn_i;
 #define PROP_UPDATE(v, t)\
   snew = &v;\
   if (!p->set && (*((t*)cur) != *((t*)snew))) {\
@@ -212,6 +214,13 @@ prop_write_values
         PROP_UPDATE(tm, time_t);
         break;
       }
+      case PT_DYN_INT: {
+        if (htsmsg_field_get_s64(f, &s64))
+          continue;
+        dyn_i = s64;
+        PROP_UPDATE(dyn_i, int);
+        break;
+      }
       case PT_LANGSTR: {
         lang_str_t **lstr1 = cur;
         lang_str_t  *lstr2;
@@ -349,6 +358,9 @@ prop_read_value
     case PT_TIME:
       htsmsg_add_s64(m, name, *(time_t *)val);
       break;
+    case PT_DYN_INT:
+      htsmsg_add_s64(m, name, *(int *)val);
+      break;
     case PT_LANGSTR:
       lang_str_serialize(*(lang_str_t **)val, m, name);
       break;
@@ -481,6 +493,9 @@ prop_serialize_value
       case PT_TIME:
         htsmsg_add_s64(m, "default", pl->def.tm);
         break;
+      case PT_DYN_INT:
+        htsmsg_add_s32(m, "default", pl->def.dyn_i());
+        break;
       case PT_LANGSTR:
         /* TODO? */
         break;

src/prop.h

@@ -38,6 +38,7 @@ typedef enum {
   PT_S64_ATOMIC,
   PT_DBL,
   PT_TIME,
+  PT_DYN_INT,
   PT_LANGSTR,
   PT_PERM,                // like PT_U32 but with the special save
 } prop_type_t;
@@ -115,6 +116,7 @@ typedef struct property {
     double      d;   // PT_DBL
     time_t      tm;  // PT_TIME
     htsmsg_t *(*list)(void); // islist != 0
+    int       (*dyn_i)(void); // dynamically load a PT_DYN_INT
   } def;
 
   /* Extended options */

src/transcoding/codec.h

@@ -171,7 +171,11 @@ htsmsg_t *
 codec_get_profiles_list(enum AVMediaType media_type);
 
 void
+#if ENABLE_VAAPI
+codec_init(int vainfo_probe_enabled);
+#else
 codec_init(void);
+#endif
 
 void
 codec_done(void);

src/transcoding/codec/codec.c

@@ -20,6 +20,9 @@
 
 #include "internals.h"
 
+#if ENABLE_VAAPI
+#include "vainfo.h"
+#endif
 
 struct TVHCodecs tvh_codecs;
 
@@ -254,7 +257,11 @@ tvh_codec_find(const char *name)
 
 
 void
+#if ENABLE_VAAPI
+tvh_codecs_register(int vainfo_probe_enabled)
+#else
 tvh_codecs_register()
+#endif
 {
     SLIST_INIT(&tvh_codecs);
     tvh_codec_register(&tvh_codec_mpeg2video);
@@ -291,10 +298,26 @@ tvh_codecs_register()
 #endif
 
 #if ENABLE_VAAPI
-    tvh_codec_register(&tvh_codec_vaapi_h264);
-    tvh_codec_register(&tvh_codec_vaapi_hevc);
-    tvh_codec_register(&tvh_codec_vaapi_vp8);
-    tvh_codec_register(&tvh_codec_vaapi_vp9);
+    if (vainfo_probe_enabled && !vainfo_init(VAINFO_SHOW_LOGS)) {
+        if (vainfo_encoder_isavailable(VAINFO_H264) || 
+            vainfo_encoder_isavailable(VAINFO_H264_LOW_POWER))
+            tvh_codec_register(&tvh_codec_vaapi_h264);
+        if (vainfo_encoder_isavailable(VAINFO_HEVC) || 
+            vainfo_encoder_isavailable(VAINFO_HEVC_LOW_POWER))
+            tvh_codec_register(&tvh_codec_vaapi_hevc);
+        if (vainfo_encoder_isavailable(VAINFO_VP8) || 
+            vainfo_encoder_isavailable(VAINFO_VP8_LOW_POWER))
+            tvh_codec_register(&tvh_codec_vaapi_vp8);
+        if (vainfo_encoder_isavailable(VAINFO_VP9) || 
+            vainfo_encoder_isavailable(VAINFO_VP9_LOW_POWER))
+            tvh_codec_register(&tvh_codec_vaapi_vp9);
+    }
+    else {
+        tvh_codec_register(&tvh_codec_vaapi_h264);
+        tvh_codec_register(&tvh_codec_vaapi_hevc);
+        tvh_codec_register(&tvh_codec_vaapi_vp8);
+        tvh_codec_register(&tvh_codec_vaapi_vp9);
+    }
 #endif
 
 #if ENABLE_NVENC