Merge branch 'develop' into opencv

BrennoCaldato · BrennoCaldato · commit 51f8154fbd51 · 2020-08-18T21:10:47.000-03:00
diff --git a/src/timeline/app.js b/src/timeline/app.js
@@ -27,8 +27,7 @@
  */
 
 // Initialize Angular application
-/*global App, timeline, angular*/
-var timeline = null;
+/*global App, angular, timeline, init_mixin*/
 var App = angular.module("openshot-timeline", ["ui.bootstrap", "ngAnimate"]);
 
 
@@ -37,18 +36,8 @@ $(document).ready(function () {
 
   var body_object = $("body");
 
-  // Check for Qt Integration
-  new QWebChannel(qt.webChannelTransport, function (channel) {
-    timeline = channel.objects.timeline;
-    timeline.qt_log("INFO", "Qt Ready");
-
-    // Only enable Qt once Angular as initialized
-    angular.element(document).ready(function () {
-      timeline.qt_log("INFO", "Angular Ready");
-      body_object.scope().enableQt();
-    });
-
-  });
+  // Initialize Qt Mixin (WebEngine or WebKit)
+  init_mixin();
 
   /// Capture window resize event, and resize scrollable divs (i.e. track container)
   $(window).resize(function () {
@@ -64,8 +53,8 @@ $(document).ready(function () {
 
     track_controls.height(new_track_height);
     $("#scrolling_tracks").height(new_track_height);
-      body_object.scope().playhead_height = $("#track-container").height();
-      $(".playhead-line").height(body_object.scope().playhead_height);
+    body_object.scope().playhead_height = $("#track-container").height();
+    $(".playhead-line").height(body_object.scope().playhead_height);
   });
 
   // Bind to keydown event (to detect SHIFT)
diff --git a/src/timeline/index.html b/src/timeline/index.html
@@ -17,7 +17,7 @@
         <script type="text/javascript" src="media/js/angular-animate.min.js"></script>
 		
         <!-- OpenShot JavaScript Sources -->
-        <script type="text/javascript" src="js/qwebchannel.js"></script>
+        {{MIXIN_JS_INCLUDE}}
         <script type="text/javascript" src="app.js"></script>
         <script type="text/javascript" src="js/functions.js"></script>
     	<script type="text/javascript" src="js/controllers.js"></script>
diff --git a/src/timeline/js/mixin_webengine.js b/src/timeline/js/mixin_webengine.js
@@ -0,0 +1,46 @@
+/**
+ * @file
+ * @brief JavaScript file to initialize QtWebEngine JS mixin
+ * @author Jonathan Thomas <jonathan@openshot.org>
+ *
+ * @section LICENSE
+ *
+ * Copyright (c) 2008-2018 OpenShot Studios, LLC
+ * <http://www.openshotstudios.com/>. This file is part of
+ * OpenShot Video Editor, an open-source project dedicated to
+ * delivering high quality video editing and animation solutions to the
+ * world. For more information visit <http://www.openshot.org/>.
+ *
+ * OpenShot Video Editor is free software: you can redistribute it
+ * and/or modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * OpenShot Video Editor is distributed in the hope that it will be
+ * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with OpenShot Library.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/*global timeline, angular, QWebChannel*/
+var timeline = null;
+
+function init_mixin() {
+
+  // Check for Qt Integration
+  var channel = new QWebChannel(qt.webChannelTransport, function (channel) {
+    timeline = channel.objects.timeline;
+    timeline.qt_log("INFO", "Qt Ready");
+
+    // Only enable Qt once Angular as initialized
+    angular.element(document).ready(function () {
+      timeline.qt_log("INFO", "Angular Ready");
+      $("body").scope().enableQt();
+    });
+
+  });
+
+}
diff --git a/src/timeline/js/mixin_webkit.js b/src/timeline/js/mixin_webkit.js
@@ -0,0 +1,41 @@
+/**
+ * @file
+ * @brief JavaScript file to initialize QtWebKit JS mixin
+ * @author Jonathan Thomas <jonathan@openshot.org>
+ *
+ * @section LICENSE
+ *
+ * Copyright (c) 2008-2018 OpenShot Studios, LLC
+ * <http://www.openshotstudios.com/>. This file is part of
+ * OpenShot Video Editor, an open-source project dedicated to
+ * delivering high quality video editing and animation solutions to the
+ * world. For more information visit <http://www.openshot.org/>.
+ *
+ * OpenShot Video Editor is free software: you can redistribute it
+ * and/or modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * OpenShot Video Editor is distributed in the hope that it will be
+ * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with OpenShot Library.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/*global timeline, qt, angular*/
+
+function init_mixin() {
+
+  // Only enable Qt once Angular as initialized
+  angular.element(document).ready(function () {
+    if (typeof timeline !== "undefined") {
+      timeline.qt_log("INFO", "Qt Ready");
+      $("body").scope().enableQt();
+    }
+    timeline.qt_log("INFO", "Angular Ready");
+  });
+
+}
diff --git a/src/windows/main_window.py b/src/windows/main_window.py
@@ -284,31 +284,33 @@ def create_lock_file(self):
             self.clear_all_thumbnails()
 
         # Write lock file (try a few times if failure)
-        attempts = 5
-        while attempts > 0:
+        for attempt in range(5):
             try:
                 # Create lock file
                 with open(lock_path, 'w') as f:
                     f.write(lock_value)
+                log.debug("Wrote value {} to lock file {}".format(
+                    lock_value, lock_path))
                 break
-            except Exception:
-                log.debug('Failed to write lock file (attempt: %s)' % attempts)
-                attempts -= 1
+            except OSError:
+                log.debug('Failed to write lock file (attempt: {})'.format(
+                    attempt), exc_info=1)
                 sleep(0.25)
 
     def destroy_lock_file(self):
         """Destroy the lock file"""
         lock_path = os.path.join(info.USER_PATH, ".lock")
 
         # Remove file (try a few times if failure)
-        attempts = 5
-        while attempts > 0:
+        for attempt in range(5):
             try:
                 os.remove(lock_path)
+                log.debug("Removed lock file {}".format(lock_path))
                 break
-            except Exception:
-                log.debug('Failed to destroy lock file (attempt: %s)' % attempts)
-                attempts -= 1
+            except FileNotFoundError:
+                break
+            except OSError:
+                log.debug('Failed to destroy lock file (attempt: %s)' % attempt, exc_info=1)
                 sleep(0.25)
 
     def tail_file(self, f, n, offset=None):
diff --git a/src/windows/preferences.py b/src/windows/preferences.py
@@ -297,11 +297,13 @@ def Populate(self, filter=""):
                                 value_list.remove(value_item)
 
                         # Remove hardware mode items which cannot decode the example video
+                        log.debug("Preparing to test hardware decoding: %s" % (value_list))
                         for value_item in list(value_list):
                             v = value_item["value"]
-                            if not self.testHardwareDecode(v, 0) and \
-                                not self.testHardwareDecode(v, 1):
+                            if not self.testHardwareDecode(value_list, v, 0) and \
+                                not self.testHardwareDecode(value_list, v, 1):
                                 value_list.remove(value_item)
+                        log.debug("Completed hardware decoding testing")
 
                     # Replace %s dropdown values for hardware acceleration
                     if param["setting"] in ("graca_number_en", "graca_number_de"):
@@ -536,10 +538,11 @@ def dropdown_index_changed(self, widget, param, index):
         # Check for restart
         self.check_for_restart(param)
 
-    def testHardwareDecode(self, decoder, decoder_card="0"):
+    def testHardwareDecode(self, all_decoders, decoder, decoder_card="0"):
         """Test specific settings for hardware decode, so the UI can remove unsupported options."""
         is_supported = False
         example_media = os.path.join(info.RESOURCES_PATH, "hardware-example.mp4")
+        decoder_name = next(item for item in all_decoders if item["value"] == str(decoder)).get("name", "Unknown")
 
         # Persist decoder card results
         if decoder_card not in self.hardware_tests_cards:
@@ -552,6 +555,9 @@ def testHardwareDecode(self, decoder, decoder_card="0"):
         # Keep track of previous settings
         current_decoder = openshot.Settings.Instance().HARDWARE_DECODER
         current_decoder_card = openshot.Settings.Instance().HW_DE_DEVICE_SET
+        current_decoder_name = \
+            next(item for item in all_decoders if item["value"] == str(current_decoder)).get("name", "Unknown")
+        log.debug("Current hardware decoder: %s (%s-%s)" % (current_decoder_name, current_decoder, current_decoder_card))
 
         try:
             # Temp override hardware settings (to test them)
@@ -566,17 +572,21 @@ def testHardwareDecode(self, decoder, decoder_card="0"):
             reader.Open()
 
             # Test decoded pixel values for a valid decode (based on hardware-example.mp4)
+            log.debug("Testing hardware decoder: %s (%s-%s)" % (decoder_name, decoder, decoder_card))
             if reader.GetFrame(0).CheckPixel(0, 0, 2, 133, 255, 255, 5):
                 is_supported = True
                 self.hardware_tests_cards[decoder_card].append(int(decoder))
+                log.debug("Successful hardware decoder! %s (%s-%s)" % (decoder_name, decoder, decoder_card))
             else:
-                log.warning("CheckPixel failed testing hardware decoding in preferences (i.e. wrong color found): %s-%s" % (decoder, decoder_card))
+                log.debug("CheckPixel failed testing hardware decoding (i.e. wrong color found): %s (%s-%s)" %
+                            (decoder_name, decoder, decoder_card))
 
             reader.Close()
             clip.Close()
 
         except:
-            log.warning("Exception trying to test hardware decoding in preferences (this is expected): %s-%s" % (decoder, decoder_card))
+            log.debug("Exception trying to test hardware decoding (this is expected): %s (%s-%s)" %
+                        (decoder_name, decoder, decoder_card))
 
         # Resume current settings
         openshot.Settings.Instance().HARDWARE_DECODER = current_decoder
diff --git a/src/windows/views/timeline_mixins.py b/src/windows/views/timeline_mixins.py
diff --git a/src/windows/views/timeline_webview.py b/src/windows/views/timeline_webview.py
