[vlc-commits] mediacodec: remove jni_SetAndroidSurfaceSizeEnv call

[Thomas Guillem]

vlc | branch: master | Thomas Guillem <thomas at gllm.fr> | Fri Nov 14 17:10:09 2014 +0100| [e645e0ecd44770cccc4324f6323f4525e2494ba4] | committer: Jean-Baptiste Kempf

mediacodec: remove jni_SetAndroidSurfaceSizeEnv call

It's now handled in android_window

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

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

 modules/codec/omxil/android_mediacodec.c |   10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/modules/codec/omxil/android_mediacodec.c b/modules/codec/omxil/android_mediacodec.c
index 4fb3e2c..4aba3c9 100644
--- a/modules/codec/omxil/android_mediacodec.c
+++ b/modules/codec/omxil/android_mediacodec.c
@@ -55,7 +55,6 @@ extern void jni_detach_thread();
 /* JNI functions to get/set an Android Surface object. */
 extern jobject jni_LockAndGetAndroidJavaSurface();
 extern void jni_UnlockAndroidSurface();
-extern void jni_SetAndroidSurfaceSizeEnv(JNIEnv *p_env, int width, int height, int visible_width, int visible_height, int sar_num, int sar_den);
 extern void jni_EventHardwareAccelerationError();
 extern bool jni_IsVideoPlayerActivityCreated();
 
@@ -823,14 +822,7 @@ static void GetOutput(decoder_t *p_dec, JNIEnv *env, picture_t **pp_pic, jlong t
             int crop_bottom     = GET_INTEGER(format, "crop-bottom");
 
             const char *name = "unknown";
-            if (p_sys->direct_rendering) {
-                int sar_num = 1, sar_den = 1;
-                if (p_dec->fmt_in.video.i_sar_num != 0 && p_dec->fmt_in.video.i_sar_den != 0) {
-                    sar_num = p_dec->fmt_in.video.i_sar_num;
-                    sar_den = p_dec->fmt_in.video.i_sar_den;
-                }
-                jni_SetAndroidSurfaceSizeEnv(env, width, height, width, height, sar_num, sar_den);
-            } else {
+            if (!p_sys->direct_rendering) {
                 if (!GetVlcChromaFormat(p_sys->pixel_format,
                                         &p_dec->fmt_out.i_codec, &name)) {
                     msg_Err(p_dec, "color-format not recognized");