From d72c14135730aaa9efe643ee99c4de98732fbde1 Mon Sep 17 00:00:00 2001 From: Manuel Traut Date: Sun, 7 Feb 2010 12:47:14 +0100 Subject: Streaming: add switch for openmoko - enable different streaming options for streams to embedded devices Signed-off-by: Manuel Traut --- .../YalpVlcTelnetOutput/YalpOutputPluginImpl.java | 36 ++++++++++++++++------ 1 file changed, 26 insertions(+), 10 deletions(-) (limited to 'src/YalpOutputs/YalpVlcTelnetOutput/YalpOutputPluginImpl.java') diff --git a/src/YalpOutputs/YalpVlcTelnetOutput/YalpOutputPluginImpl.java b/src/YalpOutputs/YalpVlcTelnetOutput/YalpOutputPluginImpl.java index f95324e..2165035 100644 --- a/src/YalpOutputs/YalpVlcTelnetOutput/YalpOutputPluginImpl.java +++ b/src/YalpOutputs/YalpVlcTelnetOutput/YalpOutputPluginImpl.java @@ -238,16 +238,32 @@ public class YalpOutputPluginImpl extends OutputPluginInterfacePOA { return; } - String comp = "#transcode{vcodec=DIV3,vb=256,scale=1,"; - comp += "acodec=mpga,ab=192,channels=2}"; - comp += ":duplicate{dst="; - - setup2 = "setup "+howtoStream.info.name+" output "+comp+"std{access=udp,"; - setup2 +="mux=ts,"; - setup2 +="dst=" + howtoStream.destIp + ":9993";// + howtoStream.info.params; - setup2 += "}"; - - String control = "control "+howtoStream.info.name+" play"; + String comp, control; + + if (howtoStream.info.params.value() == "openmoko") + { + comp = "#transcode{vcodec=DIV3,vb=256,scale=1,"; + comp += "acodec=mpga,ab=192,channels=2}"; + comp += ":duplicate{dst="; + setup2 = "setup "+howtoStream.info.name+" output "+comp+"std{access=udp,"; + setup2 +="mux=ts,"; + setup2 +="dst=" + howtoStream.destIp + ":9993";// + howtoStream.info.params; + setup2 += "}"; + control = "control "+howtoStream.info.name+" play"; + + } else { + + comp = "#transcode{vcodec=DIV3,vb=256,scale=1,"; + comp += "acodec=mpga,ab=192,channels=2}"; + comp += ":duplicate{dst="; + + setup2 = "setup "+howtoStream.info.name+" output "+comp+"std{access=udp,"; + setup2 +="mux=ts,"; + setup2 +="dst=" + howtoStream.destIp + ":9993";// + howtoStream.info.params; + setup2 += "}"; + + control = "control "+howtoStream.info.name+" play"; + } TelnetInterface telnet = new TelnetInterface(hostIP, 4212, "admin"); telnet.exec(newString); -- cgit v1.2.3 From ad02c51bac783b8e4e1c1dbc72c84f8c5f24e4ba Mon Sep 17 00:00:00 2001 From: Nicole Vreden Date: Wed, 17 Feb 2010 22:21:09 +0100 Subject: Correction of if-condition for openmoko Signed-off-by: Nicole Vreden --- src/YalpOutputs/YalpVlcTelnetOutput/YalpOutputPluginImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/YalpOutputs/YalpVlcTelnetOutput/YalpOutputPluginImpl.java') diff --git a/src/YalpOutputs/YalpVlcTelnetOutput/YalpOutputPluginImpl.java b/src/YalpOutputs/YalpVlcTelnetOutput/YalpOutputPluginImpl.java index 2165035..f7a8d6c 100644 --- a/src/YalpOutputs/YalpVlcTelnetOutput/YalpOutputPluginImpl.java +++ b/src/YalpOutputs/YalpVlcTelnetOutput/YalpOutputPluginImpl.java @@ -240,7 +240,7 @@ public class YalpOutputPluginImpl extends OutputPluginInterfacePOA { String comp, control; - if (howtoStream.info.params.value() == "openmoko") + if (howtoStream.info.params == "openmoko") { comp = "#transcode{vcodec=DIV3,vb=256,scale=1,"; comp += "acodec=mpga,ab=192,channels=2}"; -- cgit v1.2.3 From 642895fb9dcd010272908eecbd438c2abade595a Mon Sep 17 00:00:00 2001 From: Manuel Traut Date: Wed, 17 Feb 2010 23:54:18 +0100 Subject: EflClient: Fix Streaming - stream has to be created AND started - Selection Class seems to be very strange. Cleaned it up a little, but could be moved completely into 'Media' Class. Signed-off-by: Manuel Traut --- efl-gui.sh | 2 +- src/YalpClients/EflClient/media.py | 11 +++--- src/YalpClients/EflClient/playlist.py | 41 +++++----------------- .../YalpVlcTelnetOutput/YalpOutputPluginImpl.java | 3 ++ 4 files changed, 16 insertions(+), 41 deletions(-) (limited to 'src/YalpOutputs/YalpVlcTelnetOutput/YalpOutputPluginImpl.java') diff --git a/efl-gui.sh b/efl-gui.sh index d5cfdf9..aa92c43 100755 --- a/efl-gui.sh +++ b/efl-gui.sh @@ -1,4 +1,4 @@ #!/bin/bash cd src/YalpClients/EflClient -python2.5 ./main.py -ORBInitRef NameService=corbaloc:iiop:localhost:1050/NameService +python2.5 ./main.py -ORBInitRef NameService=corbaloc:iiop:192.168.178.20:1050/NameService cd - diff --git a/src/YalpClients/EflClient/media.py b/src/YalpClients/EflClient/media.py index 41b4d5d..daf6d52 100644 --- a/src/YalpClients/EflClient/media.py +++ b/src/YalpClients/EflClient/media.py @@ -21,11 +21,8 @@ class Media(object): YalpInterfaces.STREAM) stream = YalpInterfaces.Output(0, info, songlist, YalpInterfaces.CREATE, ip) ret = self.servercon.control(stream) - startstream = YalpInterfaces.Output(0,stream, songlist, - YalpInterfaces.START, ip) - #print startstream - #print "result:", self.result - print "Startstream.Info:", startstream.info - vid = emotion.Emotion(self.win.canvas,module_filename="gstreamer") + stream.outputAction = YalpInterfaces.START + ret = self.servercon.control(stream) + print "stream.info:", stream.info #video = playlist.Selection(self.win, self.c, vid, startstream) - video = playlist.Selection(self.win, self.c, vid, startstream) + video = playlist.Selection(self.win, self.c, stream) diff --git a/src/YalpClients/EflClient/playlist.py b/src/YalpClients/EflClient/playlist.py index 07354cf..059a04d 100644 --- a/src/YalpClients/EflClient/playlist.py +++ b/src/YalpClients/EflClient/playlist.py @@ -12,45 +12,20 @@ import elementary import media class Selection(object): - def __init__(self, win, c, vid, stream): + def __init__(self, win, c, stream): self.win = win self.c = c - self.vid = vid - self.add_button() + self.vid = emotion.Emotion(win.canvas, module_filename="gstreamer") self.stream = stream - - def fill_playlist(self, obj, str, x): - playlist = elementary.List(self.win); - playlist.size_hint_weight_set(1.0, 1.0) - playlist.size_hint_align_set(-1.0, -1.0) - box1 = elementary.Box(self.win) - self.win.resize_object_add(box1) - self.c.part_swallow("playlist", playlist) - box1.pack_end(playlist) - playlist.show() - playlist.item_append(str, None, None, None) - playlist.go() - box1.show() - - def playbutton_clicked(self, obj, signal, source): - self.play_video() + self.play_video () def play_video(self): - #vid = emotion.Emotion(win.canvas,module_filename="xine"); print self.stream - #self.vid.file_set("Lordi.mpg"); - ip = self.stream[0][0].destIp - print ip - self.vid.file_set(self.stream); + # ip = self.stream[0][0].destIp THIS CHRASHES!!! + ip = "127.0.0.1" + port = 9993 + print "stream from", ip, port + self.vid.file_set("udp://"+ip+":"+str(port)) self.c.part_swallow("video", self.vid) self.vid.show() self.vid.play = True - - def add_button(self): - playbutton = elementary.Button(self.win) - playbutton.label_set("Play") - self.c.part_swallow("playlist_buttonframe", playbutton) - self.c.signal_callback_add("mouse,clicked,1","playlist_buttonframe", - self.playbutton_clicked) - playbutton.show() - diff --git a/src/YalpOutputs/YalpVlcTelnetOutput/YalpOutputPluginImpl.java b/src/YalpOutputs/YalpVlcTelnetOutput/YalpOutputPluginImpl.java index f7a8d6c..88bfbf8 100644 --- a/src/YalpOutputs/YalpVlcTelnetOutput/YalpOutputPluginImpl.java +++ b/src/YalpOutputs/YalpVlcTelnetOutput/YalpOutputPluginImpl.java @@ -267,8 +267,11 @@ public class YalpOutputPluginImpl extends OutputPluginInterfacePOA { TelnetInterface telnet = new TelnetInterface(hostIP, 4212, "admin"); telnet.exec(newString); + logger.debug ("exec1 done: "+newString); telnet.exec(setup2); + logger.debug ("exec2 done: "+setup2); telnet.exec(control); + logger.debug ("exec3 done: "+control); telnet.close(); } -- cgit v1.2.3