Snap for 6220271 from 7e35dcf1c0ca95b5e3c006f63e8ec754235f795d to rvc-release
Change-Id: I974850b8c5663f9620ecebd29e63103d2d2d8401
diff --git a/common/src/com/android/tv/common/flags/DvrFlags.java b/common/src/com/android/tv/common/flags/DvrFlags.java
index 9deae1f..a96c134 100755
--- a/common/src/com/android/tv/common/flags/DvrFlags.java
+++ b/common/src/com/android/tv/common/flags/DvrFlags.java
@@ -29,7 +29,4 @@
/** Allow user to customize timings of program recordings. */
boolean startEarlyEndLateEnabled();
-
- /** Store and use the video aspect ratio in recordings. */
- boolean storeVideoAspectRatio();
}
diff --git a/common/src/com/android/tv/common/flags/impl/DefaultDvrFlags.java b/common/src/com/android/tv/common/flags/impl/DefaultDvrFlags.java
index 0fcfc6e..e0404af 100644
--- a/common/src/com/android/tv/common/flags/impl/DefaultDvrFlags.java
+++ b/common/src/com/android/tv/common/flags/impl/DefaultDvrFlags.java
@@ -28,9 +28,4 @@
public boolean startEarlyEndLateEnabled() {
return false;
}
-
- @Override
- public boolean storeVideoAspectRatio() {
- return true;
- }
}
diff --git a/tuner/src/com/android/tv/tuner/exoplayer2/buffer/SimpleSampleBuffer.java b/tuner/src/com/android/tv/tuner/exoplayer2/buffer/MemorySampleBuffer.java
similarity index 96%
rename from tuner/src/com/android/tv/tuner/exoplayer2/buffer/SimpleSampleBuffer.java
rename to tuner/src/com/android/tv/tuner/exoplayer2/buffer/MemorySampleBuffer.java
index c071383..21c0919 100644
--- a/tuner/src/com/android/tv/tuner/exoplayer2/buffer/SimpleSampleBuffer.java
+++ b/tuner/src/com/android/tv/tuner/exoplayer2/buffer/MemorySampleBuffer.java
@@ -31,14 +31,14 @@
* Handles I/O for {@link SampleExtractor} when physical storage based buffer is not used. Trickplay
* is disabled.
*/
-public class SimpleSampleBuffer implements BufferManager.SampleBuffer {
+public class MemorySampleBuffer implements BufferManager.SampleBuffer {
private final SamplePool mSamplePool = new SamplePool();
private SampleQueue[] mPlayingSampleQueues;
private long mLastBufferedPositionUs = C.UNKNOWN_TIME_US;
private volatile boolean mEos;
- public SimpleSampleBuffer(PlaybackBufferListener bufferListener) {
+ public MemorySampleBuffer(PlaybackBufferListener bufferListener) {
if (bufferListener != null) {
// Disables trickplay.
bufferListener.onBufferStateChanged(false);
@@ -139,7 +139,7 @@
@Override
public boolean isWriteSpeedSlow(int sampleSize, long durationNs) {
- // Since SimpleSampleBuffer write samples only to memory (not to physical storage),
+ // Since MemorySampleBuffer write samples only to memory (not to physical storage),
// write speed is always fine.
return false;
}
