projects
/
vpproxy.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Добавлено отладочный интерфейс.
[vpproxy.git]
/
vlcclient
/
vlcmessages.py
diff --git
a/vlcclient/vlcmessages.py
b/vlcclient/vlcmessages.py
index da8606c1d3ac578d47b3ae22ba105d5a8187d42a..1d03938a67bbd666c4a45e2de32841d1c33ebf7b 100644
(file)
--- a/
vlcclient/vlcmessages.py
+++ b/
vlcclient/vlcmessages.py
@@
-13,6
+13,12
@@
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}:'
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'
command = command +'http{mux=' + muxer + ',dst=:' + \
str(out_port) + '/' + stream_name + '} option sout-keep option sout-all enabled' + \
"\r\n" + 'control "' + stream_name + '" play'