[Android] Account for last androidsurface changes

[Rafaël Carré]

vlc-ports/android | branch: master | Rafaël Carré <funman at videolan.org> | Thu Jan  3 17:46:52 2013 +0100| [6b90e4218f71bfc100408d4d25c5f9295174803d] | committer: Rafaël Carré

Account for last androidsurface changes

TODO: YV12, RGB16(?), cropping

> http://git.videolan.org/gitweb.cgi/vlc-ports/android.git/?a=commit;h=6b90e4218f71bfc100408d4d25c5f9295174803d
---

 compile.sh                                                          |    2 +-
 vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerActivity.java |    3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/compile.sh b/compile.sh
index 50a96b7..d6a52d3 100755
--- a/compile.sh
+++ b/compile.sh
@@ -90,7 +90,7 @@ NDK_TOOLCHAIN_PATH=${ANDROID_NDK}/toolchains/${PATH_HOST}-${GCCVER}/prebuilt/`un
 export PATH=${NDK_TOOLCHAIN_PATH}:${PATH}
 
 # 1/ libvlc, libvlccore and its plugins
-TESTED_HASH=d2e405e02c
+TESTED_HASH=6f621b95b3f
 if [ ! -d "vlc" ]; then
     echo "VLC source not found, cloning"
     git clone git://git.videolan.org/vlc.git vlc
diff --git a/vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerActivity.java b/vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerActivity.java
index 048f64d..77f7eb2 100644
--- a/vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerActivity.java
+++ b/vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerActivity.java
@@ -712,6 +712,9 @@ public class VideoPlayerActivity extends Activity {
                 break;
         }
 
+        // FIXME: align properly for YV12 and RGB16
+        // FIXME: crop rightmost pixels to not display garbage (or black them?)
+        mVideoWidth += 3; mVideoWidth &= ~3;
         mSurfaceHolder.setFixedSize(mVideoWidth, mVideoHeight);
         LayoutParams lp = mSurface.getLayoutParams();
         lp.width = dw;