Merge branch 'dev' of git.parisson.com:git/telecaster-server into dev

diff --cc tests/control_mixer_osc_touch_2cam.py
index 56cbaffafaa0a042ffda1ac758bc00d6156037e9,0000000000000000000000000000000000000000..536483008a98726f09166e7eb13fb16215051236
mode 100644,000000..100644
--- 1/tests/control_mixer_osc_touch_2cam.py
--- /dev/null
+++ b/tests/control_mixer_osc_touch_2cam.py
@@@ -1,149 -1,0 +1,151 @@@
-         self.pipe = '! queue ! vp8enc speed=2 threads=4 quality=10.0 max-latency=25 max-keyframe-distance=30 auto-alt-ref-frames=true  ! queue ! muxout. \
 +#!/usr/bin/python
 +import gobject; gobject.threads_init()
 +import pygst; pygst.require("0.10")
 +import gst
 +from threading import Thread
 +
 +
 +class OSCController(Thread):
 +
 +    def __init__(self, port):
 +        Thread.__init__(self)
 +        import liblo
 +        self.port = port
 +        try:
 +            self.server = liblo.Server(self.port)
 +        except liblo.ServerError, err:
 +            print str(err)
 +
 +    def add_method(self, path, type, method):
 +        self.server.add_method(path, type, method)
 +
 +    def run(self):
 +        while True:
 +            self.server.recv(100)
 +
 +
 +class GSTSrcVideo(object):
 +
 +    def __init__(self, pipe=None, framerate='{30/1}', width=160, height=90, xpos=0, ypos=0, queue_option=''):
 +        self.framerate = framerate
 +        self.width = width
 +        self.height = height
 +        self.xpos = xpos
 +        self.ypos = ypos
 +        self.queue_option = queue_option
 +
 +        if not pipe:
 +            pipe = 'videotestsrc pattern="snow"'
 +        self.pipe = pipe + ' ! video/x-raw-yuv, framerate=%s, width=%s, height=%s' \
 +                        % (self.framerate, str(self.width), str(self.height))
 +
 +class GSTWebmHttpEncoder(object):
 +
 +    def __init__(self, protocol='none', host='127.0.0.1', port=9000):
 +        self.protocol = protocol
 +        self.port = port
-                     ! queue ! tcpserversink protocol=%s host=%s port=%s blocksize=65536 sync-method=1' \
++        self.host = host
++        self.pipe = """! queue ! vp8enc speed=2 threads=4 quality=10.0 max-latency=25 max-keyframe-distance=30 auto-alt-ref-frames=true  ! queue ! muxout. \
 +                    jackaudiosrc connect=2 ! audio/x-raw-float, channels=2 \
 +                    ! queue ! audioconvert ! queue ! vorbisenc quality=0.3 ! queue ! muxout.  \
 +                    webmmux streamable=true name=muxout \
-         self.pipe = ['videomixer name=mixer ! queue ! ffmpegcolorspace ! xvimagesink sync=false']
++                    ! queue ! tcpserversink protocol=%s host=%s port=%s blocksize=65536 sync-method=1""" \
 +                    % (self.protocol, self.host, self.port)
 +
 +
 +class GSTMixer(object):
 +
 +    def __init__(self, osc_port=8338, stream_port=9000):
 +        self.name = 'mixer'
-         self.srcs.reverse()
++        self.pipe = ['videomixer name=mixer ! queue ! ffmpegcolorspace ']
 +        self.srcs = []
 +        self.i= 0
 +
 +        self.osc_port = osc_port
 +        self.stream_port = stream_port
 +        self.osc = OSCController(self.osc_port)
 +        self.encoder = GSTWebmHttpEncoder(port=self.stream_port)
 +
 +    def osc_callback(self, path, value):
 +        paths = path.split('/')
 +        sink = paths[1]
 +        param = paths[2]
 +        for src in self.srcs:
 +            if src['sink'] == sink:
 +                break
 +        src['control'].set(param, 5 * gst.SECOND, value[0])
 +
 +    def osc_alpha_callback(self, path, value):
 +        paths = path.split('/')
 +        layer = paths[1]
 +        param = paths[2]
 +        id = int(param[-1])-1
 +        for src in self.srcs:
 +            if src['id'] == id:
 +                break
 +        src['control'].set('alpha', 5 * gst.SECOND, value[0])
 +
 +    def osc_xy_callback(self, path, value):
 +        for src in self.srcs:
 +            if src['id'] == 2:
 +                break
 +        src['control'].set("xpos", 5 * gst.SECOND, int(value[0]*480))
 +        src['control'].set("ypos", 5 * gst.SECOND, int(value[1]*270))
 +
 +    def add_src(self, src):
 +        self.srcs.append({'id': self.i, 'src': src, 'sink': 'sink_' + str(self.i)})
 +        self.i += 1
 +
 +    def setup(self):
