no need to inject loadfile.c

Author: stevevista

.gitignore

@@ -21,3 +21,4 @@ README.pdf
 .third-party
 *.lib
 ipc_channels.prod.json
+*.weights

README.md

@@ -65,6 +65,9 @@ UNZIP PREBUILT LIBRARIES TO <SRC>/.third-party/prebuilt
 
 COPY OPENGL HEADERS TO <SRC>/.third-party/prebuilt/include
 
+Download yolov4-tiny.weights and put it in electron-mpv root directory
+
+
 
 ## YOLOv4:
 * **source code:** https://github.com/AlexeyAB/darknet

package-lock.json

@@ -245,7 +245,6 @@ set(MPV_BASIC_SOURCES
   src/mpv/sub/ass_mp.c
   src/mpv/sub/osd.c
   src/mpv/sub/osd_libass.c
-  src/mpv/sub/sd_ass.c
   src/mpv/sub/dec_sub.c
   src/mpv/sub/img_convert.c
   src/mpv/sub/sd_lavc.c
@@ -315,6 +314,7 @@ set(MPV_BASIC_SOURCES
   src/mpv/video/out/gpu/libmpv_gpu.c
   src/mpv/video/out/opengl/libmpv_gl.c
   src/mpv/video/out/opengl/context.c
+  src/mpv/player/loadfile.c
   src/mpv/player/audio.c
   src/mpv/player/video.c
   src/mpv/player/client.c
@@ -328,12 +328,9 @@ set(MPV_BASIC_SOURCES
   src/mpv/player/configfiles.c
   src/mpv/player/external_files.c
   src/mpv/player/scripting.c
-  src/sd_ass_ai.c
+  src/mpv-patched/sub/sd_ass.c
   src/mpv-patched/stream/stream_lavf.c
-  src/mpv-patched/filters/f_decoder_wrapper.c
-  src/mpv-patched/player/loadfile.c)
-
-set_source_files_properties(src/mpv/sub/sd_ass.c PROPERTIES COMPILE_FLAGS /Dsd_ass=orgin_sd_ass)
+  src/mpv-patched/filters/f_decoder_wrapper.c)
 
 add_library(mpv_common_objs OBJECT ${MPV_BASIC_SOURCES})
 mpv_compile_definitions(mpv_common_objs)
@@ -367,6 +364,8 @@ execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory "${PROJECT_BINARY_DIR
 execute_process(COMMAND python "${MPV_SRC_PATH}/TOOLS/file2string.py" "${MPV_SRC_PATH}/etc/builtin.conf" OUTPUT_FILE "${PROJECT_BINARY_DIR}/generated/etc/builtin.conf.inc")
 execute_process(COMMAND python "${MPV_SRC_PATH}/TOOLS/file2string.py" "${MPV_SRC_PATH}/etc/input.conf" OUTPUT_FILE "${PROJECT_BINARY_DIR}/generated/etc/input.conf.inc")
 execute_process(COMMAND python "${MPV_SRC_PATH}/TOOLS/file2string.py" "${MPV_SRC_PATH}/sub/osd_font.otf" OUTPUT_FILE "${PROJECT_BINARY_DIR}/generated/sub/osd_font.otf.inc")
+execute_process(COMMAND python "${MPV_SRC_PATH}/TOOLS/matroska.py" "--generate-header" OUTPUT_FILE "${PROJECT_BINARY_DIR}/generated/ebml_types.h")
+execute_process(COMMAND python "${MPV_SRC_PATH}/TOOLS/matroska.py" "--generate-definitions" OUTPUT_FILE "${PROJECT_BINARY_DIR}/generated/ebml_defs_REAL.c")
 
 add_library(mpv-core SHARED 
   $<TARGET_OBJECTS:mpv_common_objs>

src/nacl-mpv-plugin/CMakeLists.txt

@@ -1,6 +1,6 @@
 // nameing with postfix 'Plugin', to workaround test script without window.require
 const PlayerPlugin = require('./player')
-const { mime } = require('./index')
+const { mime: mimePlayer } = require('./index')
 
 function attrTrue (val) {
   return val === '' ||
@@ -12,9 +12,7 @@ class BasePlayerElement extends HTMLElement {
     super()
 
     const shadowRoot = this.attachShadow({mode: 'closed'});
-    shadowRoot.innerHTML = `
-    <embed id="player" type="${mime}" style="pointer-events:none; display: block; width: 100%; height: 100%" />
-    `
+    shadowRoot.innerHTML = this.constructor._innerHTML
 
     this._root = shadowRoot
 
@@ -138,16 +136,10 @@ class BasePlayerElement extends HTMLElement {
       this._root.appendChild(style);
       this._root.appendChild(loadingIcon);
 
-      this.addEventListener('start-file', () => {
-        loadingIcon.style.display = 'block'
-      })
-
-      this.addEventListener('end-file', () => {
-        loadingIcon.style.display = 'none'
-      })
-
-      this.addEventListener('file-loaded', () => {
-        loadingIcon.style.display = 'none'
+      this.addEventListener('prop-change', (name, value) => {
+        if (name === 'loading') {
+          loadingIcon.style.display = value ? 'block' : 'none'
+        }
       })
     }
   }
@@ -212,6 +204,12 @@ BasePlayerElement.prototype.addEventListener = function (type, listener, ...args
 }
 
 class PlayerElement extends BasePlayerElement {
+  static get _innerHTML () {
+    return `
+      <embed id="player" type="${mimePlayer}" style="pointer-events:none; display: block; width: 100%; height: 100%" />
+    `
+  }
+
   static _PluginClass = PlayerPlugin
 
   // Specify observed attributes so that
@@ -240,6 +238,11 @@ class PlayerElement extends BasePlayerElement {
     this.$player.option('osd-font-size', 30)
     this.$player.option('osd-duration', 2000)
     this.$player.option('screenshot-template', `pic-%tY%tm%td-%tH%tM-%ws`)
+
+    const logPath = this.getAttribute('debug-log')
+    if (logPath) {
+      this.$player.option('log-file', logPath)
+    }
   }
 
   _attributeChangedCallback (name, oldValue, newValue) {
@@ -363,6 +366,10 @@ class PlayerElement extends BasePlayerElement {
     if (args[0] === false) {
     } else {
       const {each, subtitles} = (args[0] || {})
+      if (each) {
+        const screenshotting = this.$player.props.screenshotting
+        this.$player.triggerProp('screenshotting', !screenshotting)
+      }
       this.$player.command('osd-auto', 'screenshot', (each ? 'each-frame+' : '') + (subtitles ? 'subtitles' : 'video'))
     }
   }
@@ -390,8 +397,9 @@ customElements.define('x-mpv', PlayerElement)
 
 /*
 ------------ local player -----------------
-<x-mpv
+<x-player
   src="string"
+  debug-log="string"
   hwaccel="string"
   locale="string"
   ai-switch="string array[a,b,c,...]"
@@ -405,7 +413,7 @@ customElements.define('x-mpv', PlayerElement)
   mute="boolean"
   show-loading="boolean" # persistant
 >
-</x-mpv>
+</x-player>
 
 [api]
 object.queryProperty(name) -> value or undefined
@@ -429,49 +437,4 @@ start-file: empty
 file-loaded: empty
 end-file: empty
 auth-require: (url)
-
------------- live player -----------------
-[api]
-object.queryProperty(name) -> value or undefined
-object.load(src, mode, options)
-object.reload()
-object.play()
-object.stop()
-object.screenshot({name, basePath, format, detection, maxCount, interval, scheduleType} | false)
-object.talk({encoding, sampleRate, bitRate} | false)
-object.record({name, basePath, limitBytes} | false)
-object.crop([x0, y0, x1, y1])
-
-[property set]
-object.fullscreen = boolean
-
-[events] object.addEventListener(event, listener)
-prop-change: (name, value)
- *name list
-   -  path
-   -  fileFormat
-   -  videoCodec
-   -  audioCodec
-   -  duration
-   -  timePos
-   -  fps
-   -  drops
-   -  fullscreen
-   -  screenshotting
-   -  talking
-   -  recording
-   -  idle
-   -  width
-   -  height
-   -  mute
-
-start-file: empty
-file-loaded: empty
-end-file: empty
-record-path: (path)
-error-msg: (msg)
-detection: ([detection objects])
-screenshot: ({path, success})
-auth-require: (url)
-
 */

src/nacl-mpv-plugin/player-components.js

@@ -16,6 +16,8 @@ class MPVPlayer extends PluginBase {
     this.hooks = []; // array of callbacks, id is index+1
 
     this.props = {
+      loading: false,
+      screenshotting: false,
       fullscreen: false,
       mute: false,
       volume: 100,
@@ -93,7 +95,8 @@ class MPVPlayer extends PluginBase {
       'estimated-frame-count',
       'hwdec-current',
       'options/demuxer-lavf-hacks',
-      'options/demuxer-lavf-o' // {auth: user:pass}
+      'options/demuxer-lavf-o', // {auth: user:pass}
+      'track-list'
     ].forEach(name => {
       this.observe_property(name)
     });
@@ -106,8 +109,7 @@ class MPVPlayer extends PluginBase {
       if (cb) {
         cb(e.name, e.data);
       } else if (e.id === undefined) {
-        this.onPropertyChangeDefault(e.name, e.data)
-        this._on_prop(e.name, e.data)
+        this.triggerProp(e.name, e.data)
       }
     });
 
@@ -190,6 +192,26 @@ class MPVPlayer extends PluginBase {
 
       cont()
     })
+
+    // generate loading & screenshotting properties
+    this.register_event('start-file', () => {
+      this.triggerProp('loading', true)
+      this.triggerProp('screenshotting', false)
+    })
+
+    this.register_event('end-file', () => {
+      this.triggerProp('loading', false)
+      this.triggerProp('screenshotting', false)
+    })
+
+    this.register_event('file-loaded', () => {
+      this.triggerProp('loading', false)
+    })
+  }
+
+  triggerProp (name, value) {
+    this.onPropertyChangeDefault(name, value)
+    this._on_prop(name, value)
   }
 
   handleKeyDown (e) {