VideoView updates

Fixes squishy video, adds tap-to-play/pause, adds event listener for
onPlay/onPause

Author: Xlythe

camera-view/src/main/java/com/xlythe/view/camera/VideoView.java

@@ -8,9 +8,11 @@
 import android.media.AudioManager;
 import android.media.MediaMetadataRetriever;
 import android.media.MediaPlayer;
+import android.os.Build;
 import android.support.annotation.Nullable;
 import android.util.AttributeSet;
 import android.util.Log;
+import android.view.MotionEvent;
 import android.view.Surface;
 import android.view.TextureView;
 
@@ -38,6 +40,9 @@ public class VideoView extends TextureView implements TextureView.SurfaceTexture
     // An optional listener for when videos have reached the end
     @Nullable private MediaPlayer.OnCompletionListener mOnCompletionListener;
 
+    // An optional listener for when videos are paused/played
+    @Nullable private EventListener mEventListener;
+
     // If true, the video should be mirrored
     private boolean mIsMirrored = false;
 
@@ -108,7 +113,7 @@ public void onSurfaceTextureSizeChanged(SurfaceTexture texture, int width, int h
     public boolean onSurfaceTextureDestroyed(SurfaceTexture texture) {
         if (DEBUG) Log.d(TAG, "Texture destroyed");
         mIsAvailable = false;
-        mIsPlaying = false;
+        setPlayingState(false);
 
         ensureMediaPlayer();
         mMediaPlayer.release();
@@ -132,7 +137,7 @@ private void ensureMediaPlayer() {
         mMediaPlayer.setOnCompletionListener(new MediaPlayer.OnCompletionListener() {
             @Override
             public void onCompletion(MediaPlayer mediaPlayer) {
-                mIsPlaying = false;
+                setPlayingState(false);
                 if (mOnCompletionListener != null) {
                     mOnCompletionListener.onCompletion(mediaPlayer);
                 }
@@ -144,6 +149,10 @@ public void setOnCompletionListener(MediaPlayer.OnCompletionListener listener) {
         mOnCompletionListener = listener;
     }
 
+    public void setEventListener(EventListener listener) {
+        mEventListener = listener;
+    }
+
     protected void prepare() {
         if (DEBUG) Log.d(TAG, "Preparing video");
         ensureMediaPlayer();
@@ -155,9 +164,15 @@ protected void prepare() {
             retriever.setDataSource(fileDescriptor);
             int width = extractAsInt(retriever, MediaMetadataRetriever.METADATA_KEY_VIDEO_WIDTH);
             int height = extractAsInt(retriever, MediaMetadataRetriever.METADATA_KEY_VIDEO_HEIGHT);
+            int rotation = Build.VERSION.SDK_INT < 17 ? 0 : extractAsInt(retriever, MediaMetadataRetriever.METADATA_KEY_VIDEO_ROTATION);
             retriever.release();
-            if (DEBUG) Log.d(TAG, String.format("Video metadata: width=%d, height=%d", width, height));
+            if (DEBUG) Log.d(TAG, String.format("Video metadata: width=%d, height=%d, rotation=%d", width, height, rotation));
 
+            if (rotation == 90 || rotation == 270) {
+                int temp = width;
+                width = height;
+                height = temp;
+            }
             transformPreview(width, height);
 
             Surface surface = new Surface(getSurfaceTexture());
@@ -223,7 +238,7 @@ public boolean play() {
 
         try {
             mMediaPlayer.start();
-            mIsPlaying = true;
+            setPlayingState(true);
             return true;
         } catch (IllegalStateException e) {
             if (DEBUG) e.printStackTrace();
@@ -234,14 +249,15 @@ public boolean play() {
     public boolean pause() {
         if (DEBUG) Log.d(TAG, "pause()");
         ensureMediaPlayer();
-        mIsPlaying = false;
 
         try {
             mMediaPlayer.pause();
+            setPlayingState(false);
             return true;
         } catch (IllegalStateException e) {
             if (DEBUG) e.printStackTrace();
         }
+
         return false;
     }
 
@@ -255,6 +271,19 @@ public boolean isPlaying() {
         return false;
     }
 
+    private void setPlayingState(boolean state) {
+        if (mIsPlaying != state) {
+            mIsPlaying = state;
+            if (mEventListener != null) {
+                if (mIsPlaying) {
+                    mEventListener.onPlay();
+                } else {
+                    mEventListener.onPause();
+                }
+            }
+        }
+    }
+
     public void setShouldMirror(boolean mirror) {
         mIsMirrored = mirror;
     }
@@ -274,14 +303,6 @@ void transformPreview(int videoWidth, int videoHeight) {
 
         Matrix matrix = new Matrix();
 
-        // Usually, we'd check device orientation. However, on the Pixel C, the orientation is
-        // reversed from what you'd expect. What we really care about is width/height ratio.
-        if (viewWidth < viewHeight) {
-            int temp = videoWidth;
-            videoWidth = videoHeight;
-            videoHeight = temp;
-        }
-
         float aspectRatio = (float) videoHeight / (float) videoWidth;
         int newWidth, newHeight;
         if (viewHeight > viewWidth * aspectRatio) {
@@ -336,4 +357,36 @@ private void showSurface() {
             mOriginalMatrix = null;
         }
     }
+
+    private void onTap() {
+        if (isPlaying()) {
+            pause();
+        } else {
+            play();
+        }
+    }
+
+    @Override
+    public boolean onTouchEvent(MotionEvent event) {
+        if (!super.onTouchEvent(event)) {
+            switch (event.getAction()) {
+                case MotionEvent.ACTION_DOWN:
+                    setPressed(true);
+                    break;
+                case MotionEvent.ACTION_CANCEL:
+                    setPressed(false);
+                    break;
+                case MotionEvent.ACTION_UP:
+                    onTap();
+                    setPressed(false);
+                    break;
+            }
+        }
+        return true;
+    }
+
+    public interface EventListener {
+        void onPlay();
+        void onPause();
+    }
 }