sjs/media
1
0
Fork 0
mirror of https://github.com/samsonjs/media.git synced 2026-03-29 10:05:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Comment out unused code.

Browse source 
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
This commit is contained in:
tonihei 2020-05-21 14:25:29 +01:00
parent 2d52b0d5cf
commit d487170eb0
1 changed files with 30 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsSampleStreamWrapper.java
View file

@ -1388,22 +1388,25 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull;
*/
private static final class HlsSampleQueue extends SampleQueue {
/**
* The fraction of the chunk duration from which timestamps of samples loaded from within a
* 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.
*/
private static final long MIN_TIMESTAMP_DEVIATION_TOLERANCE_US = 4_000_000;
@Nullable private HlsMediaChunk sourceChunk;
private long sourceChunkLastSampleTimeUs;
private long minAllowedSampleTimeUs;
private long maxAllowedSampleTimeUs;
// TODO: Uncomment this to reject samples with unexpected timestamps. See
// https://github.com/google/ExoPlayer/issues/7030.
// /**
// * The fraction of the chunk duration from which timestamps of samples loaded from within a
// * 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.
// */
// private static final long MIN_TIMESTAMP_DEVIATION_TOLERANCE_US = 4_000_000;
//
// @Nullable private HlsMediaChunk sourceChunk;
// private long sourceChunkLastSampleTimeUs;
// private long minAllowedSampleTimeUs;
// private long maxAllowedSampleTimeUs;
private final Map<String, DrmInitData> overridingDrmInitData;
@Nullable private DrmInitData drmInitData;
@ -1419,16 +1422,18 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull;
}
public void setSourceChunk(HlsMediaChunk chunk) {
sourceChunk = chunk;
sourceChunkLastSampleTimeUs = C.TIME_UNSET;
sourceId(chunk.uid);
long 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;
// TODO: Uncomment this to reject samples with unexpected timestamps. See
// https://github.com/google/ExoPlayer/issues/7030.
// sourceChunk = chunk;
// sourceChunkLastSampleTimeUs = C.TIME_UNSET;
// long 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) {
@ -1506,7 +1511,7 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull;
// new UnexpectedSampleTimestampException(
// sourceChunk, sourceChunkLastSampleTimeUs, timeUs));
// }
sourceChunkLastSampleTimeUs = timeUs;
// sourceChunkLastSampleTimeUs = timeUs;
super.sampleMetadata(timeUs, flags, size, offset, cryptoData);
}
}