diff options
author | Mangesh Ghiware <mghiware@google.com> | 2013-09-12 21:25:54 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-09-12 21:25:54 +0000 |
commit | fcf74f8dddddd350466e406f9f1cb2181077ffda (patch) | |
tree | 07992d28c1a25207cacb425d9d414c818993c2b8 /src | |
parent | eb6a9b9cdd2ec4bd9139c32ace454c329f1f3147 (diff) | |
parent | e0321526805facb72b307be6120b20a881ee979d (diff) | |
download | android_packages_apps_Gallery2-fcf74f8dddddd350466e406f9f1cb2181077ffda.tar.gz android_packages_apps_Gallery2-fcf74f8dddddd350466e406f9f1cb2181077ffda.tar.bz2 android_packages_apps_Gallery2-fcf74f8dddddd350466e406f9f1cb2181077ffda.zip |
Merge "Enable virtualization" into gb-ub-photos-carlsbad
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/gallery3d/app/MoviePlayer.java | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/src/com/android/gallery3d/app/MoviePlayer.java b/src/com/android/gallery3d/app/MoviePlayer.java index ce9183483..f6bd36725 100644 --- a/src/com/android/gallery3d/app/MoviePlayer.java +++ b/src/com/android/gallery3d/app/MoviePlayer.java @@ -27,6 +27,8 @@ import android.content.Intent; import android.content.IntentFilter; import android.media.AudioManager; import android.media.MediaPlayer; +import android.media.audiofx.AudioEffect; +import android.media.audiofx.Virtualizer; import android.net.Uri; import android.os.Build; import android.os.Bundle; @@ -66,6 +68,7 @@ public class MoviePlayer implements private static final String CMDNAME = "command"; private static final String CMDPAUSE = "pause"; + private static final String VIRTUALIZE_EXTRA = "virtualize"; private static final long BLACK_TIMEOUT = 500; // If we resume the acitivty with in RESUMEABLE_TIMEOUT, we will keep playing. @@ -92,6 +95,8 @@ public class MoviePlayer implements // If the time bar is visible. private boolean mShowing; + private Virtualizer mVirtualizer; + private final Runnable mPlayingChecker = new Runnable() { @Override public void run() { @@ -127,6 +132,18 @@ public class MoviePlayer implements mVideoView.setOnErrorListener(this); mVideoView.setOnCompletionListener(this); mVideoView.setVideoURI(mUri); + + Intent ai = movieActivity.getIntent(); + boolean virtualize = ai.getBooleanExtra(VIRTUALIZE_EXTRA, false); + if (virtualize) { + int session = mVideoView.getAudioSessionId(); + if (session != 0) { + mVirtualizer = new Virtualizer(0, session); + mVirtualizer.setEnabled(true); + } else { + Log.w(TAG, "no audio session to virtualize"); + } + } mVideoView.setOnTouchListener(new View.OnTouchListener() { @Override public boolean onTouch(View v, MotionEvent event) { @@ -280,6 +297,10 @@ public class MoviePlayer implements } public void onDestroy() { + if (mVirtualizer != null) { + mVirtualizer.release(); + mVirtualizer = null; + } mVideoView.stopPlayback(); mAudioBecomingNoisyReceiver.unregister(); } |