[vlc-commits] vout: android: handle spherical projection as a last resort

[Thomas Guillem]

vlc | branch: master | Thomas Guillem <thomas at gllm.fr> | Thu Dec  1 18:02:14 2016 +0100| [151f90ba03da55ff1ef05a2c835d82344695ef4d] | committer: Thomas Guillem

vout: android: handle spherical projection as a last resort

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=151f90ba03da55ff1ef05a2c835d82344695ef4d
---

 modules/video_output/android/display.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/modules/video_output/android/display.c b/modules/video_output/android/display.c
index 086fdc6..88326ad 100644
--- a/modules/video_output/android/display.c
+++ b/modules/video_output/android/display.c
@@ -648,8 +648,13 @@ static int Open(vlc_object_t *p_this)
     vout_display_sys_t *sys;
     video_format_t sub_fmt;
 
-    if (vd->fmt.projection_mode != PROJECTION_MODE_RECTANGULAR)
+    /* Fallback to normal projection in case of soft decoding/display (the
+     * openGL vout, with a higher priority, should be used when the projection
+     * need to be handled). */
+    if (vd->fmt.i_chroma == VLC_CODEC_ANDROID_OPAQUE
+     && vd->fmt.projection_mode != PROJECTION_MODE_RECTANGULAR)
         return VLC_EGENERIC;
+    vd->fmt.projection_mode = PROJECTION_MODE_RECTANGULAR;
 
     vout_window_t *embed =
         vout_display_NewWindow(vd, VOUT_WINDOW_TYPE_ANDROID_NATIVE);