Use a snapshot of exoplayer
Bug: 69474774
Change-Id: I04f194e4047ea9dbcb86198e28f33be454e22169
(cherry picked from commit 9737fc24d4c6c0f40f36dc171f6de1b36db8e7b3)
diff --git a/Android.mk b/Android.mk
index 152ea0f..6151c18 100644
--- a/Android.mk
+++ b/Android.mk
@@ -80,8 +80,7 @@
LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES := \
lib-exoplayer:libs/exoplayer-r1.5.16.aar \
- lib-exoplayer-v2:libs/exoplayer-2.6.1.aar \
- lib-exoplayer-v2-core:libs/exoplayer-core-2.6.1.aar \
+ lib-exoplayer-v2-core:libs/exoplayer-core-2-SNAPHOT-20180114.aar \
# TODO use external/jsr330
LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES += auto-value-jar:../../../prebuilts/tools/common/m2/repository/com/google/auto/value/auto-value/1.5.2/auto-value-1.5.2.jar
diff --git a/libs/exoplayer-2.6.1.aar b/libs/exoplayer-2.6.1.aar
deleted file mode 100644
index 4b8bc0d..0000000
--- a/libs/exoplayer-2.6.1.aar
+++ /dev/null
Binary files differ
diff --git a/libs/exoplayer-core-2-SNAPHOT-20180114.aar b/libs/exoplayer-core-2-SNAPHOT-20180114.aar
new file mode 100644
index 0000000..90af2e6
--- /dev/null
+++ b/libs/exoplayer-core-2-SNAPHOT-20180114.aar
Binary files differ
diff --git a/libs/exoplayer-core-2.6.1.aar b/libs/exoplayer-core-2.6.1.aar
deleted file mode 100644
index 17b7df6..0000000
--- a/libs/exoplayer-core-2.6.1.aar
+++ /dev/null
Binary files differ
diff --git a/tuner/Android.mk b/tuner/Android.mk
index 8bf51b5..24676f2 100644
--- a/tuner/Android.mk
+++ b/tuner/Android.mk
@@ -25,7 +25,6 @@
LOCAL_STATIC_JAVA_LIBRARIES := \
tv-common \
lib-exoplayer \
- lib-exoplayer-v2 \
lib-exoplayer-v2-core \
android-support-annotations \
android-support-compat \
diff --git a/tuner/src/com/android/tv/tuner/exoplayer/ExoPlayerSampleExtractor.java b/tuner/src/com/android/tv/tuner/exoplayer/ExoPlayerSampleExtractor.java
index f2b9e61..6fcdeb4 100644
--- a/tuner/src/com/android/tv/tuner/exoplayer/ExoPlayerSampleExtractor.java
+++ b/tuner/src/com/android/tv/tuner/exoplayer/ExoPlayerSampleExtractor.java
@@ -385,7 +385,7 @@
mCurrentPosition = mDecoderInputBuffer.timeUs;
}
if (mMediaPeriod != null) {
- mMediaPeriod.discardBuffer(mCurrentPosition);
+ mMediaPeriod.discardBuffer(mCurrentPosition, false);
}
try {
Long lastExtractedPositionUs = mLastExtractedPositionUsMap.get(track);
