Chunk size/streaming tweaks

Author: richstokes

dlna.py

@@ -4,9 +4,11 @@
 This module provides the HTTP request handler for a DLNA media server,
 implementing the necessary DLNA and UPnP protocols for media streaming.
 """
+
 import html
 import traceback
 import os
+import socket
 import struct
 import subprocess
 import uuid
@@ -116,6 +118,11 @@ def setup(self):
         super().setup()
         # Set socket timeout to prevent hanging connections
         self.connection.settimeout(self.timeout)
+        # Set TCP_NODELAY on the socket
+        self.connection.setsockopt(socket.IPPROTO_TCP, socket.TCP_NODELAY, 1)
+        buffer_size = 32 * 1024 * 1024  # 32MB buffer
+        self.connection.setsockopt(socket.SOL_SOCKET, socket.SO_SNDBUF, buffer_size)
+        self.connection.setsockopt(socket.SOL_SOCKET, socket.SO_RCVBUF, buffer_size)
 
     def log_message(self, format, *args):  # pylint: disable=redefined-builtin
         """Override BaseHTTPRequestHandler's log_message to only log when verbose mode is enabled"""
@@ -843,7 +850,7 @@ def serve_media_file(self, filename, head_only=False):
             if self.verbose:
                 print(f"MEDIA ACCESS: {self.path} from {client_addr}")
                 print(f"MEDIA HEADERS: {dict(self.headers)}")
-            
+
             # Set the current playing file for DLNA clients
             # Get filename after the last slash for display
             self.now_playing = os.path.basename(decoded_filename)
@@ -985,9 +992,7 @@ def serve_media_file(self, filename, head_only=False):
                     try:
                         with open(file_path, "rb") as f:
                             # Use larger chunks for better performance with large files
-                            chunk_size = (
-                                65536  # 64KB chunks for better streaming performance
-                            )
+                            chunk_size = 512 * 1024  # 512KB chunks
 
                             # Set a timeout for socket operations to prevent blocking
                             self.wfile.flush()
@@ -1138,7 +1143,7 @@ def handle_range_request(self, file_path, file_size, mime_type, range_header):
 
                 # Use smaller chunks for range requests to improve resume/seek performance
                 # Large chunks can cause choppy playback when resuming video
-                base_chunk_size = 8192  # 8KB base chunk size for range requests
+                base_chunk_size = 512 * 1024  # 512KB
 
                 while remaining > 0:
                     # For range requests, use smaller chunks for better streaming
@@ -2049,8 +2054,10 @@ def _get_media_duration(self, file_path, mime_type):
             }
 
             # Try to get duration using ffprobe if available (skip if fast mode is enabled)
-            if not self.fast and mime_type and (
-                mime_type.startswith("video/") or mime_type.startswith("audio/")
+            if (
+                not self.fast
+                and mime_type
+                and (mime_type.startswith("video/") or mime_type.startswith("audio/"))
             ):
                 try:
                     # Try ffprobe first (most reliable)

ssdp.py

@@ -11,6 +11,7 @@
 import time
 import struct
 import select
+
 try:
     from .constants import (
         SERVER_AGENT,
@@ -137,7 +138,6 @@ def _handle_request(self, data, addr):
     def _send_search_response(self, addr, search_target="upnp:rootdevice"):
         """Send response to M-SEARCH request"""
         location = f"http://{self.server_instance.server_ip}:{self.server_instance.port}/description.xml"
-
         # Determine the appropriate ST and USN based on search target
         if search_target.lower() == "upnp:rootdevice":
             st = "upnp:rootdevice"
@@ -158,17 +158,19 @@ def _send_search_response(self, addr, search_target="upnp:rootdevice"):
             st = "upnp:rootdevice"
             usn = f"uuid:{self.server_instance.device_uuid}::upnp:rootdevice"
 
+        # Build response using f-strings
+        current_date = time.strftime("%a, %d %b %Y %H:%M:%S GMT", time.gmtime())
         response = (
-            "HTTP/1.1 200 OK\r\n"
-            "CACHE-CONTROL: max-age=1800\r\n"
-            "DATE: {}\r\n"
+            f"HTTP/1.1 200 OK\r\n"
+            f"CACHE-CONTROL: max-age=1800\r\n"
+            f"DATE: {current_date}\r\n"
             f"EXT:\r\n"
             f"LOCATION: {location}\r\n"
             f"SERVER: {SERVER_AGENT}\r\n"
             f"ST: {st}\r\n"
             f"USN: {usn}\r\n"
             "\r\n"
-        ).format(time.strftime("%a, %d %b %Y %H:%M:%S GMT", time.gmtime()))
+        )
 
         try:
             sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
@@ -252,7 +254,7 @@ def _send_notify_alive(self):
                 sock.sendto(message.encode(), (self.MULTICAST_IP, self.MULTICAST_PORT))
                 time.sleep(0.1)  # Small delay between messages
             sock.close()
-            
+
             self.notify_count += 1
             if self.verbose:
                 print(f"Sent SSDP NOTIFY alive messages (#{self.notify_count})")
@@ -313,11 +315,11 @@ def _periodic_notify(self):
             else:
                 # After first 30 messages: send every 60 seconds (1 minute)
                 sleep_time = 60
-            
+
             for _ in range(sleep_time):
                 if not self.running:
                     return
                 time.sleep(1)
-            
+
             if self.running:
                 self._send_notify_alive()