Исправлена работа с протоколом

[vpproxy.git] / vlcclient / vlcmessages.py

diff --git a/vlcclient/vlcmessages.py b/vlcclient/vlcmessages.py
index 10de03dc521d8781e3c1a215922fc28678463121..1d03938a67bbd666c4a45e2de32841d1c33ebf7b 100644 (file)
--- a/vlcclient/vlcmessages.py
+++ b/vlcclient/vlcmessages.py
@@ -9,11 +9,20 @@ class VlcMessage(object):
         SHUTDOWN = 'shutdown'
 
         @staticmethod
         SHUTDOWN = 'shutdown'
 
         @staticmethod

-        def startBroadcast(stream_name, input, out_port, muxer='ts', pre_access=''):
-            return 'new "' + stream_name + '" broadcast input "' + input + '" output ' + (pre_access + ':' if pre_access else '#') + \
-                'http{mux=' + muxer + ',dst=:' + \
+        def startBroadcast(stream_name, input, out_port, muxer='ts', pre_access='',qtype='default'):
+            command = 'new "' + stream_name + '" broadcast input "' + input + '" output ' + (pre_access + ':' if pre_access else '#')
+            if qtype=='mp4':
+                command = command + 'transcode{vcodec=mp4v,acodec=mpga,vb=800,ab=128}:'
+            elif qtype=='ogg':
+                command = command + 'transcode{vcodec=theora,acodec=vorbis,vb=800,ab=128}:'    
+                muxer='ogg'
+#            elif qtype=='webm':
+#                command = command + 'transcode{vcodec=VP80,acodec=vorbis,vb=512,ab=64}:'
+#                muxer='ffmpeg{mux=ogg}'
+            command = command +'http{mux=' + muxer + ',dst=:' + \

                 str(out_port) + '/' + stream_name + '} option sout-keep option sout-all enabled' + \
                 "\r\n" + 'control "' + stream_name + '" play'
                 str(out_port) + '/' + stream_name + '} option sout-keep option sout-all enabled' + \
                 "\r\n" + 'control "' + stream_name + '" play'

+            return command    

 
         @staticmethod
         def stopBroadcast(stream_name):
 
         @staticmethod
         def stopBroadcast(stream_name):