Added Hardware encoding.

ggarra13 · Feb 25, 2024 · dd08e6a · dd08e6a
1 parent f1a6187
commit dd08e6a
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/mrv2/lib/mrvFl/mrvSaveMovie.cpp b/mrv2/lib/mrvFl/mrvSaveMovie.cpp
@@ -91,7 +91,7 @@ namespace mrv
             }
 
             ioOptions["FFmpeg/PixelFormat"] = options.ffmpegPixelFormat;
-
+            ioOptions["FFmpeg/HardwareEncode"] = options.ffmpegHardwareEncode;
             if (options.ffmpegOverride)
             {
                 ioOptions["FFmpeg/ColorRange"] = options.ffmpegColorRange;

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

diff --git a/mrv2/lib/mrvPy/IO.cpp b/mrv2/lib/mrvPy/IO.cpp
@@ -24,8 +24,8 @@ void mrv2_io(py::module& m)
 #ifdef TLRENDER_FFMPEG
                 ,
                 tl::ffmpeg::Profile, std::string, std::string,
-                tl::ffmpeg::AudioCodec,
-                bool, std::string, std::string, std::string, std::string
+                tl::ffmpeg::AudioCodec, bool, bool, std::string, std::string,
+                std::string, std::string
 #endif
 #ifdef TLRENDER_EXR
                 ,
@@ -38,6 +38,7 @@ void mrv2_io(py::module& m)
             py::arg("ffmpegProfile") = tl::ffmpeg::Profile::None,
             py::arg("ffmpegPreset") = "",
             py::arg("ffmpegPixelFormat") = "YUV420P",
+            py::arg("ffmpegHardwareEncode") = false,
             py::arg("ffmpegOverride") = false,
             py::arg("ffmpegColorRange") = "PC",
             py::arg("ffmpegColorSpace") = "bt709",
@@ -66,6 +67,9 @@ void mrv2_io(py::module& m)
         .def_readwrite(
             "ffmpegPixelFormat", &mrv::SaveOptions::ffmpegPixelFormat,
             _("FFmpeg Pixel Format."))
+        .def_readwrite(
+            "ffmpegHardwareEncode", &mrv::SaveOptions::ffmpegHardwareEncode,
+            _("FFmpeg video encoding with hardware if possible."))
         .def_readwrite(
             "ffmpegOverride", &mrv::SaveOptions::ffmpegOverride,
             _("FFmpeg Override color characteristics."))

diff --git a/tlRender b/tlRender