android: check that the vout is not windowed

0ec926a3 · Rémi Denis-Courmont · 6bf3a80f · 0ec926a3 · 0ec926a3
Commit 0ec926a3 authored Oct 11, 2014 by Rémi Denis-Courmont
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

modules/video_output/android/opaque.c modules/video_output/android/opaque.c +2 -0

modules/video_output/android/surface.c modules/video_output/android/surface.c +2 -0

No files found.
--- a/modules/video_output/android/opaque.c
+++ b/modules/video_output/android/opaque.c
@@ -176,6 +176,8 @@ static int Open(vlc_object_t *p_this)

    if (fmt.i_chroma != VLC_CODEC_ANDROID_OPAQUE)
        return VLC_EGENERIC;
+    if (vout_display_IsWindowed(vd))
+        return VLC_EGENERIC;

    /* Allocate structure */
    vout_display_sys_t *sys = (struct vout_display_sys_t*)calloc(1, sizeof(*sys));

--- a/modules/video_output/android/surface.c
+++ b/modules/video_output/android/surface.c
@@ -180,6 +180,8 @@ static int Open(vlc_object_t *p_this)

    if (fmt.i_chroma == VLC_CODEC_ANDROID_OPAQUE)
        return VLC_EGENERIC;
+    if (vout_display_IsWindowed(vd))
+        return VLC_EGENERIC;

    /* */
    if (vlc_mutex_trylock(&single_instance) != 0) {