diff options
| author | Likai Ding <likaid@codeaurora.org> | 2016-05-18 13:59:06 +0800 |
|---|---|---|
| committer | Likai Ding <likaid@codeaurora.org> | 2016-06-03 15:34:47 +0800 |
| commit | c4528995435f4b82ec104329002c1c25308a6425 (patch) | |
| tree | 826cf9eea5c15eca642de02070e27c52e37f6a9e /src/com/android | |
| parent | 711aee7790ab995e61231e836bfe36a38f65cfce (diff) | |
| download | android_packages_apps_Gallery2-c4528995435f4b82ec104329002c1c25308a6425.tar.gz android_packages_apps_Gallery2-c4528995435f4b82ec104329002c1c25308a6425.tar.bz2 android_packages_apps_Gallery2-c4528995435f4b82ec104329002c1c25308a6425.zip | |
Gallery: MediaPlayer/Metadata wrapper
CRs-Fixed: 986672
Change-Id: Ia290c2043d0d6a01df0ff2a07d143e15078ca109
Diffstat (limited to 'src/com/android')
| -rw-r--r-- | src/com/android/gallery3d/app/MoviePlayer.java | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/com/android/gallery3d/app/MoviePlayer.java b/src/com/android/gallery3d/app/MoviePlayer.java index a16cc9a33..520b462ee 100644 --- a/src/com/android/gallery3d/app/MoviePlayer.java +++ b/src/com/android/gallery3d/app/MoviePlayer.java @@ -31,7 +31,6 @@ import android.content.SharedPreferences; import android.graphics.Color; import android.media.AudioManager; import android.media.MediaPlayer; -import android.media.Metadata; import android.media.audiofx.Virtualizer; import android.net.Uri; import android.os.Build; @@ -987,10 +986,10 @@ public class MoviePlayer implements private void getVideoInfo(MediaPlayer mp) { if (!MovieUtils.isLocalFile(mMovieItem.getUri(), mMovieItem.getMimeType())) { - Metadata data = mp.getMetadata(MediaPlayer.METADATA_ALL, - MediaPlayer.BYPASS_METADATA_FILTER); + ApiHelper.Metadata data = ApiHelper.MediaPlayer.getMetadata(mp, + ApiHelper.MediaPlayer.METADATA_ALL, + ApiHelper.MediaPlayer.BYPASS_METADATA_FILTER); if (data != null) { - // TODO comments by sunlei mServerTimeoutExt.setVideoInfo(data); } else { Log.w(TAG, "Metadata is null!"); @@ -1438,7 +1437,7 @@ public class MoviePlayer implements return false; } - public void setVideoInfo(Metadata data) { + public void setVideoInfo(ApiHelper.Metadata data) { mServerTimeout = RESUME_DIALOG_TIMEOUT; if (data.has(SERVER_TIMEOUT)) { mServerTimeout = data.getInt(SERVER_TIMEOUT); |