(M)JPG HTTP output support

Author: Thulinma

generated/meson.build

@@ -32,8 +32,6 @@ embed_files = [
     {'infile': '../embed/min/skins/default.css',        'variable': 'skin_default_css',  'outfile': 'skin_default.css.h'},
     {'infile': '../embed/min/skins/dev.css',            'variable': 'skin_dev_css',      'outfile': 'skin_dev.css.h'},
     {'infile': '../embed/skins/video-js.css',           'variable': 'skin_videojs_css',  'outfile': 'skin_videojs.css.h'},
-    {'infile': '../src/output/noffmpeg.jpg',            'variable': 'noffmpeg',          'outfile': 'noffmpeg.h'},
-    {'infile': '../src/output/noh264.jpg',              'variable': 'noh264',            'outfile': 'noh264.h'},
 ]
 
 embed_tgts = []

lib/util.cpp

@@ -316,6 +316,24 @@ namespace Util{
     rndSrc.close();
   }
 
+  /// Secure random alphanumeric string generator
+  /// Uses getRandomBytes internally
+  std::string getRandomAlphanumeric(size_t len){
+    std::string ret(len, 'X');
+    getRandomBytes((void*)ret.data(), len);
+    for (size_t i = 0; i < len; ++i){
+      uint8_t v = (ret[i] % 62);
+      if (v < 10){
+        ret[i] = v + '0';
+      }else if (v < 36){
+        ret[i] = v - 10 + 'A';
+      }else{
+        ret[i] = v - 10 - 26 + 'a';
+      }
+    }
+    return ret;
+  }
+
   /// 64-bits version of ftell
   uint64_t ftell(FILE *stream){
     /// \TODO Windows implementation (e.g. _ftelli64 ?)

lib/util.h

@@ -21,6 +21,7 @@ namespace Util{
   int64_t expBackoffMs(const size_t currIter, const size_t maxIter, const int64_t maxWait);
 
   void getRandomBytes(void * dest, size_t len);
+  std::string getRandomAlphanumeric(size_t len);
 
   uint64_t ftell(FILE *stream);
   uint64_t fseek(FILE *stream, uint64_t offset, int whence);

meson_options.txt

@@ -21,7 +21,6 @@ option('DEBUG', description: 'Default debug level. Recommended value for develop
 option('NOGA', description: 'Disables Google Analytics entirely in the LSP', type: 'boolean', value: false)
 option('LOAD_BALANCE', description: 'Build the load balancer (WIP)', type: 'boolean', value: false)
 option('WITH_AV', description: 'Build a generic libav-based input (not distributable!)', type: 'boolean', value: false)
-option('WITH_JPG', description: 'Build JPG thumbnailer output support (WIP)', type: 'boolean', value: false)
 option('WITH_SANITY', description: 'Enable MistOutSanityCheck output for testing purposes', type: 'boolean', value: false)
 option('LSP_MINIFY', description: 'Try to minify LSP JS via java closure-compiler, generally not needed unless changing JS code as a minified version is part of the repository already', type: 'boolean', value: false)
 option('LOCAL_GENERATORS', description: 'Attempts to find a locally-installed version of sourcery and make_html, instead of compiling it', type: 'boolean', value: false)

src/input/input_ebml.cpp

@@ -381,6 +381,16 @@ namespace Mist{
           trueCodec = "JPEG";
           trueType = "video";
         }
+        if (codec == "V_MS/VFW/FOURCC"){
+          tmpElem = E.findChild(EBML::EID_CODECPRIVATE);
+          if (tmpElem){
+            std::string bitmapheader = tmpElem.getValStringUntrimmed();
+            if (bitmapheader.substr(16, 4) == "MJPG"){
+              trueCodec = "JPEG";
+              trueType = "video";
+            }
+          }
+        }
         if (codec == "A_PCM/FLOAT/IEEE"){
           trueCodec = "FLOAT";
           trueType = "audio";

src/output/meson.build

@@ -22,6 +22,7 @@ outputs = [
     {'name' : 'SDP',               'format' : 'sdp',                'extra': ['http']},
     {'name' : 'HTTP',              'format' : 'http_internal',      'extra': ['http','embed']},
     {'name' : 'JSONLine',          'format' : 'jsonline'},
+    {'name' : 'JPG',               'format' : 'jpg',                'extra': ['http']},
 ]
 
 if usessl 
@@ -39,10 +40,6 @@ if have_srt
   outputs += {'name' : 'TSSRT', 'format' : 'tssrt', 'extra': ['ts', 'debased', 'with_srt']}
 endif
 
-if get_option('WITH_JPG')
-  outputs += {'name' : 'JPG', 'format' : 'jpg', 'extra': ['http','embed']}
-endif
-
 if get_option('WITH_SANITY')
   outputs += {'name' : 'SanityCheck', 'format' : 'sanitycheck'}
 endif

src/output/output_ebml.cpp

@@ -119,8 +119,6 @@ namespace Mist{
     cfg->addOption("target", opt);
   }
 
-  bool OutEBML::isRecording(){return config->getString("target").size();}
-
   /// Calculates the size of a Cluster (contents only) and returns it.
   /// Bases the calculation on the currently selected tracks and the given start/end time for the
   /// cluster.

src/output/output_ebml.h

@@ -19,7 +19,6 @@ namespace Mist{
     }
 
   private:
-    bool isRecording();
     std::string doctype;
     void sendElemTrackEntry(size_t idx);
     size_t sizeElemTrackEntry(size_t idx);