[vlc-commits] android_window: don't try to configure if opaque
Thomas Guillem
git at videolan.org
Fri Jul 31 09:22:24 CEST 2015
vlc | branch: master | Thomas Guillem <thomas at gllm.fr> | Fri Jul 31 09:08:25 2015 +0200| [db9a3864c2ccc547ec067b4ec980eff7d50f07c4] | committer: Thomas Guillem
android_window: don't try to configure if opaque
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=db9a3864c2ccc547ec067b4ec980eff7d50f07c4
---
modules/video_output/android/android_window.c | 21 +++++++++------------
1 file changed, 9 insertions(+), 12 deletions(-)
diff --git a/modules/video_output/android/android_window.c b/modules/video_output/android/android_window.c
index 4ab0fe3..fdc0baf 100644
--- a/modules/video_output/android/android_window.c
+++ b/modules/video_output/android/android_window.c
@@ -521,22 +521,19 @@ static int AndroidWindow_Setup(vout_display_sys_t *sys,
p_window->fmt.i_height = p_pic->format.i_height;
p_window->fmt.i_width = (p_pic->format.i_width + align_pixels) & ~align_pixels;
picture_Release(p_pic);
- }
- if (AndroidWindow_ConfigureJavaSurface(sys, p_window,
- &b_java_configured) != 0)
- return -1;
+ if (AndroidWindow_ConfigureJavaSurface(sys, p_window,
+ &b_java_configured) != 0)
+ return -1;
- if (!p_window->jsurface) {
+ if (!p_window->b_use_priv
+ || AndroidWindow_SetupANWP(sys, p_window, b_java_configured) != 0) {
+ if (AndroidWindow_SetupANW(sys, p_window, b_java_configured) != 0)
+ return -1;
+ }
+ } else {
sys->p_window->i_pic_count = 31; // TODO
sys->p_window->i_min_undequeued = 0;
- return 0;
- }
-
- if (!p_window->b_use_priv
- || AndroidWindow_SetupANWP(sys, p_window, b_java_configured) != 0) {
- if (AndroidWindow_SetupANW(sys, p_window, b_java_configured) != 0)
- return -1;
}
return 0;
More information about the vlc-commits
mailing list