Commit d487170e by tonihei

Comment out unused code.

The code that uses these variables is already commneted out. Android Studio
complains about unused variables and code and it's better to comment them
out as long as they are not used.

PiperOrigin-RevId: 312660512
parent 2d52b0d5
...@@ -1388,22 +1388,25 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull; ...@@ -1388,22 +1388,25 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull;
*/ */
private static final class HlsSampleQueue extends SampleQueue { private static final class HlsSampleQueue extends SampleQueue {
/** // TODO: Uncomment this to reject samples with unexpected timestamps. See
* The fraction of the chunk duration from which timestamps of samples loaded from within a // https://github.com/google/ExoPlayer/issues/7030.
* chunk are allowed to deviate from the expected range. // /**
*/ // * The fraction of the chunk duration from which timestamps of samples loaded from within a
private static final double MAX_TIMESTAMP_DEVIATION_FRACTION = 0.5; // * chunk are allowed to deviate from the expected range.
// */
/** // private static final double MAX_TIMESTAMP_DEVIATION_FRACTION = 0.5;
* A minimum tolerance for sample timestamps in microseconds. Timestamps of samples loaded from //
* within a chunk are always allowed to deviate up to this amount from the expected range. // /**
*/ // * A minimum tolerance for sample timestamps in microseconds. Timestamps of samples loaded
private static final long MIN_TIMESTAMP_DEVIATION_TOLERANCE_US = 4_000_000; // * from within a chunk are always allowed to deviate up to this amount from the expected
// * range.
@Nullable private HlsMediaChunk sourceChunk; // */
private long sourceChunkLastSampleTimeUs; // private static final long MIN_TIMESTAMP_DEVIATION_TOLERANCE_US = 4_000_000;
private long minAllowedSampleTimeUs; //
private long maxAllowedSampleTimeUs; // @Nullable private HlsMediaChunk sourceChunk;
// private long sourceChunkLastSampleTimeUs;
// private long minAllowedSampleTimeUs;
// private long maxAllowedSampleTimeUs;
private final Map<String, DrmInitData> overridingDrmInitData; private final Map<String, DrmInitData> overridingDrmInitData;
@Nullable private DrmInitData drmInitData; @Nullable private DrmInitData drmInitData;
...@@ -1419,16 +1422,18 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull; ...@@ -1419,16 +1422,18 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull;
} }
public void setSourceChunk(HlsMediaChunk chunk) { public void setSourceChunk(HlsMediaChunk chunk) {
sourceChunk = chunk;
sourceChunkLastSampleTimeUs = C.TIME_UNSET;
sourceId(chunk.uid); sourceId(chunk.uid);
long allowedDeviationUs = // TODO: Uncomment this to reject samples with unexpected timestamps. See
Math.max( // https://github.com/google/ExoPlayer/issues/7030.
(long) ((chunk.endTimeUs - chunk.startTimeUs) * MAX_TIMESTAMP_DEVIATION_FRACTION), // sourceChunk = chunk;
MIN_TIMESTAMP_DEVIATION_TOLERANCE_US); // sourceChunkLastSampleTimeUs = C.TIME_UNSET;
minAllowedSampleTimeUs = chunk.startTimeUs - allowedDeviationUs; // long allowedDeviationUs =
maxAllowedSampleTimeUs = chunk.endTimeUs + allowedDeviationUs; // Math.max(
// (long) ((chunk.endTimeUs - chunk.startTimeUs) * MAX_TIMESTAMP_DEVIATION_FRACTION),
// MIN_TIMESTAMP_DEVIATION_TOLERANCE_US);
// minAllowedSampleTimeUs = chunk.startTimeUs - allowedDeviationUs;
// maxAllowedSampleTimeUs = chunk.endTimeUs + allowedDeviationUs;
} }
public void setDrmInitData(@Nullable DrmInitData drmInitData) { public void setDrmInitData(@Nullable DrmInitData drmInitData) {
...@@ -1506,7 +1511,7 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull; ...@@ -1506,7 +1511,7 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull;
// new UnexpectedSampleTimestampException( // new UnexpectedSampleTimestampException(
// sourceChunk, sourceChunkLastSampleTimeUs, timeUs)); // sourceChunk, sourceChunkLastSampleTimeUs, timeUs));
// } // }
sourceChunkLastSampleTimeUs = timeUs; // sourceChunkLastSampleTimeUs = timeUs;
super.sampleMetadata(timeUs, flags, size, offset, cryptoData); super.sampleMetadata(timeUs, flags, size, offset, cryptoData);
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment