Fix video pixel aspect ratio (brianwernick#594)

Enderyasli · Apr 4, 2018 · cbdf0ee · cbdf0ee
1 parent 445a1c8
commit cbdf0ee
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 12 deletions.
diff --git a/library/src/main/java/com/devbrackets/android/exomedia/core/api/VideoViewApi.java b/library/src/main/java/com/devbrackets/android/exomedia/core/api/VideoViewApi.java
@@ -143,7 +143,7 @@ interface OnSurfaceSizeChanged {
 
     void setListenerMux(ListenerMux listenerMux);
 
-    void onVideoSizeChanged(int width, int height);
+    void onVideoSizeChanged(int width, int height, float pixelWidthHeightRatio);
 
     void setRepeatMode(@Player.RepeatMode int repeatMode);
 }
diff --git a/...ry/src/main/java/com/devbrackets/android/exomedia/core/video/exo/ExoSurfaceVideoView.java b/...ry/src/main/java/com/devbrackets/android/exomedia/core/video/exo/ExoSurfaceVideoView.java
@@ -172,8 +172,8 @@ public void setListenerMux(ListenerMux listenerMux) {
     }
 
     @Override
-    public void onVideoSizeChanged(int width, int height) {
-        if (updateVideoSize(width, height)) {
+    public void onVideoSizeChanged(int width, int height, float pixelWidthHeightRatio) {
+        if (updateVideoSize((int) (width * pixelWidthHeightRatio), height)) {
             requestLayout();
         }
     }

diff --git a/...ry/src/main/java/com/devbrackets/android/exomedia/core/video/exo/ExoTextureVideoView.java b/...ry/src/main/java/com/devbrackets/android/exomedia/core/video/exo/ExoTextureVideoView.java
@@ -173,8 +173,8 @@ public void setListenerMux(ListenerMux listenerMux) {
     }
 
     @Override
-    public void onVideoSizeChanged(int width, int height) {
-        if (updateVideoSize(width, height)) {
+    public void onVideoSizeChanged(int width, int height, float pixelWidthHeightRatio) {
+        if (updateVideoSize((int) (width * pixelWidthHeightRatio), height)) {
             requestLayout();
         }
     }

diff --git a/.../src/main/java/com/devbrackets/android/exomedia/core/video/mp/NativeSurfaceVideoView.java b/.../src/main/java/com/devbrackets/android/exomedia/core/video/mp/NativeSurfaceVideoView.java
@@ -205,8 +205,8 @@ public void setListenerMux(ListenerMux listenerMux) {
     }
 
     @Override
-    public void onVideoSizeChanged(int width, int height) {
-        if (updateVideoSize(width, height)) {
+    public void onVideoSizeChanged(int width, int height, float pixelWidthHeightRatio) {
+        if (updateVideoSize((int) (width * pixelWidthHeightRatio), height)) {
             requestLayout();
         }
     }

diff --git a/.../src/main/java/com/devbrackets/android/exomedia/core/video/mp/NativeTextureVideoView.java b/.../src/main/java/com/devbrackets/android/exomedia/core/video/mp/NativeTextureVideoView.java
@@ -210,8 +210,8 @@ public void setListenerMux(ListenerMux listenerMux) {
     }
 
     @Override
-    public void onVideoSizeChanged(int width, int height) {
-        if (updateVideoSize(width, height)) {
+    public void onVideoSizeChanged(int width, int height, float pixelWidthHeightRatio) {
+        if (updateVideoSize((int) (width * pixelWidthHeightRatio), height)) {
             requestLayout();
         }
     }

diff --git a/...y/src/main/java/com/devbrackets/android/exomedia/listener/OnVideoSizeChangedListener.java b/...y/src/main/java/com/devbrackets/android/exomedia/listener/OnVideoSizeChangedListener.java
@@ -15,5 +15,5 @@ public interface OnVideoSizeChangedListener {
      * @param intrinsicWidth The intrinsic (unscaled) width of the video currently in playback
      * @param intrinsicHeight The intrinsic (unscaled) height of the video currently in playback
      */
-    void onVideoSizeChanged(int intrinsicWidth, int intrinsicHeight);
+    void onVideoSizeChanged(int intrinsicWidth, int intrinsicHeight, float pixelWidthHeightRatio);
 }
diff --git a/library/src/main/java/com/devbrackets/android/exomedia/ui/widget/VideoView.java b/library/src/main/java/com/devbrackets/android/exomedia/ui/widget/VideoView.java
@@ -965,10 +965,10 @@ public void onSeekComplete() {
         public void onVideoSizeChanged(int width, int height, int unAppliedRotationDegrees, float pixelWidthHeightRatio) {
             //NOTE: Android 5.0+ will always have an unAppliedRotationDegrees of 0 (ExoPlayer already handles it)
             videoViewImpl.setVideoRotation(unAppliedRotationDegrees, false);
-            videoViewImpl.onVideoSizeChanged(width, height);
+            videoViewImpl.onVideoSizeChanged(width, height, pixelWidthHeightRatio);
 
             if (videoSizeChangedListener != null) {
-                videoSizeChangedListener.onVideoSizeChanged(width, height);
+                videoSizeChangedListener.onVideoSizeChanged(width, height, pixelWidthHeightRatio);
             }
         }