Merge branch 'master' into caps_adl-rpl

intel · Sep 26, 2024 · 42aee99 · 42aee99
2 parents c6bba1f + eabd75e
commit 42aee99
Showing 1 changed file with 41 additions and 15 deletions.
diff --git a/lib/caps/MTL/d3d11 b/lib/caps/MTL/d3d11
@@ -13,39 +13,42 @@ caps = dict(
   decode  = dict(
     avc     = dict(maxres = res4k , fmts = ["NV12"]),
     mpeg2   = dict(maxres = res2k , fmts = ["NV12"]),
-    jpeg    = dict(maxres = res16k, fmts = ["NV12", "411P", "422H", "422V", "444P", "Y800"]),
+    jpeg    = dict(maxres = res16k, fmts = ["NV12", "411P", "422H", "422V", "444P", "Y800", "IMC3", "BGRP", "400P", "YUY2", "UYVY", "ARGB"]),
     hevc_8  = dict(
       maxres    = res16k,
       fmts      = ["NV12", "YUY2", "AYUV"],
       features  = dict(scc = True, msp = True),
     ),
     hevc_10 = dict(maxres = res16k , fmts = ["P010", "Y210", "Y410"]),
     hevc_12 = dict(maxres = res16k , fmts = ["P012", "Y212", "Y412"]),
+    #vp8 decode not support on mtl win
     vp9_8   = dict(maxres = res16k , fmts = ["NV12", "AYUV"]),
     vp9_10  = dict(maxres = res16k , fmts = ["P010", "Y410"]),
-    vp9_12  = dict(maxres = res16k , fmts = ["P012", "Y212", "Y412"]),
+    vp9_12  = dict(maxres = res16k , fmts = ["P012", "Y412"]),
     av1_8   = dict(maxres = res16k , fmts = ["NV12"]),
     av1_10  = dict(maxres = res16k , fmts = ["P010"]),
   ),
-  vdenc   = dict(
+  encode  = dict(
     avc     = dict(maxres = res4k , fmts = ["NV12", "YUY2", "YUYV", "YVYU", "UYVY", "AYUV"]),
-    jpeg    = dict(maxres = res16k, fmts = ["NV12", "YUY2", "UYVY",         "Y800"]),
     hevc_8  = dict(
       maxres    = res16k,
       fmts      = ["NV12", "AYUV"],
       features  = dict(scc = True),
     ),
     hevc_10 = dict(maxres = res16k , fmts = ["P010", "Y410"]),
     vp9_8   = dict(maxres = res8k , fmts = ["NV12", "AYUV"]),
-    vp9_10  = dict(maxres = res8k , fmts = ["P010", "Y410"]),
     av1_8  = dict(
-      maxres    = res8k,
+      maxres    = res16k,
       fmts      = ["NV12"],
     ),
     av1_10  = dict(
-      maxres    = res8k,
+      maxres    = res16k,
       fmts      = ["P010"],
     ),
+    vp9_10  = dict(maxres = res8k , fmts = ["P010", "Y410"]),
+  ),
+  vdenc   = dict(
+    jpeg    = dict(maxres = res16k, fmts = ["NV12", "YUY2", "UYVY", "ABGR", "Y800"]),
   ),
   vpp    = dict(
     # brightness, contrast, hue and saturation
@@ -55,12 +58,12 @@ caps = dict(
     ),
     # mirroring and rotation
     transpose   = dict(
-      ifmts = ["NV12",                 "P010", "YUY2", "UYVY", "Y210", "AYUV", "Y410", "BGRA"],
-      ofmts = ["NV12",                 "P010", "YUY2",         "Y210", "AYUV", "Y410", "BGRA"],
+      ifmts = ["NV12", "YV12", "I420", "P010", "YUY2", "UYVY", "Y210", "AYUV", "Y410", "BGRA"],
+      ofmts = ["NV12", "YV12", "I420", "P010", "YUY2",         "Y210", "AYUV", "Y410", "BGRA"],
     ),
     crop        = dict(
-      ifmts = ["NV12",                 "P010", "YUY2", "UYVY", "AYUV", "Y410", "BGRA"],
-      ofmts = ["NV12",                 "P010", "YUY2",         "AYUV", "Y410", "BGRA"],
+      ifmts = ["NV12", "YV12", "I420", "P010", "YUY2", "UYVY", "AYUV", "Y410", "BGRA"],
+      ofmts = ["NV12", "YV12", "I420", "P010", "YUY2",         "AYUV", "Y410", "BGRA"],
     ),
     sharpen     = dict(
       ifmts = ["NV12",                 "P010", "YUY2", "UYVY", "AYUV", "Y410", "BGRA"],
@@ -81,13 +84,36 @@ caps = dict(
       ofmts = ["NV12", "P010", "YUY2"],
     ),
     scale       = dict(
-      ifmts = ["NV12",                 "P010", "YUY2", "UYVY", "Y210", "AYUV", "Y410", "BGRA"],
-      ofmts = ["NV12",                 "P010", "YUY2",         "Y210", "AYUV", "Y410", "BGRA"],
+      ifmts = ["NV12", "YV12", "I420", "P010", "YUY2", "UYVY", "Y210", "AYUV", "Y410", "BGRA"],
+      ofmts = ["NV12", "YV12", "I420", "P010", "YUY2",         "Y210", "AYUV", "Y410", "BGRA"],
     ),
     # colorspace conversion
     csc         = dict(
-      ifmts = ["NV12",                 "P010", "YUY2", "UYVY", "Y210", "AYUV", "Y410", "BGRA"],
-      ofmts = ["NV12",                 "P010", "YUY2",         "Y210", "AYUV", "Y410", "BGRA"],
+      ifmts = ["NV12", "YV12", "I420", "P010", "YUY2", "UYVY", "Y210", "AYUV", "Y410", "BGRA"],
+      ofmts = ["NV12", "YV12", "I420", "P010", "YUY2",         "Y210", "AYUV", "Y410", "BGRA", "BGRX"],
+    ),
+    blend       = dict(
+      ifmts = ["NV12", "YV12", "I420", "P010", "YUY2", "UYVY", "Y210", "AYUV", "Y410", "BGRA"],
+      ofmts = ["NV12", "YV12", "I420", "P010", "YUY2",         "Y210", "AYUV", "Y410", "BGRA", "BGRX"],
+    ),
+    # tonemap
+    tonemap     = dict(
+      h2s             = dict(
+        ifmts = ["P010"],
+        ofmts = ["NV12", "P010"],
+      ),
+    ),
+    range     = dict(
+      ifmts = ["NV12", "P010"],
+      ofmts = ["NV12", "P010"],
+    ),
+    pad         = dict(
+      ifmts = ["NV12", "P010"],
+      ofmts = ["NV12", "P010"],
+    ),
+    drawbox   = dict(
+      ifmts = ["NV12", "P010"],
+      ofmts = ["NV12", "P010"],
     ),
   ),
 )