fixed old bug

lostjared · Aug 31, 2020 · 9dec4bb · 9dec4bb
1 parent 0f1a1e4
commit 9dec4bb
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/acidcam/acidcam-cli-main.cpp b/acidcam/acidcam-cli-main.cpp
@@ -421,8 +421,10 @@ int main(int argc, char **argv) {
                         std::cout << argv[0] << ": invalid fourcc...\n";
                         exit(EXIT_FAILURE);
                     }
+                    cmd::four_cc_str = value;
                     cmd::cur_codec = 3;
                     cmd::four_cc = cv::VideoWriter::fourcc(value[0], value[1], value[2], value[3]);
+                    program.setCodecMode(3);
                 }
                     break;
                 case 'h':

diff --git a/acidcam/acidcam-cli.cpp b/acidcam/acidcam-cli.cpp
@@ -53,6 +53,7 @@ namespace cmd {
     using namespace cv;
     int cur_codec = 0;
     int  four_cc = 0;
+    std::string four_cc_str = "avc1";
     //  Function below from Stack Overflow
     // https://stackoverflow.com/questions/28562401/resize-an-image-to-a-square-but-keep-aspect-ratio-c-opencv
     cv::Mat resizeKeepAspectRatio(const cv::Mat &input, const cv::Size &dstSize, const cv::Scalar &bgcolor) {
@@ -96,7 +97,6 @@ namespace cmd {
 
     std::ostream &operator<<(std::ostream &out, const File_Type &type) {
         if(type == File_Type::MOV) {
-            out << "MPEG-4";
             switch(cur_codec) {
                 case 0:
                     break;
@@ -106,6 +106,9 @@ namespace cmd {
                 case 2:
                     out << "HEVC";
                     break;
+                case 3:
+                    out << four_cc_str;
+                    break;
             }
         }
         else

diff --git a/acidcam/acidcam-cli.hpp b/acidcam/acidcam-cli.hpp
@@ -59,7 +59,7 @@
 
 
 namespace cmd {
-
+    extern std::string four_cc_str;
     cv::Mat resizeKeepAspectRatio(const cv::Mat &input, const cv::Size &dstSize, const cv::Scalar &bgcolor);
 
     enum class File_Type { MOV, AVI };