Добавлен поток ogg без ограничения скорости (префикс /ogv и /m3uo для списка).

[vpproxy.git] / vphttp.py

diff --git a/vphttp.py b/vphttp.py
index 6108bd81055d9b089e885c9e4380e4ffe331c6b9..155db57e8a739b03e35927112d76df419053c83d 100644 (file)
--- a/vphttp.py
+++ b/vphttp.py
@@ -27,6 +27,7 @@ import hashlib
 import vpconfig
 from vpconfig import VPConfig
 import vlcclient
 import vpconfig
 from vpconfig import VPConfig
 import vlcclient

+import gc

 import plugins.modules.ipaddr as ipaddr
 from clientcounter import ClientCounter
 from plugins.modules.PluginInterface import VPProxyPlugin
 import plugins.modules.ipaddr as ipaddr
 from clientcounter import ClientCounter
 from plugins.modules.PluginInterface import VPProxyPlugin


@@ -164,7 +165,7 @@ class HTTPHandler(BaseHTTPServer.BaseHTTPRequestHandler):
             self.reqtype = self.splittedpath[1].lower()
             # If first parameter is 'pid' or 'torrent' or it should be handled
             # by plugin
             self.reqtype = self.splittedpath[1].lower()
             # If first parameter is 'pid' or 'torrent' or it should be handled
             # by plugin

-            if not (self.reqtype in ('get','mp4','webm') or self.reqtype in VPStuff.pluginshandlers):
+            if not (self.reqtype in ('get','mp4','ogg','ogv') or self.reqtype in VPStuff.pluginshandlers):

                 self.dieWithError(400)  # 400 Bad Request
                 return
         except IndexError:
                 self.dieWithError(400)  # 400 Bad Request
                 return
         except IndexError:


@@ -187,7 +188,6 @@ class HTTPHandler(BaseHTTPServer.BaseHTTPRequestHandler):
     def handleRequest(self, headers_only):
 
         # Limit concurrent connections
     def handleRequest(self, headers_only):
 
         # Limit concurrent connections

-        print VPStuff.clientcounter.total

         if 0 < VPConfig.maxconns <= VPStuff.clientcounter.total:
             logger.debug("Maximum connections reached, can't serve this")
             self.dieWithError(503)  # 503 Service Unavailable
         if 0 < VPConfig.maxconns <= VPStuff.clientcounter.total:
             logger.debug("Maximum connections reached, can't serve this")
             self.dieWithError(503)  # 503 Service Unavailable


@@ -236,7 +236,11 @@ class HTTPHandler(BaseHTTPServer.BaseHTTPRequestHandler):
             logger.debug(
                 "Sending fake headers for " + useragent)
             self.send_response(200)
             logger.debug(
                 "Sending fake headers for " + useragent)
             self.send_response(200)

-            self.send_header("Content-Type", "video/mpeg")
+            self.send_header('Cache-Control','no-cache');
+            if self.reqtype in ("ogg","ogv"):
+                self.send_header("Content-Type", "video/ogg")
+            else:
+                self.send_header("Content-Type", "video/mpeg")

             self.end_headers()
             # Do not send real headers at all
             self.headerssent = True
             self.end_headers()
             # Do not send real headers at all
             self.headerssent = True


@@ -292,7 +296,14 @@ class HTTPHandler(BaseHTTPServer.BaseHTTPRequestHandler):
 
                 for key in self.video.info().dict:
                     self.send_header(key, self.video.info().dict[key])
 
                 for key in self.video.info().dict:
                     self.send_header(key, self.video.info().dict[key])

-                self.send_header("Content-Type", "video/mpeg")
+
+                self.send_header('Cache-Control','no-cache');
+
+                if self.reqtype=="ogg":
+                    self.send_header("Content-Type", "video/ogg")
+                else:
+                    self.send_header("Content-Type", "video/mpeg")
+

                 # End headers. Next goes video data
                 self.end_headers()
                 logger.debug("Headers sent")
                 # End headers. Next goes video data
                 self.end_headers()
                 logger.debug("Headers sent")


@@ -328,7 +339,11 @@ class HTTPHandler(BaseHTTPServer.BaseHTTPRequestHandler):
                 except:
                     pass
                 self.vp.destroy()
                 except:
                     pass
                 self.vp.destroy()

-
+            if not self.headersent:
+                logger.error("Problem receiving video stream, no headers!")
+                if VPStuff.clientcounter.total == 0:
+                    logger.error("Probably VLC hang")
+                    VPStuff.vlc.kill()

 
 class HTTPServer(SocketServer.ThreadingMixIn, BaseHTTPServer.HTTPServer):
 
 
 class HTTPServer(SocketServer.ThreadingMixIn, BaseHTTPServer.HTTPServer):
 


@@ -395,6 +410,7 @@ for i in pluginslist:
         continue
     logger.debug('Plugin loaded: ' + plugname)
     for j in plugininstance.handlers:
         continue
     logger.debug('Plugin loaded: ' + plugname)
     for j in plugininstance.handlers:

+        logger.info("Registering handler '" + j +"'")

         VPStuff.pluginshandlers[j] = plugininstance
     VPStuff.pluginlist.append(plugininstance)
 
         VPStuff.pluginshandlers[j] = plugininstance
     VPStuff.pluginlist.append(plugininstance)