Fixed alpha and prores saving.

ggarra13 · Feb 24, 2024 · 4ba3beb · 4ba3beb
1 parent a7d120d
commit 4ba3beb
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 13 deletions.
diff --git a/mrv2/docs/HISTORY.md b/mrv2/docs/HISTORY.md
@@ -19,6 +19,8 @@ v1.0.6
   multiple movie or image files.
 - Made FFmpeg errors be reported to the console immediately.
 - Fixed macOS VideoToolbox's hardware encoding not working when busy.
+- Fixed Windows' presets not being read due to spaces in the installed
+  directory.
 
 
 v1.0.5

diff --git a/mrv2/lib/mrvFl/mrvSaveImage.cpp b/mrv2/lib/mrvFl/mrvSaveImage.cpp
@@ -288,11 +288,14 @@ namespace mrv
                     render->setOCIOOptions(view->getOCIOOptions());
                     render->setLUTOptions(view->lutOptions());
                     CHECK_GL;
-                    // glClearColor(1.0, .0, .0, 1.0);
-                    // glClear(GL_COLOR_BUFFER_BIT);
                     render->drawVideo(
                         {videoData},
-                        {math::Box2i(0, 0, renderSize.w, renderSize.h)});
+                        {math::Box2i(
+                                0, 0, renderSize.w, renderSize.h)},
+                        {timeline::ImageOptions()},
+                        {timeline::DisplayOptions()},
+                        timeline::CompareOptions(),
+                        ui->uiView->getBackgroundOptions());
                     CHECK_GL;
                     render->end();
                 }

diff --git a/mrv2/lib/mrvFl/mrvSaveMovie.cpp b/mrv2/lib/mrvFl/mrvSaveMovie.cpp
@@ -585,7 +585,11 @@ namespace mrv
                             render->drawVideo(
                                 {videoData},
                                 {math::Box2i(
-                                    0, 0, renderSize.w, renderSize.h)});
+                                        0, 0, renderSize.w, renderSize.h)},
+                                {timeline::ImageOptions()},
+                                {timeline::DisplayOptions()},
+                                timeline::CompareOptions(),
+                                 ui->uiView->getBackgroundOptions());
                             render->end();
                         }
 

diff --git a/mrv2/lib/mrvFl/mrvSaveOptions.h b/mrv2/lib/mrvFl/mrvSaveOptions.h
@@ -23,7 +23,7 @@ namespace mrv
         std::string ffmpegPreset;
         std::string ffmpegPixelFormat;
         tl::ffmpeg::AudioCodec ffmpegAudioCodec = tl::ffmpeg::AudioCodec::AAC;
-        bool ffmpegOverride;
+        bool ffmpegOverride = false;
         std::string ffmpegColorRange;
         std::string ffmpegColorSpace;
         std::string ffmpegColorPrimaries;

diff --git a/mrv2/lib/mrvWidgets/mrvSaveMovieOptionsUI.fl b/mrv2/lib/mrvWidgets/mrvSaveMovieOptionsUI.fl
@@ -263,7 +263,7 @@ settings->setValue("SaveMovie/Annoations", static_cast<int>(o->value()));}
         }
       }
       Fl_Group VideoOptions {
-        label {Video Options} open selected
+        label {Video Options} open
         xywh {34 111 390 188} box ROUNDED_FRAME color 56
       } {
         Fl_Choice Profile {
@@ -275,11 +275,8 @@ add_pixel_formats(o, v->PixelFormat);
 const Fl_Menu_Item* item = o->mvalue();
 if (!item) return;
 auto settings = mrv::App::app->settings();
-settings->setValue("SaveMovie/Profile", std::string(item->label()));} open
+settings->setValue("SaveMovie/Profile", std::string(item->label()));} open selected
           tooltip {FFMpeg's Profile settings.} xywh {170 131 170 29} down_box BORDER_BOX
-          code0 {add_profiles(o);}
-          code1 {add_presets(o, Preset);}
-          code2 {add_pixel_formats(o, PixelFormat);}
         } {}
         Fl_Choice Preset {
           label Preset
@@ -346,7 +343,7 @@ v->hide();}
       }
     }
     Fl_Window uiAdvancedSettings {
-      label {Advanced Settings} open
+      label {Advanced Settings}
       xywh {720 371 411 310} type Double hotspot modal visible
     } {
       Fl_Check_Button Override {
@@ -557,6 +554,12 @@ if (audioOnly)
   Annotations->deactivate();
   VideoOptions->deactivate();
 }
+else
+{
+   add_profiles(Profile);
+   add_presets(Profile, Preset);
+   add_pixel_formats(Profile, PixelFormat);
+}
 uiAdvancedSettings->hide();
 uiMain->show();
 while (uiMain->visible())

diff --git a/mrv2/presets/prores_4444-good.pst b/mrv2/presets/prores_4444-good.pst
@@ -2,4 +2,4 @@
 vendor:apl0
 qscale:11
 quant_mat:hq
-allow_sw:1
+alpha_bits:16
diff --git a/tlRender b/tlRender
+9 −2		lib/tlIO/FFmpegWrite.cpp
+1 −1		lib/tlTimeline/BackgroundOptions.h