В парсер M3U добавлена поддержка дополнительных тегов (группы, страны и т.д.)

[vpproxy.git] / vlcclient / vlcmessages.py

diff --git a/vlcclient/vlcmessages.py b/vlcclient/vlcmessages.py
index d2ebe45a375eb22ce8dc4e1ac17ad7bb665981a9..2139e3fa41aa6644ba55ffc6bc908e2fa24b3497 100644 (file)
--- a/vlcclient/vlcmessages.py
+++ b/vlcclient/vlcmessages.py
@@ -13,9 +13,15 @@ class VlcMessage(object):
             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=='webm':
-                command = command + 'transcode{vcodec=VP80,acodec=vorbis,vb=512,ab=64}:'
-                muxer='ffmpeg{mux=webm}'
+            elif qtype=='ogg':
+                command = command + 'transcode{vcodec=theora,acodec=vorbis,vb=800,ab=128}:'    
+                muxer='ogg'
+            elif qtype=='ogv':
+                command = command + 'transcode{vcodec=theora,acodec=vorbis,vb=8192,ab=256}:'    
+                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'