- 
-         pipe += self.encoder.pipe
- 
++        self.pipe.append(self.encoder.pipe)
 +
++        self.srcs.reverse()
 +        for src in self.srcs:
 +            queue = 'queue'
 +            if src['src'].queue_option:
 +                # queue = 'timeoverlay ! queue'
 +                queue += ' ' + src['src'].queue_option
 +            self.pipe.append(' '.join([src['src'].pipe, '! ' + queue +  ' ! ' + self.name + '.' + src['sink']]))
-     src3 = GSTSrcVideo(width=640, height=480, xpos=0, ypos=0, pipe='v4l2src device=/dev/video0 do-timestamp=true', queue_option='leaky=upstream min-threshold-time=10000000000')
-     src3 = GSTSrcVideo(width=640, height=480, xpos=0, ypos=0, pipe='v4l2src device=/dev/video1 do-timestamp=true', queue_option='leaky=upstream min-threshold-time=10000000000')
 +        print ' '.join(self.pipe)
 +        self.process = gst.parse_launch(' '.join(self.pipe))
 +        mixer = self.process.get_by_name("mixer")
 +
 +        for src in self.srcs:
 +            src['pad'] = mixer.get_pad(src['sink'])
 +            src['control'] = gst.Controller(src['pad'], "xpos", "ypos", "alpha")
 +
 +            src['control'].set_interpolation_mode("xpos", gst.INTERPOLATE_LINEAR)
 +            src['control'].set("xpos", 5 * gst.SECOND, src['src'].xpos)
 +
 +            src['control'].set_interpolation_mode("ypos", gst.INTERPOLATE_LINEAR)
 +            src['control'].set("ypos", 5 * gst.SECOND, src['src'].ypos)
 +
 +            src['control'].set_interpolation_mode("alpha", gst.INTERPOLATE_LINEAR)
 +            src['control'].set("alpha", 5 * gst.SECOND, 1.0)
 +
 +            self.osc.add_method('/1/fader'+str(src['id']+1), 'f', self.osc_alpha_callback)
 +
 +        self.osc.add_method('/3/xy', 'ff', self.osc_xy_callback)
 +
 +    def run(self):
 +        self.osc.start()
 +        self.process.set_state(gst.STATE_PLAYING)
 +        gobject.MainLoop().run()
 +
 +
 +if __name__ == '__main__':
 +    src1 = GSTSrcVideo(width=640, height=480, pipe='videotestsrc pattern="black"')
 +    src4 = GSTSrcVideo(width=640, height=480, pipe='videotestsrc ')
++    #src2 = GSTSrcVideo(width=640, height=480, xpos=0, ypos=0, pipe='v4l2src device=/dev/video0 do-timestamp=true', queue_option='leaky=upstream min-threshold-time=10000000000')
++    #src3 = GSTSrcVideo(width=640, height=480, xpos=0, ypos=0, pipe='v4l2src device=/dev/video1 do-timestamp=true', queue_option='leaky=upstream min-threshold-time=10000000000')
++    src2 = GSTSrcVideo(width=640, height=480, xpos=0, ypos=0, pipe='v4l2src device=/dev/video0 do-timestamp=true')
++    src3 = GSTSrcVideo(width=640, height=480, xpos=0, ypos=0, pipe='v4l2src device=/dev/video1 do-timestamp=true')
++#
 +#    src2 = GSTSrcVideo(width=640, height=480, xpos=0, ypos=0, pipe='souphttpsrc location=http://192.168.0.15:8080/videofeed do-timestamp=true ! jpegdec ! queue ! ffmpegcolorspace ! videorate')
 +    mixer = GSTMixer()
 +    mixer.add_src(src1)
 +    mixer.add_src(src2)
 +    mixer.add_src(src3)
 +    mixer.add_src(src4)
 +    mixer.setup()
 +    mixer.run()