1.0 stabilization (#235)

- SIGSEGV crash - add datetime to ffmpeg log prints * - stabilization
kaltura · Aug 15, 2016 · 78075bb · 78075bb
1 parent 144ad10
commit 78075bb
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 5 deletions.
diff --git a/bin/darwin/FormatConverter.node b/bin/darwin/FormatConverter.node
diff --git a/bin/darwin/FormatConverter.node.debug b/bin/darwin/FormatConverter.node.debug
diff --git a/bin/linux/FormatConverter.node b/bin/linux/FormatConverter.node
diff --git a/bin/linux/FormatConverter.node.debug b/bin/linux/FormatConverter.node.debug
diff --git a/lib/playlistGenerator/MixFilterClip.js b/lib/playlistGenerator/MixFilterClip.js
@@ -152,6 +152,9 @@ var validateInput = function(fileInfo){
             that.logger.warn('FileInfo.video.duration  <= 0');
             return false;
         }
+        if (!fileInfo.video.keyFrameDTS || !fileInfo.video.keyFrameDTS.length) {
+            that.logger.warn('FileInfo.video track has no key frames');
+        }
     }
 
     if(fileInfo.audio) {

diff --git a/node_addons/FormatConverter/src/Converter.cpp b/node_addons/FormatConverter/src/Converter.cpp
@@ -9,6 +9,8 @@
 #include "Converter.h"
 #include <bitset>
 #include <set>
+#include <chrono>
+
 extern "C"{
 #include <libavformat/movenc.h>
 
@@ -117,14 +119,24 @@ namespace converter{
         return 0;
     }
 
+    const char szDateTimeormat [] = "%F %T %z"; 
     void ConverterAppInst::avlog_cb(void *data, int level, const char * szFmt, va_list varg){
         if(level > av_log_get_level()){
             return;
         }
         if(!ConverterAppInst::instance().m_filter.filter(szFmt)){
             return;
         }
-        av_log_default_callback(data,level,szFmt,varg);
+        //include date-time
+        std::time_t t = std::time(nullptr);
+        std::gmtime(&t);
+        std::tm *tm = std::gmtime(&t);
+        char szDateTime[sizeof("2016-08-15 08:45:07 +0200\0")];
+
+        std::strftime(szDateTime,sizeof(szDateTime),szDateTimeormat,tm);
+        std::string formatDateTime(szDateTime);
+        formatDateTime += std::string(" ") + szFmt;
+        av_log_default_callback(data,level,formatDateTime.c_str(),varg);
     }
 
 
@@ -403,10 +415,13 @@ namespace converter{
                 break;
             }
         }
-
-        auto diff = result[0];
-
-        std::transform(result.begin(),result.end(),result.begin(),[ diff ] (double val) -> double { return val - diff; });
+
+        if(result.size()){
+
+            auto diff = result[0];
+
+            std::transform(result.begin(),result.end(),result.begin(),[ diff ] (double val) -> double { return val - diff; });
+        }
 
         return 0;
     }