Add support for MinGW / Windows

Author: xhighway999

CMakeLists.txt

@@ -1,5 +1,5 @@
 project("PygaMasher")
-cmake_minimum_required(VERSION 3.13)
+cmake_minimum_required(VERSION 3.12)
 set (CMAKE_CXX_STANDARD 17)
 
 set(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} -Wall)
@@ -11,7 +11,9 @@ find_package(PkgConfig)
 
 pkg_check_modules(GTKMM gtkmm-3.0)
 
-add_executable(PygaMasher main.cpp mainwindow.cpp imagewriter.cpp imagereader.cpp  commandrunner.cpp)
+add_executable(PygaMasher main.cpp mainwindow.cpp imagewriter.cpp imagereader.cpp commandrunner.cpp)
+
+
 target_link_libraries(PygaMasher stdc++fs pthread)
 
 link_directories(${GTKMM_LIBRARY_DIRS})

commandrunner.cpp

@@ -1,13 +1,19 @@
 #include "commandrunner.hpp"
 
 void CommandRunner::runCommand(const std::string &str) {
+#ifndef __MINGW32__
   fp = popen(str.c_str(), "r");
   d  = fileno(fp);
   fcntl(d, F_SETFL, O_NONBLOCK);
   if(fp == NULL) {
     printf("Failed to run command\n");
     exit(1);
   }
+#else
+  if((fp = _popen(str.c_str(), "r")) == NULL) {
+    exit(1);
+  }
+#endif
   closed = false;
 }
 
