support for webassembly

ZangaiFamily · Jun 25, 2018 · d32f9de · d32f9de
1 parent 2b350d0
commit d32f9de
Show file tree

Hide file tree

Showing 38 changed files with 332 additions and 253 deletions.
diff --git a/Decoder/avc.bc b/Decoder/avc.bc
diff --git a/Decoder/js/avc.js b/Decoder/js/avc.js
diff --git a/Decoder/js/avc.js.mem b/Decoder/js/avc.js.mem
diff --git a/Decoder/js/avc.wasm b/Decoder/js/avc.wasm
diff --git a/Decoder/make.py b/Decoder/make.py
@@ -12,7 +12,7 @@
   #'-m32',
   '-O3',
   #'-Dxxx2yyy'
-  '--memory-init-file', '0',
+  '--memory-init-file', '1',
   '--llvm-opts', '3',
   '--llvm-lto', '3',
   '-s', 'NO_EXIT_RUNTIME=1',
@@ -109,3 +109,6 @@
 f3 = open(os.path.join("..", "templates", 'DecoderPost.js'));
 f.write(f3.read());
 
+asmfile = open(os.path.join('..','Player','avc.wasm'), "w")
+amsfilein = open(os.path.join(JS_DIR, 'avc.wasm'));
+asmfile.write(amsfilein.read());
diff --git a/Decoder/obj/Decoder.o b/Decoder/obj/Decoder.o
diff --git a/Decoder/obj/H264SwDecApi.o b/Decoder/obj/H264SwDecApi.o
diff --git a/Decoder/obj/extraFlags.o b/Decoder/obj/extraFlags.o
diff --git a/Decoder/obj/h264bsd_byte_stream.o b/Decoder/obj/h264bsd_byte_stream.o
diff --git a/Decoder/obj/h264bsd_cavlc.o b/Decoder/obj/h264bsd_cavlc.o
diff --git a/Decoder/obj/h264bsd_conceal.o b/Decoder/obj/h264bsd_conceal.o
diff --git a/Decoder/obj/h264bsd_deblocking.o b/Decoder/obj/h264bsd_deblocking.o
diff --git a/Decoder/obj/h264bsd_decoder.o b/Decoder/obj/h264bsd_decoder.o
diff --git a/Decoder/obj/h264bsd_dpb.o b/Decoder/obj/h264bsd_dpb.o
diff --git a/Decoder/obj/h264bsd_image.o b/Decoder/obj/h264bsd_image.o
diff --git a/Decoder/obj/h264bsd_inter_prediction.o b/Decoder/obj/h264bsd_inter_prediction.o
diff --git a/Decoder/obj/h264bsd_intra_prediction.o b/Decoder/obj/h264bsd_intra_prediction.o
diff --git a/Decoder/obj/h264bsd_macroblock_layer.o b/Decoder/obj/h264bsd_macroblock_layer.o
diff --git a/Decoder/obj/h264bsd_nal_unit.o b/Decoder/obj/h264bsd_nal_unit.o
diff --git a/Decoder/obj/h264bsd_neighbour.o b/Decoder/obj/h264bsd_neighbour.o
diff --git a/Decoder/obj/h264bsd_pic_order_cnt.o b/Decoder/obj/h264bsd_pic_order_cnt.o
diff --git a/Decoder/obj/h264bsd_pic_param_set.o b/Decoder/obj/h264bsd_pic_param_set.o
diff --git a/Decoder/obj/h264bsd_reconstruct.o b/Decoder/obj/h264bsd_reconstruct.o
diff --git a/Decoder/obj/h264bsd_seq_param_set.o b/Decoder/obj/h264bsd_seq_param_set.o
diff --git a/Decoder/obj/h264bsd_slice_data.o b/Decoder/obj/h264bsd_slice_data.o
diff --git a/Decoder/obj/h264bsd_slice_group_map.o b/Decoder/obj/h264bsd_slice_group_map.o
diff --git a/Decoder/obj/h264bsd_slice_header.o b/Decoder/obj/h264bsd_slice_header.o
diff --git a/Decoder/obj/h264bsd_storage.o b/Decoder/obj/h264bsd_storage.o
diff --git a/Decoder/obj/h264bsd_stream.o b/Decoder/obj/h264bsd_stream.o
diff --git a/Decoder/obj/h264bsd_transform.o b/Decoder/obj/h264bsd_transform.o
diff --git a/Decoder/obj/h264bsd_util.o b/Decoder/obj/h264bsd_util.o
diff --git a/Decoder/obj/h264bsd_vlc.o b/Decoder/obj/h264bsd_vlc.o
diff --git a/Decoder/obj/h264bsd_vui.o b/Decoder/obj/h264bsd_vui.o
diff --git a/Decoder/src/Decoder.c b/Decoder/src/Decoder.c
@@ -71,6 +71,7 @@ void broadwayPlayStream(u32 length) {
 
 
 u32 broadwayInit() {
+
   H264SwDecRet ret;
 #ifdef DISABLE_OUTPUT_REORDERING
   u32 disableOutputReordering = 1;
@@ -87,6 +88,7 @@ u32 broadwayInit() {
   }
 
   picDecodeNumber = picDisplayNumber = 1;
+
   return 0;
 }
 

diff --git a/Player/Decoder.js b/Player/Decoder.js
diff --git a/Player/avc.wasm b/Player/avc.wasm
diff --git a/templates/DecoderPost.js b/templates/DecoderPost.js
@@ -1,12 +1,38 @@
-       return Module;
-    })();
+    //   return Module;
+    //})();
 
