fix: use the same render arguments for linux and windows

Author: Totto16

src/graphics/video_renderer.cpp

@@ -93,7 +93,7 @@ std::optional<std::string> VideoRenderer::render(
         }
 
         m_renderer->present();
-        
+
         backend.add_frame(m_surface.get());
         m_clock->increment_simulation_step_index();
 
@@ -106,6 +106,20 @@ std::optional<std::string> VideoRenderer::render(
     return std::nullopt;
 }
 
+std::vector<std::string>
+VideoRendererBackend::get_encoding_paramaters(u32 fps, shapes::UPoint size, std::filesystem::path destination_path) {
+
+    std::string resolution = fmt::format("{}x{}", size.x, size.y);
+
+    std::string framerate = fmt::format("{}", fps);
+
+    return {
+        "-loglevel", "verbose", "-y",      "-f",  "rawvideo", "-pix_fmt", "bgra",    "-s",
+        resolution,  "-r",      framerate, "-i",  "-",        "-c:v",     "libx264", "-vb",
+        "2500k",     "-c:a",    "aac",     "-ab", "200k",     "-pix_fmt", "yuv420p", destination_path.string(),
+    };
+}
+
 
 // implementation of ServiceProvider
 

src/graphics/video_renderer.hpp

@@ -86,9 +86,12 @@ struct Decoder;
 // See e.g. https://github.com/Raveler/ffmpeg-cpp
 struct VideoRendererBackend {
 private:
-    std::string m_destination_path;
+    std::filesystem::path m_destination_path;
     std::unique_ptr<Decoder> m_decoder;
 
+    [[nodiscard]] static std::vector<std::string>
+    get_encoding_paramaters(u32 fps, shapes::UPoint size, std::filesystem::path destination_path);
+
 public:
     OOPETRIS_GRAPHICS_EXPORTED explicit VideoRendererBackend(const std::filesystem::path& destination_path);
 

src/graphics/video_renderer_linux.cpp

@@ -51,16 +51,19 @@ std::optional<std::string> VideoRendererBackend::setup(u32 fps, shapes::UPoint s
         }
         close(pipefd[WRITE_END]);
 
-        std::string resolution = fmt::format("{}x{}", size.x, size.y);
 
-        std::string framerate = fmt::format("{}", fps);
+        auto paramaters = VideoRendererBackend::get_encoding_paramaters(fps, size, m_destination_path);
+
+        std::vector<const char*> args = { "ffmpeg" };
+        for (const auto& parameter : paramaters) {
+            args.push_back(parameter.c_str());
+        }
+
+        args.push_back(nullptr);
+
 
         //TODO(Totto): support audio, that loops the music as in the main game
-        int ret =
-                execlp("ffmpeg", "ffmpeg", "-loglevel", "verbose", "-y", "-f", "rawvideo", "-pix_fmt", "bgra", "-s",
-                       resolution.c_str(), "-r", framerate.c_str(), "-i", "-", "-c:v", "libx264", "-vb", "2500k",
-                       "-c:a", "aac", "-ab", "200k", "-pix_fmt", "yuv420p", m_destination_path.c_str(),
-                       static_cast<char*>(nullptr));
+        int ret = execvp("ffmpeg", args.data());
         if (ret < 0) {
             std::cerr << "FFMPEG CHILD: could not run ffmpeg as a child process: " << strerror(errno) << "\n";
             std::exit(1);

src/graphics/video_renderer_windows.cpp

@@ -64,16 +64,24 @@ std::optional<std::string> VideoRendererBackend::setup(u32 fps, shapes::UPoint s
     PROCESS_INFORMATION piProcInfo;
     ZeroMemory(&piProcInfo, sizeof(PROCESS_INFORMATION));
 
-    //TODO: do this in better c++ fashion and deduplicate this
-    char cmd_buffer[1024 * 2];
-    snprintf(
-            cmd_buffer, sizeof(cmd_buffer),
-            "ffmpeg.exe -loglevel verbose -y -f rawvideo -pix_fmt rgba -s %dx%d -r %d -i - -i \"%s\" -c:v libx264 -vb "
-            "2500k -c:a aac -ab 200k -pix_fmt yuv420p output.mp4",
-            (int) width, (int) height, (int) fps, sound_file_path
-    );
-
-    if (!CreateProcess(NULL, cmd_buffer, NULL, NULL, TRUE, 0, NULL, NULL, &siStartInfo, &piProcInfo)) {
+
+    auto paramaters = VideoRendererBackend::get_encoding_paramaters(fps, size, m_destination_path);
+
+    std::stringstream args = "ffmpeg.exe";
+    for (const auto& parameter : paramaters) {
+        args += " ";
+        if (paramater.find(" ") != std::string::npos) {
+            args += "\"";
+            args += paramater;
+            args += "\"";
+
+        } else {
+            args += paramater;
+        }
+    }
+
+
+    if (!CreateProcess(NULL, result.string().c_str(), NULL, NULL, TRUE, 0, NULL, NULL, &siStartInfo, &piProcInfo)) {
         CloseHandle(pipe_write);
         CloseHandle(pipe_read);