Updated tlRender to display otioClipName in the HUD.

ggarra13 · Dec 19, 2024 · 8bdf366 · 8bdf366
1 parent d8dc6ba
commit 8bdf366
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 15 deletions.
diff --git a/src/docs/HISTORY.md b/src/docs/HISTORY.md
@@ -39,6 +39,10 @@ v1.3.1
   need to do a:
 
        $ runme.sh clean
+	   
+- Added displaying of clip names in the otio files in the HUD.
+- Improved performance of Data Window and Display Window when reading 
+  multipart OpenEXRs.
 
 
 v1.3.0

diff --git a/src/lib/mrvGL/mrvGLViewportDraw.cpp b/src/lib/mrvGL/mrvGLViewportDraw.cpp
@@ -843,8 +843,16 @@ namespace mrv
 
         if (p.hud & HudDisplay::kFilename)
         {
-            const std::string& fullname =
-                createStringFromPathAndTime(path, time);
+            std::string fullname = createStringFromPathAndTime(path, time);
+            if (path.getExtension() == ".otio")
+            {
+                auto i = p.tagData.find("otioClipName");
+                if (i != p.tagData.end())
+                {
+                    auto otioClipName = i->second;
+                    fullname += " ( " + otioClipName + " )";
+                }
+            }
             _drawText(
                 p.fontSystem->getGlyphs(fullname, fontInfo), pos, lineHeight,
                 labelColor);
@@ -1102,12 +1110,9 @@ namespace mrv
     void Viewport::_drawDataWindow() const noexcept
     {
         TLRENDER_P();
-        if (p.videoData.empty() || p.videoData[0].layers.empty())
-            return;
-
-        const auto& tags = p.videoData[0].layers[0].image->getTags();
-        image::Tags::const_iterator i = tags.find("Data Window");
-        if (i == tags.end())
+        ;
+        image::Tags::const_iterator i = p.tagData.find("Data Window");
+        if (i == p.tagData.end())
             return;
 
         const std::string& dw = i->second;
@@ -1117,12 +1122,9 @@ namespace mrv
     void Viewport::_drawDisplayWindow() const noexcept
     {
         TLRENDER_P();
-        if (p.videoData.empty() || p.videoData[0].layers.empty())
-            return;
-
-        const auto& tags = p.videoData[0].layers[0].image->getTags();
-        image::Tags::const_iterator i = tags.find("Display Window");
-        if (i == tags.end())
+
+        image::Tags::const_iterator i = p.tagData.find("Display Window");
+        if (i == p.tagData.end())
             return;
 
         const std::string& dw = i->second;

diff --git a/tlRender b/tlRender
+1 −0		lib/tlIO/CineonRead.cpp
+2 −0		lib/tlIO/DPXRead.cpp
+3 −0		lib/tlIO/FFmpegReadVideo.cpp
+2 −0		lib/tlIO/JPEGRead.cpp
+1 −0		lib/tlIO/OpenEXRRead.cpp
+4 −0		lib/tlIO/PPMRead.cpp
+2 −0		lib/tlIO/RAWRead.cpp
+4 −0		lib/tlIO/SGIRead.cpp
+1 −0		lib/tlIO/STBRead.cpp
+1 −0		lib/tlIO/TIFFRead.cpp
+9 −0		lib/tlIO/USDRender.cpp