Added support for GoPro Cineform exporting.

ggarra13 · Feb 28, 2024 · 4c695a0 · 4c695a0
1 parent f9b71a1
commit 4c695a0
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 17 deletions.
diff --git a/bin/upload_sourceforge.sh b/bin/upload_sourceforge.sh
@@ -108,7 +108,7 @@ ${date}.
 It does not support NDI® on any platform.
 
 It works on Windows 8.1+ (without USD support), Ubuntu 20.04 LTS+,
-macOS 11 (amd64) and macOS M1 (arm64). 
+macOS 11 (amd64) and macOS M1/M2/M3 (arm64). 
 
 It may contain bugs, new untested features and more.
 

diff --git a/mrv2/lib/mrvPanels/mrvImageInfoPanel.cpp b/mrv2/lib/mrvPanels/mrvImageInfoPanel.cpp
@@ -1914,27 +1914,23 @@ namespace mrv
 
                     ++group;
 
-                    std::string format = tl::image::getLabel(pixelType);
+                    std::string format;
+                    auto it = info.tags.find("FFmpeg Pixel Format");
+                    if (it != info.tags.end())
+                        add_text(
+                            _("FFmpeg Pixel Format"), _("FFmpeg Pixel Format"),
+                            it->second);
+
+                    format = tl::image::getLabel(pixelType);
 
                     add_text(
                         _("Render Pixel Format"), _("Render Pixel Format"),
-                        format.c_str());
+                        format);
                 }
 
                 m_video->show();
 
-#if 0
-                add_ocio_ics( _("Input Color Space"),
-                              _("OCIO Input Color Space"),
-                              img->ocio_input_color_space().c_str() );
-
-
-                ++group;
-#endif
-
-#if 0
-
-
+#if 0           
                 if ( !img->has_video() )
                 {
                     add_text( _("Line Order"), _("Line order in file"),

diff --git a/mrv2/lib/mrvWidgets/mrvSaveMovieOptionsUI.fl b/mrv2/lib/mrvWidgets/mrvSaveMovieOptionsUI.fl
@@ -41,7 +41,7 @@ class SaveMovieOptionsUI {open
   Function {SaveMovieOptionsUI(bool hasAudio = true, bool audioOnly = false)} {} {
     Fl_Window uiMain {
       label {Save Movie Options} open
-      xywh {729 146 465 537} type Double align 0 modal visible
+      xywh {810 162 465 537} type Double align 0 modal visible
     } {
       Fl_Group {} {
         label {Common Settings}
@@ -517,6 +517,12 @@ else if (codec == "VP9")
    v->add("GBRP_10LE");
    v->add("GBRP_12LE");
 }
+else if (codec == "GoPro_Cineform")
+{ 
+    v->add("YUV_422P_10LE");    
+    v->add("GBRP_12LE");
+    v->add("GBRAP_12LE");
+}
 else if (codec == "AV1")
 {  
    v->add("YUV_420P");

diff --git a/tlRender b/tlRender
+1 −1		lib/tlIO/CMakeLists.txt
+1 −0		lib/tlIO/FFmpeg.cpp
+4 −0		lib/tlIO/FFmpeg.h
+27 −0		lib/tlIO/FFmpegMacros.h
+1 −1		lib/tlIO/FFmpegRead.cpp
+3 −1		lib/tlIO/FFmpegReadPrivate.h
+30 −18		lib/tlIO/FFmpegReadVideo.cpp
+21 −25		lib/tlIO/FFmpegWrite.cpp