@@ -19,7 +25,7 @@ std::string CommandRunner::readAvail() {
   char        buf[1024];
   size_t      count = 1024;
   do {
-    ssize_t r = read(d, buf, count);
+    ssize_t r = fread(buf, 1, count, fp);
     if(r == -1 && errno == EAGAIN) {
       // no data yet
       dataInPipe = false;
@@ -37,4 +43,3 @@ std::string CommandRunner::readAvail() {
 }
 
 void CommandRunner::close() { pclose(fp); }
-

commandrunner.hpp

@@ -1,11 +1,14 @@
 #pragma once
 
-#include <fcntl.h>
+#include <iostream>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string>
-#include <unistd.h>
 
+#ifndef __MINGW32__
+#  include <fcntl.h>
+#  include <unistd.h>
+#endif
 class CommandRunner {
 public:
   void        runCommand(const std::string &str);

ffmpeg.hpp

@@ -0,0 +1,7 @@
+#pragma once
+#include <string>
+#ifdef _WIN32
+static std::string ffmpegName = "ffmpeg.exe";
+#else
+static std::string ffmpegName = "ffmpeg";
+#endif

imagereader.cpp

@@ -2,11 +2,19 @@
 
 ImageReader::ImageReader() {}
 void ImageReader::start() {
-  std::filesystem::remove_all(cachePath);
-  std::filesystem::create_directory(cachePath);
-  std::string command = "ffmpeg -y -i " + inputVideo
-                        + " -vf \"select=not(mod(n\\,30))\" -vsync vfr -q:v 2 "
-                        + cachePath + "/img_%05d.png";
+  try {
+    if(std::filesystem::exists(cachePath))
+      std::filesystem::remove_all(cachePath);
+    std::filesystem::create_directory(cachePath);
+  } catch(const std::exception &e) {
+    std::cout << e.what() << "\n";
+  }
+
+  std::filesystem::path fullPath = cachePath / "img_%05d.png";
+
+  std::string command = ffmpegName + " -y -i \"" + inputVideo.string()
+                        + "\" -vf \"fps=1\" -q:v 2 \"" + fullPath.string()
+                        + "\"";
   CommandRunner runner;
   runner.runCommand(command);
   while(runner.readable()) {
@@ -16,7 +24,7 @@ void ImageReader::start() {
 
   outFile.open(outputPath, std::ios::binary | std::ios::out);
 
-  std::vector<std::string> paths;
+  std::vector<std::filesystem::path> paths;
   for(const auto &p : std::filesystem::directory_iterator(cachePath)) {
     if(p.path().extension() == ".png") {
       paths.push_back(p.path());
@@ -32,9 +40,9 @@ void ImageReader::start() {
   outFile.close();
 }
 
-void ImageReader::readImage(const std::string &path) {
+void ImageReader::readImage(const std::filesystem::path &path) {
   int            w, h, n;
-  unsigned char *data = stbi_load(path.c_str(), &w, &h, &n, 1);
+  unsigned char *data = stbi_load(path.string().c_str(), &w, &h, &n, 1);
 
   auto getPixel = [&data, w](size_t x, size_t y) {
     size_t        i = y * w + x;
@@ -64,6 +72,9 @@ void ImageReader::readImage(const std::string &path) {
   free(data);
 }
 
-void ImageReader::setInputFile(const std::string &path) { inputVideo = path; }
-void ImageReader::setOutputFile(const std::string &path) { outputPath = path; }
-
+void ImageReader::setInputFile(const std::filesystem::path &path) {
+  inputVideo = path;
+}
+void ImageReader::setOutputFile(const std::filesystem::path &path) {
+  outputPath = path;
+}

imagereader.hpp

@@ -1,6 +1,7 @@
 #pragma once
 
 #include "commandrunner.hpp"
+#include "ffmpeg.hpp"
 #include "stb/stb_image.h"
 
 #include <algorithm>
@@ -11,17 +12,17 @@
 class ImageReader {
 public:
   ImageReader();
-  void setInputFile(const std::string &path);
-  void setOutputFile(const std::string &path);
+  void setInputFile(const std::filesystem::path &path);
+  void setOutputFile(const std::filesystem::path &path);
   void start();
 
 private:
   std::ofstream outFile;
-  void          readImage(const std::string &path);
+  void          readImage(const std::filesystem::path &path);
 
-  std::string inputVideo = "out.mp4";
-  std::string cachePath  = "out";
-  std::string outputPath = "file";
+  std::filesystem::path inputVideo = "out.mp4";
+  std::filesystem::path cachePath  = "PygaMasher_wd";
+  std::filesystem::path outputPath = "file";
 
   size_t chunkSize = 8;
 };

imagewriter.cpp

@@ -5,8 +5,14 @@ void ImageWriter::start() {
 
   currentByte  = 0;
   currentImage = 0;
-  std::filesystem::remove_all(wd);
-  std::filesystem::create_directory(wd);
+  try {
+    if(std::filesystem::exists(wd))
+      std::filesystem::remove_all(wd);
+    std::filesystem::create_directory(wd);
+  } catch(const std::exception &e) {
+    std::cout << e.what() << "\n";
+    exit(1);
+  }
 }
 void ImageWriter::writeData(char *data, size_t size) {
   size_t dataRemaining = size;
@@ -70,18 +76,20 @@ void ImageWriter::flushImage() {
   sprintf(t, "%05zu", currentImage++);
   std::string number = t;
 
-  std::string fileName = wd + "/" + number + ".png";
-  stbi_write_png(fileName.c_str(), width, height, 1, &image[0], width);
+  std::string           fileName = number + ".png";
+  std::filesystem::path filePath = wd / fileName;
+  stbi_write_png(filePath.string().c_str(), width, height, 1, &image[0], width);
   currentImageData.resize(0);
 }
 
 void ImageWriter::end() {
   // TODO: Mark data ending with something or have a header
   flushImage();
-  std::string command = "ffmpeg -y -framerate 1 -pattern_type glob -i '" + wd
-                        + "/*.png' -c:v libx264 -x264-params "
-                          "keyint=30:scenecut=0 -r 30 -pix_fmt rgb24 '"
-                        + fileOutputPath + "' &> log.txt ";
+  std::filesystem::path fullWdPath = wd / "%05d.png";
+
+  std::string command = ffmpegName + " -y -framerate 1 -i \""
+                        + fullWdPath.string() + "\" -c:v libx264 \""
+                        + fileOutputPath.string() + "\"";
   cmdRunner.runCommand(command);
 
   std::string log;
@@ -97,4 +105,3 @@ void ImageWriter::end() {
 void ImageWriter::setOutputFile(const std::string &path) {
   fileOutputPath = path;
 }
-

imagewriter.hpp

@@ -1,6 +1,7 @@
 #pragma once
 
 #include "commandrunner.hpp"
+#include "ffmpeg.hpp"
 #include "stb/stb_image_write.h"
 
 #include <algorithm>
@@ -22,9 +23,9 @@ class ImageWriter {
 private:
   void   flushImage();
   size_t width = 1280, height = 720, chunkSize = 8, bytesPerImage, currentByte;
-  std::string          wd = "out";
-  std::string          fileOutputPath;
-  std::vector<uint8_t> currentImageData;
-  size_t               currentImage;
-  CommandRunner        cmdRunner;
+  std::filesystem::path wd = "PygaMasher_wd";
+  std::filesystem::path fileOutputPath;
+  std::vector<uint8_t>  currentImageData;
+  size_t                currentImage;
+  CommandRunner         cmdRunner;
 };