Update of /cvsroot/freevo/kaa/xine/test
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16410/test
Modified Files:
kaaplayer.py
Added Files:
background.jpg
Log Message:
Add yuv2rgb code from xine with slight modifications to play better with
evas; add x86(_64) detection to setup.py; lots and lots of updates to
buffer vo -- it's almost done now, sans the vf_osd port.
Index: kaaplayer.py
===================================================================
RCS file: /cvsroot/freevo/kaa/xine/test/kaaplayer.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** kaaplayer.py 30 Jul 2005 20:55:16 -0000 1.6
--- kaaplayer.py 1 Aug 2005 04:07:13 -0000 1.7
***************
*** 13,16 ****
--- 13,18 ----
mrl = xine.make_mrl(sys.argv[1])
+ needs_redraw = False
+
def say(line):
if line[0] != "\n":
***************
*** 24,30 ****
if key == "q":
- print "\n\nExiting\n\n"
stream.stop()
- print "\n\nDone Exiting\n\n"
raise SystemExit
elif key == "f":
--- 26,30 ----
***************
*** 52,56 ****
elif key == "a":
! global vo_xv, win, win2
if win.get_visible():
win2.show()
--- 52,56 ----
elif key == "a":
! global vo, win, win2, needs_redraw
if win.get_visible():
win2.show()
***************
*** 59,65 ****
win.show()
win2.hide()
! vo_xv._port.send_gui_data(xine.GUI_SEND_DRAWABLE_CHANGED,
win._window.ptr)
! vo_xv._port.send_gui_data(xine.GUI_SEND_VIDEOWIN_VISIBLE, 1)
!
if lang == "menu":
--- 59,65 ----
win.show()
win2.hide()
! vo._port.send_gui_data(xine.GUI_SEND_DRAWABLE_CHANGED,
win._window.ptr)
! vo._port.send_gui_data(xine.GUI_SEND_VIDEOWIN_VISIBLE, 1)
! needs_redraw = True
if lang == "menu":
***************
*** 112,137 ****
c=0
lf=0
! def foo(width, height, aspect, buffer, window):
! global toggle, c, lf
! c+=1
! toggle=1-toggle
! if time.time()-lf > 1:
! print threading.currentThread(), "fps %d\n" % c
! c=0
! lf=time.time()
! return 1
! if not window.get_visible():
! return True
if window.movie.size_get() != (width, height):
! print "RESIZE", width, height, threading.currentThread()
window.movie.size_set( (width, height) )
! w, h = width, height
window.movie.resize( (w, h) )
window.movie.fill_set( (0, 0), (w, h) )
window.movie.move((0,0))
! window.movie.pixels_import(buffer, width, height,
evas.PIXEL_FORMAT_YUV420P_601)
window.movie.pixels_dirty_set()
! notifier.MainThreadCallback(window.get_evas().render)()
return True
--- 112,149 ----
c=0
lf=0
! def buffer_vo_callback(command, data, window):
! global needs_redraw
! if command == xine.BUFFER_VO_COMMAND_QUERY_REQUEST:
! if not window.get_visible():
! return xine.BUFFER_VO_REQUEST_PASSTHROUGH, -1, -1
! return xine.BUFFER_VO_REQUEST_SEND, 320, 200 #-1, -1
! elif command == xine.BUFFER_VO_COMMAND_QUERY_REDRAW:
! tmp = needs_redraw
! needs_redraw = False
! return tmp
! elif command == xine.BUFFER_VO_COMMAND_SEND:
! global toggle, c, lf
! c+=1
! toggle=1-toggle
! if time.time()-lf > 1:
! print "fps %d\n" % c
! c=0
! lf=time.time()
! notifier.MainThreadCallback(update_evas, data, window)()
!
! def update_evas((width, height, aspect, buffer, unlock_cb), window):
if window.movie.size_get() != (width, height):
! print "RESIZE EVAS", aspect, width, height, window.movie.size_get()
window.movie.size_set( (width, height) )
! w = min(window.get_size()[0], width)
! h = int(w / aspect)
window.movie.resize( (w, h) )
window.movie.fill_set( (0, 0), (w, h) )
window.movie.move((0,0))
! window.movie.data_set(buffer, copy = False)
window.movie.pixels_dirty_set()
! window.get_evas().render()
! unlock_cb()
return True
***************
*** 154,165 ****
win2.movie = win2.get_evas().object_image_add()
win2.movie.alpha_set(True)
! #win.movie.color_set(a=50)
win2.movie.layer_set(10)
win2.movie.show()
! cb = notifier.Callback(foo, win2)
! #cb = notifier.MainThreadCallback(foo, win2)
! #cb.set_async(False)
! #vo_xv = x.open_video_driver(window = win)
vo = x.open_video_driver("buffer", callback = cb, passthrough =
x.load_video_output_plugin("xv", window=win))
#vo = x.open_video_driver("xv", window = win)
--- 166,174 ----
win2.movie = win2.get_evas().object_image_add()
win2.movie.alpha_set(True)
! win2.movie.color_set(a=75)
win2.movie.layer_set(10)
win2.movie.show()
! cb = notifier.Callback(buffer_vo_callback, win2)
vo = x.open_video_driver("buffer", callback = cb, passthrough =
x.load_video_output_plugin("xv", window=win))
#vo = x.open_video_driver("xv", window = win)
***************
*** 175,186 ****
if not isinstance(win, display.EvasX11Window):
win.signals["aspect_changed"].connect_weak(handle_aspect_changed, stream,
win)
! #kaa.signals["idle"].connect_weak(output_status_line, stream, win)
stream.deint_post = x.post_init("tvtime", video_targets = [vo])
! print stream.deint_post.get_parameters_desc()["framerate_mode"]
! stream.deint_post.set_parameters(method = "GreedyH")
stream.get_video_source().wire(stream.deint_post.get_default_input())
! #print vo, vo.get_driver(), vo.get_driver()._driver.owner,
vo.get_driver().get_port()
stream.open(mrl)
stream.play()
--- 184,198 ----
if not isinstance(win, display.EvasX11Window):
win.signals["aspect_changed"].connect_weak(handle_aspect_changed, stream,
win)
! kaa.signals["idle"].connect_weak(output_status_line, stream, win)
stream.deint_post = x.post_init("tvtime", video_targets = [vo])
! stream.deint_post.set_parameters(method = "GreedyH", enabled = False)
stream.get_video_source().wire(stream.deint_post.get_default_input())
! x.set_config_value("video.device.xv_colorkey", 1)
! x.set_config_value("video.device.xv_autopaint_colorkey", True)
! #for cfg in x.get_config_entries():
! # print cfg
! #sys.exit(0)
stream.open(mrl)
stream.play()
--- NEW FILE: background.jpg ---
(This appears to be a binary file; contents omitted.)
-------------------------------------------------------
SF.Net email is sponsored by: Discover Easy Linux Migration Strategies
from IBM. Find simple to follow Roadmaps, straightforward articles,
informative Webcasts and more! Get everything you need to get up to
speed, fast. http://ads.osdn.com/?ad_id=7477&alloc_id=16492&op=click
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
![[Freevo-cvslog] kaa/xine/test background.jpg,NONE,1.1 kaaplayer.py,1.6,1.7](/search?l=freevo-cvslog@lists.sourceforge.net&q=subject:%22%5C%5BFreevo%5C-cvslog%5C%5D+kaa%5C%2Fxine%5C%2Ftest+background.jpg%2CNONE%2C1.1+kaaplayer.py%2C1.6%2C1.7%22&o=newest){kind=link}
