Added Automatic Color Buffer Accuracy selection.

ggarra13 · Apr 27, 2024 · 2cc2b36 · 2cc2b36
1 parent d1e4902
commit 2cc2b36
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 9 deletions.
diff --git a/mrv2/CMakeLists.txt b/mrv2/CMakeLists.txt
@@ -42,9 +42,7 @@ if(FLTK_BUILD_SHARED_LIBS)
 	set(FLTK_LIBRARIES fltk::fltk-shared )
 	set(FLTK_gl_LIBRARY )
     else()
-	# fltk::images must *NOT* be shared or jpeg library enters in conflict
-	# with tlRender's libjpeg-turbo.
-	set(FLTK_LIBRARIES fltk::fltk-shared fltk::images )
+	set(FLTK_LIBRARIES fltk::fltk-shared fltk::images-shared )
 	set(FLTK_gl_LIBRARY fltk::gl-shared)
     endif()
 else()

diff --git a/mrv2/lib/mrvFl/mrvPreferences.cpp b/mrv2/lib/mrvFl/mrvPreferences.cpp
@@ -805,7 +805,7 @@ namespace mrv
         opengl.get("vsync", tmp, 1);
         uiPrefs->uiPrefsOpenGLVsync->value(tmp);
 
-        opengl.get("color_accuracy", tmp, 1);
+        opengl.get("color_buffers_accuracy", tmp, 0);
         uiPrefs->uiPrefsColorAccuracy->value(tmp);
 
         opengl.get("blit_viewports", tmp, 1);
@@ -1413,7 +1413,8 @@ namespace mrv
         Fl_Preferences opengl(base, "opengl");
         opengl.set("vsync", (int)uiPrefs->uiPrefsOpenGLVsync->value());
         opengl.set(
-            "color_accuracy", (int)uiPrefs->uiPrefsColorAccuracy->value());
+            "color_buffers_accuracy",
+            (int)uiPrefs->uiPrefsColorAccuracy->value());
         opengl.set(
             "blit_viewports", (int)uiPrefs->uiPrefsBlitViewports->value());
         opengl.set("blit_timeline", (int)uiPrefs->uiPrefsBlitTimeline->value());

diff --git a/mrv2/lib/mrvGL/mrvGLViewport.cpp b/mrv2/lib/mrvGL/mrvGLViewport.cpp
@@ -210,9 +210,35 @@ namespace mrv
         {
             if (renderSize.isValid())
             {
+                bool isFloatImage = p.ocioOptions.enabled;
+                int accuracy = p.ui->uiPrefs->uiPrefsColorAccuracy->value();
+                if (accuracy == 0)
+                    isFloatImage = true;
+
+                if (accuracy == 2 && !p.videoData[0].layers.empty() &&
+                    p.videoData[0].layers[0].image->isValid())
+                {
+                    const auto& pixelType =
+                        p.videoData[0].layers[0].image->getPixelType();
+                    switch (pixelType)
+                    {
+                    case image::PixelType::RGBA_F32:
+                    case image::PixelType::RGB_F32:
+                    case image::PixelType::RGBA_F16:
+                    case image::PixelType::RGB_F16:
+                    case image::PixelType::L_F32:
+                    case image::PixelType::LA_F32:
+                    case image::PixelType::L_F16:
+                    case image::PixelType::LA_F16:
+                        isFloatImage = true;
+                        break;
+                    default:
+                        break;
+                    }
+                }
+
                 image::PixelType colorBufferType = image::PixelType::RGBA_U8;
-                if ((p.ui->uiPrefs->uiPrefsColorAccuracy->value() == 0) ||
-                    p.ocioOptions.enabled == true)
+                if (isFloatImage)
                     colorBufferType = image::PixelType::RGBA_F32;
 
                 if (gl.colorBufferType != colorBufferType)

diff --git a/mrv2/lib/mrvWidgets/mrvPreferencesUI.fl b/mrv2/lib/mrvWidgets/mrvPreferencesUI.fl
@@ -1374,13 +1374,17 @@ v->uiOCIO_Look->do_callback();}
               }
               Fl_Choice uiPrefsColorAccuracy {
                 label {Color Buffers' Accuracy} open selected
-                tooltip {Color Buffers can be accurate or fast.  Accurate preserves all float information, while Fast works in 8-bits.} xywh {473 163 255 25} down_box BORDER_BOX align 132 textcolor 32
+                tooltip {Color Buffers can be Accurate, Fast or Automatic.  Accurate preserves all float information, while Fast works in 8-bits.  Automatic selects the accuracy baed on image depth and OCIO use.} xywh {473 163 255 25} down_box BORDER_BOX align 132 textcolor 32
                 class {mrv::Choice}
               } {
                 MenuItem {} {
-                  label Accurate
+                  label Automatic
                   xywh {50 50 100 20}
                 }
+                MenuItem {} {
+                  label Accurate
+                  xywh {60 60 100 20}
+                }
                 MenuItem {} {
                   label Fast
                   xywh {50 50 100 20}