add Broadway as submoduler, cleanup

matijagaspar · Oct 19, 2019 · 22b966a · 22b966a
1 parent bfb9e90
commit 22b966a
Show file tree

Hide file tree

Showing 19 changed files with 17 additions and 968 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "Broadway"]
+	path = Broadway
+	url = https://github.com/mbebenita/Broadway.git
diff --git a/Broadway b/Broadway
diff --git a/README.md b/README.md
@@ -67,11 +67,12 @@ npm run example raspivid
 It will automatically run raspivid too
 
 # TODO:
- * Decoder as worker
+ * ~Decoder as worker~
  * More docs
  * More cleanup
  * Audio
  * ~Ability to change video resolution or better parse sps/pps~
+ * ~Decent performance~
 
 # Credits
 * [matijagaspar](https://github.com/matijagaspar)

diff --git a/lib/WSAvcPlayer.js b/lib/WSAvcPlayer.js
diff --git a/player/WSAvcPlayer-old.js b/player/WSAvcPlayer-old.js
diff --git a/player/WSAvcPlayer.js b/player/WSAvcPlayer.js
@@ -1,14 +1,9 @@
 'use strict'
 
-// import Avc from 'broadway/Decoder'
-
-// import Size from 'utils/Size'
-// import DecoderAsWorker from './DecoderAsWorker'
 const Player = require('Broadway/Player')
 const { EventEmitter } = require('events')
 const debug = require('debug')
 
-
 const log = debug('wsavc')
 class WSAvcPlayer extends EventEmitter {
     constructor ({ useWorker, workerFile } = {}) {
@@ -26,34 +21,21 @@ class WSAvcPlayer extends EventEmitter {
                 height: 368,
             },
         })
-        // this.AvcPlayer.canvas
         this.width = 1280
         this.height = 1024
-        this.AvcPlayer.onPictureDecoded = (_, w, h, i) => {
-            // console.log('pic decoded', i)
+        this.AvcPlayer.onPictureDecoded = (_, w, h) => {
             if (w !== this.width || h !== this.height) {
                 this.emit('resized', { width: w, height: h })
                 this.width = w
                 this.height = h
             }
-            // if (this.running) {
-            //     clearTimeout(this.shiftFrameTimeout)
-            //     this.shiftFrameTimeout = null
-            //     this.shiftFrameTimeout = setTimeout(this.shiftFrame, 1)
-            // }
         }
 
         this.ws
         this.pktnum = 0
         this.framesList = []
         this.running = false
         this.shiftFrameTimeout = null
-        this.AvcPlayer.onRenderFrameComplete = (...s) => {
-            // console.log('render frame complete', s)
-            // if (this.framesList.length > 0) {
-
-        }
-        // onPictureDecoded
     }
 
     shiftFrame = () => {

diff --git a/player/canvas/Program.js b/player/canvas/Program.js
diff --git a/player/canvas/README.md b/player/canvas/README.md
diff --git a/player/canvas/Script.js b/player/canvas/Script.js
diff --git a/player/canvas/Shader.js b/player/canvas/Shader.js