vlc | branch: master | Thomas Guillem <tho...@gllm.fr> | Fri Nov 14 17:09:57 2014 +0100| [327323e25df85be5255a701153eafa88d831c6ca] | committer: Jean-Baptiste Kempf
android: rename jni_SetAndroidSurfaceSize Signed-off-by: Jean-Baptiste Kempf <j...@videolan.org> > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=327323e25df85be5255a701153eafa88d831c6ca --- modules/video_output/android/nativewindow.c | 6 +++--- modules/video_output/android/surface.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/video_output/android/nativewindow.c b/modules/video_output/android/nativewindow.c index 5a3fbc0..98c03fa 100644 --- a/modules/video_output/android/nativewindow.c +++ b/modules/video_output/android/nativewindow.c @@ -42,7 +42,7 @@ extern int jni_attach_thread(JNIEnv **env, const char *thread_name); extern void jni_detach_thread(); extern jobject jni_LockAndGetAndroidJavaSurface(); extern void jni_UnlockAndroidSurface(); -extern void jni_SetAndroidSurfaceSize(int width, int height, int visible_width, int visible_height, int sar_num, int sar_den); +extern void jni_SetSurfaceLayout(int width, int height, int visible_width, int visible_height, int sar_num, int sar_den); static int Open(vout_window_t *, const vout_window_cfg_t *); static void Close(vout_window_t *); @@ -110,7 +110,7 @@ static int Open(vout_window_t *wnd, const vout_window_cfg_t *cfg) wnd->sys = p_sys; // Set the Java surface size. - jni_SetAndroidSurfaceSize(cfg->width, cfg->height, cfg->width, cfg->height, 1, 1); + jni_SetSurfaceLayout(cfg->width, cfg->height, cfg->width, cfg->height, 1, 1); return VLC_SUCCESS; @@ -144,7 +144,7 @@ static int Control(vout_window_t *wnd, int cmd, va_list ap) { unsigned width = va_arg(ap, unsigned); unsigned height = va_arg(ap, unsigned); - jni_SetAndroidSurfaceSize(width, height, width, height, 1, 1); + jni_SetSurfaceLayout(width, height, width, height, 1, 1); break; } case VOUT_WINDOW_SET_STATE: diff --git a/modules/video_output/android/surface.c b/modules/video_output/android/surface.c index 92e854a..647db2e 100644 --- a/modules/video_output/android/surface.c +++ b/modules/video_output/android/surface.c @@ -79,7 +79,7 @@ extern void jni_detach_thread(); extern void *jni_LockAndGetAndroidSurface(); extern jobject jni_LockAndGetAndroidJavaSurface(); extern void jni_UnlockAndroidSurface(); -extern void jni_SetAndroidSurfaceSize(int width, int height, int visible_width, int visible_height, int sar_num, int sar_den); +extern void jni_SetSurfaceLayout(int width, int height, int visible_width, int visible_height, int sar_num, int sar_den); // _ZN7android7Surface4lockEPNS0_11SurfaceInfoEb typedef void (*Surface_lock)(void *, void *, int); @@ -413,7 +413,7 @@ static int AndroidLockSurface(picture_t *picture) if (info->w != aligned_width || info->h != sh || sys->b_changed_crop) { // input size doesn't match the surface size -> request a resize - jni_SetAndroidSurfaceSize(aligned_width, sh, sys->fmt.i_visible_width, sys->fmt.i_visible_height, sys->i_sar_num, sys->i_sar_den); + jni_SetSurfaceLayout(aligned_width, sh, sys->fmt.i_visible_width, sys->fmt.i_visible_height, sys->i_sar_num, sys->i_sar_den); // When using ANativeWindow, one should use ANativeWindow_setBuffersGeometry // to set the size and format. In our case, these are set via the SurfaceHolder // in Java, so we seem to manage without calling this ANativeWindow function. _______________________________________________ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