-    var resultModule = global.Module || Module;
+    var resultModule;
+    if (typeof global !== "undefined"){
+      if (global.Module){
+        resultModule = global.Module;
+      };
+    };
+    if (typeof Module != "undefined"){
+      resultModule = Module;
+    };
 
     resultModule._broadwayOnHeadersDecoded = par_broadwayOnHeadersDecoded;
     resultModule._broadwayOnPictureDecoded = par_broadwayOnPictureDecoded;
 
-    return resultModule;
+    var moduleIsReady = false;
+    var cbFun;
+    var moduleReady = function(){
+      moduleIsReady = true;
+      if (cbFun){
+        cbFun(resultModule);
+      }
+    };
+
+    resultModule.onRuntimeInitialized = function(){
+      moduleReady(resultModule);
+    };
+    return function(callback){
+      if (moduleIsReady){
+        callback(resultModule);
+      }else{
+        cbFun = callback;
+      };
+    };
   };
 
   return (function(){
@@ -36,6 +62,9 @@
     var fakeWindow = {
     };
 
+    var toU8Array;
+    var toU32Array;
+
     var onPicFun = function ($buffer, width, height) {
       var buffer = this.pictureBuffers[$buffer];
       if (!buffer) {
@@ -116,138 +145,158 @@
       }.bind(this);
     };
 
-    var Module = getModule.apply(fakeWindow, [function () {
+    var ModuleCallback = getModule.apply(fakeWindow, [function () {
     }, onPicFun]);
 
 
-    var HEAP8 = Module.HEAP8;
-    var HEAPU8 = Module.HEAPU8;
-    var HEAP16 = Module.HEAP16;
-    var HEAP32 = Module.HEAP32;
-
-
     var MAX_STREAM_BUFFER_LENGTH = 1024 * 1024;
-
-    // from old constructor
-    Module._broadwayInit();
 
-    /**
-   * Creates a typed array from a HEAP8 pointer. 
-   */
-    function toU8Array(ptr, length) {
-      return HEAPU8.subarray(ptr, ptr + length);
-    };
-    function toU32Array(ptr, length) {
-      //var tmp = HEAPU8.subarray(ptr, ptr + (length * 4));
-      return new Uint32Array(HEAPU8.buffer, ptr, length);
+    var instance = this;
+    this.onPictureDecoded = function (buffer, width, height, infos) {
+
     };
-    this.streamBuffer = toU8Array(Module._broadwayCreateStream(MAX_STREAM_BUFFER_LENGTH), MAX_STREAM_BUFFER_LENGTH);
-    this.pictureBuffers = {};
-    // collect extra infos that are provided with the nal units
-    this.infoAr = [];
 
-    this.onPictureDecoded = function (buffer, width, height, infos) {
-
+    this.onDecoderReady = function(){};
+
+    var bufferedCalls = [];
+    this.decode = function decode(typedAr, parInfo, copyDoneFun) {
+      bufferedCalls.push([typedAr, parInfo, copyDoneFun]);
     };
 
-    /**
+    ModuleCallback(function(Module){
+      var HEAP8 = Module.HEAP8;
+      var HEAPU8 = Module.HEAPU8;
+      var HEAP16 = Module.HEAP16;
+      var HEAP32 = Module.HEAP32;
+      // from old constructor
+      Module._broadwayInit();
+
+      /**
+     * Creates a typed array from a HEAP8 pointer. 
+     */
+      toU8Array = function(ptr, length) {
+        return HEAPU8.subarray(ptr, ptr + length);
+      };
+      toU32Array = function(ptr, length) {
+        //var tmp = HEAPU8.subarray(ptr, ptr + (length * 4));
+        return new Uint32Array(HEAPU8.buffer, ptr, length);
+      };
+      instance.streamBuffer = toU8Array(Module._broadwayCreateStream(MAX_STREAM_BUFFER_LENGTH), MAX_STREAM_BUFFER_LENGTH);
+      instance.pictureBuffers = {};
+      // collect extra infos that are provided with the nal units
+      instance.infoAr = [];
+
+      /**
      * Decodes a stream buffer. This may be one single (unframed) NAL unit without the
      * start code, or a sequence of NAL units with framing start code prefixes. This
      * function overwrites stream buffer allocated by the codec with the supplied buffer.
      */
-
-    var sliceNum = 0;
-    if (this.options.sliceMode){
-      sliceNum = this.options.sliceNum;
-
-      this.decode = function decode(typedAr, parInfo, copyDoneFun) {
-        this.infoAr.push(parInfo);
-        parInfo.startDecoding = nowValue();
-        var nals = parInfo.nals;
-        var i;
-        if (!nals){
-          nals = [];
-          parInfo.nals = nals;
-          var l = typedAr.length;
-          var foundSomething = false;
-          var lastFound = 0;
-          var lastStart = 0;
-          for (i = 0; i < l; ++i){
-            if (typedAr[i] === 1){
-              if (
-                typedAr[i - 1] === 0 &&
-                typedAr[i - 2] === 0
-              ){
-                var startPos = i - 2;
-                if (typedAr[i - 3] === 0){
-                  startPos = i - 3;
-                };
-                // its a nal;
-                if (foundSomething){
-                  nals.push({
-                    offset: lastFound,
-                    end: startPos,
-                    type: typedAr[lastStart] & 31
-                  });
-                };
-                lastFound = startPos;
-                lastStart = startPos + 3;
-                if (typedAr[i - 3] === 0){
-                  lastStart = startPos + 4;
+
+      var sliceNum = 0;
+      if (instance.options.sliceMode){
+        sliceNum = instance.options.sliceNum;
+
+        instance.decode = function decode(typedAr, parInfo, copyDoneFun) {
+          instance.infoAr.push(parInfo);
+          parInfo.startDecoding = nowValue();
+          var nals = parInfo.nals;
+          var i;
+          if (!nals){
+            nals = [];
+            parInfo.nals = nals;
+            var l = typedAr.length;
+            var foundSomething = false;
+            var lastFound = 0;
+            var lastStart = 0;
+            for (i = 0; i < l; ++i){
+              if (typedAr[i] === 1){
+                if (
+                  typedAr[i - 1] === 0 &&
+                  typedAr[i - 2] === 0
+                ){
+                  var startPos = i - 2;
+                  if (typedAr[i - 3] === 0){
+                    startPos = i - 3;
+                  };
+                  // its a nal;
+                  if (foundSomething){
+                    nals.push({
+                      offset: lastFound,
+                      end: startPos,
+                      type: typedAr[lastStart] & 31
+                    });
+                  };
+                  lastFound = startPos;
+                  lastStart = startPos + 3;
+                  if (typedAr[i - 3] === 0){
+                    lastStart = startPos + 4;
+                  };
+                  foundSomething = true;
                 };
-                foundSomething = true;
               };
             };
+            if (foundSomething){
+              nals.push({
+                offset: lastFound,
+                end: i,
+                type: typedAr[lastStart] & 31
+              });
+            };
           };
-          if (foundSomething){
-            nals.push({
-              offset: lastFound,
-              end: i,
-              type: typedAr[lastStart] & 31
-            });
-          };
-        };
-
-        var currentSlice = 0;
-        var playAr;
-        var offset = 0;
-        for (i = 0; i < nals.length; ++i){
-          if (nals[i].type === 1 || nals[i].type === 5){
-            if (currentSlice === sliceNum){
+
+          var currentSlice = 0;
+          var playAr;
+          var offset = 0;
+          for (i = 0; i < nals.length; ++i){
+            if (nals[i].type === 1 || nals[i].type === 5){
+              if (currentSlice === sliceNum){
+                playAr = typedAr.subarray(nals[i].offset, nals[i].end);
+                instance.streamBuffer[offset] = 0;
+                offset += 1;
+                instance.streamBuffer.set(playAr, offset);
+                offset += playAr.length;
+              };
+              currentSlice += 1;
+            }else{
               playAr = typedAr.subarray(nals[i].offset, nals[i].end);
-              this.streamBuffer[offset] = 0;
+              instance.streamBuffer[offset] = 0;
               offset += 1;
-              this.streamBuffer.set(playAr, offset);
+              instance.streamBuffer.set(playAr, offset);
               offset += playAr.length;
+              Module._broadwayPlayStream(offset);
+              offset = 0;
             };
-            currentSlice += 1;
-          }else{
-            playAr = typedAr.subarray(nals[i].offset, nals[i].end);
-            this.streamBuffer[offset] = 0;
-            offset += 1;
-            this.streamBuffer.set(playAr, offset);
-            offset += playAr.length;
-            Module._broadwayPlayStream(offset);
-            offset = 0;
           };
+          copyDoneFun();
+          Module._broadwayPlayStream(offset);
+        };
+
+      }else{
+        instance.decode = function decode(typedAr, parInfo) {
+          // console.info("Decoding: " + buffer.length);
+          // collect infos
+          if (parInfo){
+            instance.infoAr.push(parInfo);
+            parInfo.startDecoding = nowValue();
+          };
+
+          instance.streamBuffer.set(typedAr);
+          Module._broadwayPlayStream(typedAr.length);
         };
-        copyDoneFun();
-        Module._broadwayPlayStream(offset);
       };
 
-    }else{
-      this.decode = function decode(typedAr, parInfo) {
-        // console.info("Decoding: " + buffer.length);
-        // collect infos
-        if (parInfo){
-          this.infoAr.push(parInfo);
-          parInfo.startDecoding = nowValue();
+      if (bufferedCalls.length){
+        var bi = 0;
+        for (bi = 0; bi < bufferedCalls.length; ++bi){
+          instance.decode(bufferedCalls[bi][0], bufferedCalls[bi][1], bufferedCalls[bi][2]);
         };
-
-        this.streamBuffer.set(typedAr);
-        Module._broadwayPlayStream(typedAr.length);
+        bufferedCalls = [];
       };
-    };
+
+      instance.onDecoderReady(instance);
+
+    });
+
 
   };
 

diff --git a/templates/DecoderPre.js b/templates/DecoderPre.js
@@ -42,6 +42,8 @@
   };
 
 
+
+
   var getModule = function(par_broadwayOnHeadersDecoded, par_broadwayOnPictureDecoded){
 
 
@@ -58,5 +60,6 @@
     
     */
 
-    var Module = (function(){
+    //var Module = (function(){
+
-Original file line number
+Diff line change
@@ Expand Up / @@ -42,6 +42,8 @@ @@
       };
       var getModule = function(par_broadwayOnHeadersDecoded, par_broadwayOnPictureDecoded){
@@ Expand All / @@ -58,5 +60,6 @@ @@
         */
-        var Module = (function(){
+        //var Module = (function(){