[vlc-commits] video_output/android: remove sendHardwareAccelerationError

[Thomas Guillem]

vlc | branch: master | Thomas Guillem <thomas at gllm.fr> | Tue Jul 19 11:34:10 2016 +0200| [4e213ff3447fa7d93504a32493f3a8a7429e14b6] | committer: Thomas Guillem

video_output/android: remove sendHardwareAccelerationError

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

 modules/video_output/android/utils.c | 32 --------------------------------
 modules/video_output/android/utils.h |  5 -----
 2 files changed, 37 deletions(-)

diff --git a/modules/video_output/android/utils.c b/modules/video_output/android/utils.c
index dec8f22..abd063a 100644
--- a/modules/video_output/android/utils.c
+++ b/modules/video_output/android/utils.c
@@ -65,8 +65,6 @@ static struct
         jmethodID setCallback;
         jmethodID setBuffersGeometry;
         jmethodID setWindowLayout;
-        /* TODO: temporary, to remove when VLC has decoder fallback */
-        jmethodID sendHardwareAccelerationError;
     } AndroidNativeWindow;
 } jfields;
 
@@ -434,7 +432,6 @@ InitJNIFields(JNIEnv *env, vlc_object_t *p_obj, AWindowHandler *p_awh)
     GET_METHOD(setCallback, "setCallback", "(J)Z");
     GET_METHOD(setBuffersGeometry, "setBuffersGeometry", "(Landroid/view/Surface;III)Z");
     GET_METHOD(setWindowLayout, "setWindowLayout", "(IIIIII)V");
-    GET_METHOD(sendHardwareAccelerationError, "sendHardwareAccelerationError", "()V");
 #undef CHECK_EXCEPTION
 #undef GET_METHOD
 
@@ -750,32 +747,3 @@ AWindowHandler_setWindowLayout(AWindowHandler *p_awh,
              i_visible_width,i_visible_height, i_sar_num, i_sar_den);
     return VLC_SUCCESS;
 }
-
-int
-AWindowHandler_sendHardwareAccelerationError(vlc_object_t *p_obj,
-                                             AWindowHandler *p_awh)
-{
-    assert(p_obj || p_awh);
-    JNIEnv *p_env;
-
-    if (p_awh)
-    {
-        p_env = AWindowHandler_getEnv(p_awh);
-        if (!p_env)
-            return VLC_EGENERIC;
-        JNI_CALL(CallVoidMethod, sendHardwareAccelerationError);
-    }
-    else
-    {
-        p_awh = AWindowHandler_new(p_obj);
-        if (!p_awh)
-            return VLC_EGENERIC;
-        p_env = AWindowHandler_getEnv(p_awh);
-        if (!p_env)
-            return VLC_EGENERIC;
-        JNI_CALL(CallVoidMethod, sendHardwareAccelerationError);
-        AWindowHandler_destroy(p_awh);
-    }
-
-    return VLC_SUCCESS;
-}
diff --git a/modules/video_output/android/utils.h b/modules/video_output/android/utils.h
index d04f710..956f5e2 100644
--- a/modules/video_output/android/utils.h
+++ b/modules/video_output/android/utils.h
@@ -171,8 +171,3 @@ int AWindowHandler_setWindowLayout(AWindowHandler *p_awh,
                                    int i_width, int i_height,
                                    int i_visible_width, int i_visible_height,
                                    int i_sar_num, int i_sar_den);
-
-/* Signal a critical error
- * TODO: remove this when there is a decoder fallback */
-int
-AWindowHandler_sendHardwareAccelerationError(vlc_object_t *p_obj, AWindowHandler *p_awh);