Merge pull request #11 from mfat/testing

mfat · web-flow · commit 5976c1535249 · 2025-03-08T02:42:04.000+03:30
Testing to main
diff --git a/tvhplayer/tvhplayer.py b/tvhplayer/tvhplayer.py
@@ -889,7 +889,7 @@ def __init__(self):
         self.recording_animation = None
         self.opacity_effect = None
         
-        # Initialize VLC
+        # Initialize VLC with basic instance first
         print("Debug: Initializing VLC instance")
         try:
             if getattr(sys, 'frozen', False):
@@ -906,12 +906,21 @@ def __init__(self):
                     
                 print(f"Debug: VLC plugin path set to: {plugin_path}")
                 
-            # Initialize VLC without arguments
-            self.instance = vlc.Instance()
+            # Initialize VLC with hardware acceleration parameters
+            vlc_args = [
+                # Enable hardware decoding
+                '--avcodec-hw=any',  # Try any hardware acceleration method
+                '--file-caching=1000',  # Increase file caching for smoother playback
+                '--network-caching=1000',  # Increase network caching for streaming
+                '--no-video-title-show',  # Don't show the video title
+                '--no-snapshot-preview',  # Don't show snapshot previews
+            ]
+            
+            self.instance = vlc.Instance(vlc_args)
             if not self.instance:
                 raise RuntimeError("VLC Instance creation returned None")
                 
-            print("Debug: VLC instance created successfully")
+            print("Debug: VLC instance created successfully with hardware acceleration")
             
             self.media_player = self.instance.media_player_new()
             if not self.media_player:
@@ -923,26 +932,44 @@ def __init__(self):
             print(f"Error initializing VLC: {str(e)}")
             raise RuntimeError(f"Failed to initialize VLC: {str(e)}")
         
-        
-
         # Then setup UI
         self.setup_ui()
         
         # Update to use config for last server
         self.server_combo.setCurrentIndex(self.config.get('last_server', 0))
         
-        #Set player window - with proper type conversion
-
-        if sys.platform.startswith('linux'):
-            handle = self.video_frame.winId().__int__()
-            if handle is not None:
-                self.media_player.set_xwindow(handle)
-        elif sys.platform == "win32":
-           self.media_player.set_hwnd(self.video_frame.winId().__int__())
-        elif sys.platform == "darwin":
-           self.media_player.set_nsobject(self.video_frame.winId().__int__())
-    
-          
+        # Now configure hardware acceleration after UI is set up
+        try:
+            # Set player window - with proper type conversion
+            if sys.platform.startswith('linux'):
+                handle = self.video_frame.winId().__int__()
+                if handle is not None:
+                    self.media_player.set_xwindow(handle)
+            elif sys.platform == "win32":
+                self.media_player.set_hwnd(self.video_frame.winId().__int__())
+            elif sys.platform == "darwin":
+                self.media_player.set_nsobject(self.video_frame.winId().__int__())
+            
+            # Set hardware decoding to automatic
+            if hasattr(self.media_player, 'set_hardware_decoding'):
+                self.media_player.set_hardware_decoding(True)
+            else:
+                # Alternative method for older VLC Python bindings
+                self.media_player.video_set_key_input(False)
+                self.media_player.video_set_mouse_input(False)
+            
+            # Add a timer to check which hardware acceleration method is being used
+            # This will check after playback starts
+            self.hw_check_timer = QTimer()
+            self.hw_check_timer.setSingleShot(True)
+            self.hw_check_timer.timeout.connect(self.check_hardware_acceleration)
+            self.hw_check_timer.start(5000)  # Check after 5 seconds of playback
+                
+            print("Debug: Hardware acceleration configured for VLC")
+            
+        except Exception as e:
+            print(f"Warning: Could not configure hardware acceleration: {str(e)}")
+            print("Continuing without hardware acceleration")
     
     def setup_paths(self):
         """Setup application paths for resources"""
@@ -2528,6 +2555,52 @@ def filter_channels(self, search_text):
                 channel_name = item.text().lower()
                 self.channel_list.setRowHidden(row, search_text not in channel_name)
 
+    def check_hardware_acceleration(self):
+        """Check and print which hardware acceleration method is being used"""
+        if not self.media_player:
+            return
+            
+        # This only works if a media is playing
+        if not self.media_player.is_playing():
+            return
+            
+        try:
+            # Get media statistics - handle different VLC Python binding versions
+            media = self.media_player.get_media()
+            if not media:
+                print("No media currently playing")
+                return
+                
+            # Different versions of python-vlc have different APIs for get_stats
+            try:
+                # Newer versions (direct call)
+                stats = media.get_stats()
+                print("VLC Playback Statistics:")
+                print(f"Decoded video blocks: {stats.decoded_video}")
+                print(f"Displayed pictures: {stats.displayed_pictures}")
+                print(f"Lost pictures: {stats.lost_pictures}")
+            except TypeError:
+                # Older versions (requiring a stats object parameter)
+                stats = vlc.MediaStats()
+                media.get_stats(stats)
+                print("VLC Playback Statistics:")
+                print(f"Decoded video blocks: {stats.decoded_video}")
+                print(f"Displayed pictures: {stats.displayed_pictures}")
+                print(f"Lost pictures: {stats.lost_pictures}")
+            
+            # Check if hardware decoding is enabled
+            if hasattr(self.media_player, 'get_role'):
+                print(f"Media player role: {self.media_player.get_role()}")
+            
+            # Try to get more detailed hardware acceleration info
+            print("Hardware acceleration is active if you see 'Using ... for hardware decoding' in the logs above")
+            print("For more details, run VLC with the same content and use:")
+            print("Tools -> Messages -> Info to see which decoder is being used")
+            
+        except Exception as e:
+            print(f"Error checking hardware acceleration: {e}")
+            print(f"Traceback: {traceback.format_exc()}")
+
 
 
 class EPGDialog(QDialog):
