Merge pull request #964 from pliablepixels/dev

Dev

2 files changed, 50 insertions, 18 deletions

diff --git a/docs/guides/FAQ.rst b/docs/guides/FAQ.rst
index 17e45d20..cb67a498 100644
--- a/docs/guides/FAQ.rst
+++ b/docs/guides/FAQ.rst
@@ -56,7 +56,7 @@ This is why:
   site or send it to a colleague or family member who may make it available for
   everyone else to download. I know most of you have no such intentions, but I know
   for sure, a few do (I've had my apk show up on mediashare sites in the past).
-  For everyone who has asked me to "make an exception only once", I'd do that only
+  For everyone who has asked me to make an exception only once, I'd do that only
   if I knew you. If I did not, I should be making the same exception to 
   everyone who has asked me.
 
@@ -632,6 +632,29 @@ Event stream viewing does not work
 
 -  Look at apache error logs - it often gives you hints
 
+Video takes too long to play
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+- Around April 2020, I've received the occasional email about videos suddenly Taking
+  longer to play. There are a few potential reasons for this:
+
+  - You upgraded zoneminder and switched your monitors to store mp4 videos. When you
+    do that, the mobile device takes time to download the video. Yes, I know your desktop
+    browser is faster. Maybe that is how mobile video players work. I don't do anything special
+    in zmNinja - I just pass the video to the browser canvas to play using ``<video>`` tags.
+
+  - A change was made to ZoneMinder which allowed "fragmented" videos to be played.
+    This allows videos that are in progress to be played. Technically, it should make
+    things faster but some have complained this makes download slower.
+
+  - Potential solutions:
+
+    - In zmNinja, go to ``Menu->Monitors``, click on ``Configuration`` for that monitor
+      and enable "Force MJPEG". This will force MPJEG playback for events
+
+    - I am told in future versions of ZoneMinder, there will be an option to turn off
+      this fragmented feature. Note that if you turn it off, you may not get push notification
+      animations in zmninja (if you have it enabled)
+
 Video Not Playable
 ~~~~~~~~~~~~~~~~~~
 -  Your video may be using a codec that is not supported on mobile browsers.
diff --git a/docs/guides/source.rst b/docs/guides/source.rst
index 1eb67b32..c1f62f1a 100644
--- a/docs/guides/source.rst
+++ b/docs/guides/source.rst
@@ -24,28 +24,33 @@ Output of ``ionic info``
 
 ::
 
+ 
     Ionic:
 
-       ionic (Ionic CLI) : 4.5.0 (/usr/local/lib/node_modules/ionic)
-       Ionic Framework   : ionic1 1.3.5
-       @ionic/v1-toolkit : 1.0.19
+    Ionic CLI         : 6.9.3 (/Users/pp/.nvm/versions/node/v12.17.0/lib/node_modules/@ionic/cli)
+    Ionic Framework   : unknown
+    @ionic/v1-toolkit : 1.0.22
 
     Cordova:
 
-       cordova (Cordova CLI) : 8.1.2 (cordova-lib@8.1.1)
-       Cordova Platforms     : android 7.1.4, ios 5.0.0
-       Cordova Plugins       : cordova-plugin-ionic-keyboard 2.1.3, cordova-plugin-ionic-webview 2.2.0,
-    (and 30 other plugins)
+    Cordova CLI       : 9.0.0 (cordova-lib@9.0.1)
+    Cordova Platforms : android 8.1.0, ios 5.1.1
+    Cordova Plugins   : cordova-plugin-ionic-keyboard 2.2.0, (and 29 other plugins)
+
+    Utility:
+
+    cordova-res : not installed
+    native-run  : not installed
 
     System:
 
-       Android SDK Tools : 26.1.1 (/Users/pp/Library/Android/sdk/)
-       ios-deploy        : 2.0.0
-       ios-sim           : 7.0.0
-       NodeJS            : v8.11.2 (/usr/local/bin/node)
-       npm               : 5.6.0
-       OS                : macOS Mojave
-       Xcode             : Xcode 10.1 Build version 10B61
+    Android SDK Tools : 26.1.1 (/Users/pp/Library/Android/sdk)
+    ios-deploy        : 1.10.0
+    ios-sim           : 8.0.2
+    NodeJS            : v12.17.0 (/Users/pp/.nvm/versions/node/v12.17.0/bin/node)
+    npm               : 6.14.4
+    OS                : macOS Catalina
+    Xcode             : Xcode 11.6 Build version 11E708
 
 Install Dependencies - needed for all platforms
 -----------------------------------------------
@@ -120,7 +125,7 @@ this)
 
 (Harder) If you need picture notification support in push
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-As of Mar 2019, cordova-ios does not support multiple targets, nor does 
+As of Aug 2020, cordova-ios does not support multiple targets, nor does 
 it support automatic building of notification extensions. So there is manual work to be done:
 
 - Open up ``platforms/ios/zmNinja.xcworkspace`` in XCode
@@ -133,8 +138,12 @@ it support automatic building of notification extensions. So there is manual wor
 - Now in XCode Targets, select ``zmNinjaNotification``, and make sure you select a Team and make sure Deployment Target is 11 or above
 - Change Deployment target to 11 or above (same as zmNinja target)
 - ``cp etc/NotificationService.m platforms/ios/zmNinjaNotification/``
-- ``cd platforms/ios/``
-- ``pod install``
+
+Starting 1.5.0, zmNinja uses the `cordova-plugin-firebasex <https://github.com/dpa99c/cordova-plugin-firebasex>`__ 
+library for push notifications. The older cordova-push-plugin is no longer supported by the author.
+If you are facing compilation issues that relate to this plugin, please make sure you read it's troubleshooting section,
+especially around outdated pods et. al.
+
 
 You can now do `build_ios.sh`. However, after you build, you will have to go back to XCode
 after the build to make the following changes: