commit 42102528a8c3d8dc02b866ef4c7633cf51812656
author James Dong <jdong@google.com> Tue Jul 31 11:02:24 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jul 31 11:02:24 2012 -0700
tree 35fdb285610dc080c4801dfb99ce0b0ac00f7bd5
parent 363e6db4f7eb141230183e65a2874e65c483bfcf
parent f74a2a6d74b553c63ff6ba1973d053987eafd8e4

Merge "Modify CTS test for subtitle to call selectTrack() after prepare()." into jb-mr1-dev

tests/tests/media/src/android/media/cts/MediaPlayerTestBase.java

diff --git a/tests/tests/media/src/android/media/cts/MediaPlayerTestBase.java b/tests/tests/media/src/android/media/cts/MediaPlayerTestBase.java
index 1fc7929..63ab9ea 100644
--- a/tests/tests/media/src/android/media/cts/MediaPlayerTestBase.java
+++ b/tests/tests/media/src/android/media/cts/MediaPlayerTestBase.java
@@ -33,6 +33,7 @@
     protected static final int SLEEP_TIME = 1000;
     protected static final int LONG_SLEEP_TIME = 6000;
     protected static final int STREAM_RETRIES = 20;
+    protected static boolean sUseScaleToFitMode = false;
 
     public static class Monitor {
         private boolean signalled;
@@ -132,9 +133,18 @@
         try {
             mMediaPlayer.setDataSource(afd.getFileDescriptor(), afd.getStartOffset(),
                     afd.getLength());
+
+            // Although it is only meant for video playback, it should not
+            // cause issues for audio-only playback.
+            int videoScalingMode = sUseScaleToFitMode?
+                                    MediaPlayer.VIDEO_SCALING_MODE_SCALE_TO_FIT
+                                  : MediaPlayer.VIDEO_SCALING_MODE_SCALE_TO_FIT_WITH_CROPPING;
+
+            mMediaPlayer.setVideoScalingMode(videoScalingMode);
         } finally {
             afd.close();
         }
+        sUseScaleToFitMode = !sUseScaleToFitMode;  // Alternate the scaling mode
     }
 
     protected void loadSubtitleSource(int resid) throws Exception {