[vlc-devel] [PATCH] vout: android: don't overwrite projection_mode for opaque

[Zhao Zhili]

Fix "Failed to adapt decoder format to display" and fallback to software
decoder.
---
 modules/video_output/android/display.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/modules/video_output/android/display.c b/modules/video_output/android/display.c
index 78c2331..7f22c41 100644
--- a/modules/video_output/android/display.c
+++ b/modules/video_output/android/display.c
@@ -505,12 +505,6 @@ static int OpenCommon(vout_display_t *vd)
     vout_display_sys_t *sys;
     video_format_t sub_fmt;
 
-    /* There are three cases:
-     * 1. the projection_mode is PROJECTION_MODE_RECTANGULAR
-     * 2. gles2 vout failed
-     * 3. the module is forced */
-    vd->fmt.projection_mode = PROJECTION_MODE_RECTANGULAR;
-
     vout_window_t *embed =
         vout_display_NewWindow(vd, VOUT_WINDOW_TYPE_ANDROID_NATIVE);
 
@@ -619,6 +613,12 @@ static int Open(vlc_object_t *p_this)
     if (vd->fmt.i_chroma == VLC_CODEC_ANDROID_OPAQUE)
         return VLC_EGENERIC;
 
+    /* There are three cases:
+     * 1. the projection_mode is PROJECTION_MODE_RECTANGULAR
+     * 2. gles2 vout failed
+     * 3. the module is forced */
+    vd->fmt.projection_mode = PROJECTION_MODE_RECTANGULAR;
+
     return OpenCommon(vd);
 }
 
-- 
2.9.5