Avoid recreating the display when no display parameters have changed

LizardByte · Feb 7, 2024 · 8373a8b · 8373a8b
1 parent aee88f3
commit 8373a8b
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/src/video.cpp b/src/video.cpp
@@ -2353,12 +2353,7 @@ namespace video {
   };
 
   int
-  validate_config(std::shared_ptr<platf::display_t> &disp, const encoder_t &encoder, const config_t &config) {
-    reset_display(disp, encoder.platform_formats->dev_type, config::video.output_name, config);
-    if (!disp) {
-      return -1;
-    }
-
+  validate_config(std::shared_ptr<platf::display_t> disp, const encoder_t &encoder, const config_t &config) {
     auto encode_device = make_encode_device(*disp, encoder, config);
     if (!encode_device) {
       return -1;
@@ -2561,6 +2556,12 @@ namespace video {
       hevc.videoFormat = 1;
       av1.videoFormat = 2;
 
+      // Reset the display since we're switching from SDR to HDR
+      reset_display(disp, encoder.platform_formats->dev_type, config::video.output_name, config);
+      if (!disp) {
+        return false;
+      }
+
       // HDR is not supported with H.264. Don't bother even trying it.
       encoder.h264[flag] = flag != encoder_t::DYNAMIC_RANGE && validate_config(disp, encoder, h264) >= 0;