Unify VA-API initialization.

[nageru] / shared / va_display.h

diff --git a/shared/va_display.h b/shared/va_display.h
index 395ecbb5f1f007412e2605440bb1a59c88502d83..5809b65c3328596df2a04018cb85d5ad3a4817cb 100644 (file)
--- a/shared/va_display.h
+++ b/shared/va_display.h
@@ -5,7 +5,8 @@
 #include <X11/Xlib.h>
 
 #include <memory>
-#include <string.h>
+#include <string>
+#include <vector>
 
 struct VADisplayWithCleanup {
        ~VADisplayWithCleanup();
@@ -15,6 +16,17 @@ struct VADisplayWithCleanup {
        bool can_use_zerocopy = true;  // For H.264 encoding in Nageru.
        int drm_fd = -1;
 };
-std::unique_ptr<VADisplayWithCleanup> va_open_display(const std::string &va_display);  // Can return nullptr on failure.
+
+struct ConfigRequest {
+        std::string name;  // For error texts only.
+        uint32_t rt_format, fourcc;
+
+        // Output.
+        VAConfigID *config_id;
+        VAImageFormat *image_format;
+};
+std::unique_ptr<VADisplayWithCleanup> try_open_va(
+        const std::string &va_display, const std::vector<VAProfile> &desired_profiles, VAEntrypoint entrypoint,
+        const std::vector<ConfigRequest> &desired_configs, VAProfile *chosen_profile, std::string *error);  // Can return nullptr on failure.
 
 #endif  // !defined(_VA_DISPLAY_H)