Fix unexpected multiline comments
#exofixit PiperOrigin-RevId: 344517105
This commit is contained in:
parent
6d01d40971
commit
4446e2637d
@ -332,7 +332,7 @@ public class DownloadTracker {
|
|||||||
/* titleId= */ R.string.exo_download_description,
|
/* titleId= */ R.string.exo_download_description,
|
||||||
mappedTrackInfo,
|
mappedTrackInfo,
|
||||||
trackSelectorParameters,
|
trackSelectorParameters,
|
||||||
/* allowAdaptiveSelections =*/ false,
|
/* allowAdaptiveSelections= */ false,
|
||||||
/* allowMultipleOverrides= */ true,
|
/* allowMultipleOverrides= */ true,
|
||||||
/* onClickListener= */ this,
|
/* onClickListener= */ this,
|
||||||
/* onDismissListener= */ this);
|
/* onDismissListener= */ this);
|
||||||
|
@ -94,7 +94,7 @@ public final class TrackSelectionDialog extends DialogFragment {
|
|||||||
/* titleId= */ R.string.track_selection_title,
|
/* titleId= */ R.string.track_selection_title,
|
||||||
mappedTrackInfo,
|
mappedTrackInfo,
|
||||||
/* initialParameters = */ parameters,
|
/* initialParameters = */ parameters,
|
||||||
/* allowAdaptiveSelections =*/ true,
|
/* allowAdaptiveSelections= */ true,
|
||||||
/* allowMultipleOverrides= */ false,
|
/* allowMultipleOverrides= */ false,
|
||||||
/* onClickListener= */ (dialog, which) -> {
|
/* onClickListener= */ (dialog, which) -> {
|
||||||
DefaultTrackSelector.ParametersBuilder builder = parameters.buildUpon();
|
DefaultTrackSelector.ParametersBuilder builder = parameters.buildUpon();
|
||||||
|
@ -45,7 +45,10 @@ public class Libgav1VideoRenderer extends DecoderVideoRenderer {
|
|||||||
private static final String TAG = "Libgav1VideoRenderer";
|
private static final String TAG = "Libgav1VideoRenderer";
|
||||||
private static final int DEFAULT_NUM_OF_INPUT_BUFFERS = 4;
|
private static final int DEFAULT_NUM_OF_INPUT_BUFFERS = 4;
|
||||||
private static final int DEFAULT_NUM_OF_OUTPUT_BUFFERS = 4;
|
private static final int DEFAULT_NUM_OF_OUTPUT_BUFFERS = 4;
|
||||||
/* Default size based on 720p resolution video compressed by a factor of two. */
|
/**
|
||||||
|
* Default input buffer size in bytes, based on 720p resolution video compressed by a factor of
|
||||||
|
* two.
|
||||||
|
*/
|
||||||
private static final int DEFAULT_INPUT_BUFFER_SIZE =
|
private static final int DEFAULT_INPUT_BUFFER_SIZE =
|
||||||
Util.ceilDivide(1280, 64) * Util.ceilDivide(720, 64) * (64 * 64 * 3 / 2) / 2;
|
Util.ceilDivide(1280, 64) * Util.ceilDivide(720, 64) * (64 * 64 * 3 / 2) / 2;
|
||||||
|
|
||||||
|
@ -46,8 +46,8 @@ import java.util.Arrays;
|
|||||||
|
|
||||||
private ItemData() {
|
private ItemData() {
|
||||||
this(
|
this(
|
||||||
/* durationUs= */ C.TIME_UNSET, /* defaultPositionUs */
|
/* durationUs= */ C.TIME_UNSET,
|
||||||
C.TIME_UNSET,
|
/* defaultPositionUs= */ C.TIME_UNSET,
|
||||||
/* isLive= */ false);
|
/* isLive= */ false);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -137,8 +137,7 @@ public final class DrmInitData implements Comparator<SchemeData>, Parcelable {
|
|||||||
Arrays.sort(this.schemeDatas, this);
|
Arrays.sort(this.schemeDatas, this);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* package */
|
/* package */ DrmInitData(Parcel in) {
|
||||||
DrmInitData(Parcel in) {
|
|
||||||
schemeType = in.readString();
|
schemeType = in.readString();
|
||||||
schemeDatas = Util.castNonNull(in.createTypedArray(SchemeData.CREATOR));
|
schemeDatas = Util.castNonNull(in.createTypedArray(SchemeData.CREATOR));
|
||||||
schemeDataCount = schemeDatas.length;
|
schemeDataCount = schemeDatas.length;
|
||||||
|
@ -45,8 +45,7 @@ public final class ChapterTocFrame extends Id3Frame {
|
|||||||
this.subFrames = subFrames;
|
this.subFrames = subFrames;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* package */
|
/* package */ ChapterTocFrame(Parcel in) {
|
||||||
ChapterTocFrame(Parcel in) {
|
|
||||||
super(ID);
|
super(ID);
|
||||||
this.elementId = castNonNull(in.readString());
|
this.elementId = castNonNull(in.readString());
|
||||||
this.isRoot = in.readByte() != 0;
|
this.isRoot = in.readByte() != 0;
|
||||||
|
@ -45,8 +45,7 @@ public final class MlltFrame extends Id3Frame {
|
|||||||
this.millisecondsDeviations = millisecondsDeviations;
|
this.millisecondsDeviations = millisecondsDeviations;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* package */
|
/* package */ MlltFrame(Parcel in) {
|
||||||
MlltFrame(Parcel in) {
|
|
||||||
super(ID);
|
super(ID);
|
||||||
this.mpegFramesBetweenReference = in.readInt();
|
this.mpegFramesBetweenReference = in.readInt();
|
||||||
this.bytesBetweenReference = in.readInt();
|
this.bytesBetweenReference = in.readInt();
|
||||||
|
@ -1756,7 +1756,7 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
|
|||||||
processOutputMediaFormatChanged();
|
processOutputMediaFormatChanged();
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
/* MediaCodec.INFO_TRY_AGAIN_LATER (-1) or unknown negative return value */
|
// MediaCodec.INFO_TRY_AGAIN_LATER (-1) or unknown negative return value.
|
||||||
if (codecNeedsEosPropagation
|
if (codecNeedsEosPropagation
|
||||||
&& (inputStreamEnded || codecDrainState == DRAIN_STATE_WAIT_END_OF_STREAM)) {
|
&& (inputStreamEnded || codecDrainState == DRAIN_STATE_WAIT_END_OF_STREAM)) {
|
||||||
processEndOfStream();
|
processEndOfStream();
|
||||||
|
@ -397,7 +397,7 @@ public final class DefaultDownloadIndex implements WritableDownloadIndex {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@VisibleForTesting
|
@VisibleForTesting
|
||||||
/* package*/ static String encodeStreamKeys(List<StreamKey> streamKeys) {
|
/* package */ static String encodeStreamKeys(List<StreamKey> streamKeys) {
|
||||||
StringBuilder stringBuilder = new StringBuilder();
|
StringBuilder stringBuilder = new StringBuilder();
|
||||||
for (int i = 0; i < streamKeys.size(); i++) {
|
for (int i = 0; i < streamKeys.size(); i++) {
|
||||||
StreamKey streamKey = streamKeys.get(i);
|
StreamKey streamKey = streamKeys.get(i);
|
||||||
|
@ -1088,8 +1088,7 @@ public class DefaultTrackSelector extends MappingTrackSelector {
|
|||||||
this.rendererDisabledFlags = rendererDisabledFlags;
|
this.rendererDisabledFlags = rendererDisabledFlags;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* package */
|
/* package */ Parameters(Parcel in) {
|
||||||
Parameters(Parcel in) {
|
|
||||||
super(in);
|
super(in);
|
||||||
// Video
|
// Video
|
||||||
this.maxVideoWidth = in.readInt();
|
this.maxVideoWidth = in.readInt();
|
||||||
|
@ -3138,7 +3138,7 @@ public final class ExoPlayerTest {
|
|||||||
Timeline timeline =
|
Timeline timeline =
|
||||||
new FakeTimeline(
|
new FakeTimeline(
|
||||||
new TimelineWindowDefinition(
|
new TimelineWindowDefinition(
|
||||||
/* periodCount =*/ 2,
|
/* periodCount= */ 2,
|
||||||
/* id= */ new Object(),
|
/* id= */ new Object(),
|
||||||
/* isSeekable= */ true,
|
/* isSeekable= */ true,
|
||||||
/* isDynamic= */ false,
|
/* isDynamic= */ false,
|
||||||
@ -8760,7 +8760,7 @@ public final class ExoPlayerTest {
|
|||||||
|
|
||||||
// Internal classes.
|
// Internal classes.
|
||||||
|
|
||||||
/* {@link FakeRenderer} that can sleep and be woken-up. */
|
/** {@link FakeRenderer} that can sleep and be woken-up. */
|
||||||
private static class FakeSleepRenderer extends FakeRenderer {
|
private static class FakeSleepRenderer extends FakeRenderer {
|
||||||
private static final long WAKEUP_DEADLINE_MS = 60 * C.MICROS_PER_SECOND;
|
private static final long WAKEUP_DEADLINE_MS = 60 * C.MICROS_PER_SECOND;
|
||||||
private final AtomicBoolean sleepOnNextRender;
|
private final AtomicBoolean sleepOnNextRender;
|
||||||
|
@ -1002,8 +1002,8 @@ public final class AnalyticsCollectorTest {
|
|||||||
AtomicReference<AdPlaybackState> adPlaybackState =
|
AtomicReference<AdPlaybackState> adPlaybackState =
|
||||||
new AtomicReference<>(
|
new AtomicReference<>(
|
||||||
FakeTimeline.createAdPlaybackState(
|
FakeTimeline.createAdPlaybackState(
|
||||||
/* adsPerAdGroup= */ 1, /* adGroupTimesUs...= */
|
/* adsPerAdGroup= */ 1,
|
||||||
windowOffsetInFirstPeriodUs,
|
/* adGroupTimesUs...= */ windowOffsetInFirstPeriodUs,
|
||||||
windowOffsetInFirstPeriodUs + 5 * C.MICROS_PER_SECOND,
|
windowOffsetInFirstPeriodUs + 5 * C.MICROS_PER_SECOND,
|
||||||
C.TIME_END_OF_SOURCE));
|
C.TIME_END_OF_SOURCE));
|
||||||
AtomicInteger playedAdCount = new AtomicInteger(0);
|
AtomicInteger playedAdCount = new AtomicInteger(0);
|
||||||
|
@ -417,7 +417,7 @@ public final class DefaultPlaybackSessionManagerTest {
|
|||||||
/* id= */ 0,
|
/* id= */ 0,
|
||||||
/* isSeekable= */ true,
|
/* isSeekable= */ true,
|
||||||
/* isDynamic= */ false,
|
/* isDynamic= */ false,
|
||||||
/* durationUs =*/ 10 * C.MICROS_PER_SECOND,
|
/* durationUs= */ 10 * C.MICROS_PER_SECOND,
|
||||||
new AdPlaybackState(
|
new AdPlaybackState(
|
||||||
/* adsId= */ new Object(),
|
/* adsId= */ new Object(),
|
||||||
/* adGroupTimesUs=... */ 2 * C.MICROS_PER_SECOND,
|
/* adGroupTimesUs=... */ 2 * C.MICROS_PER_SECOND,
|
||||||
@ -702,7 +702,7 @@ public final class DefaultPlaybackSessionManagerTest {
|
|||||||
/* id= */ 0,
|
/* id= */ 0,
|
||||||
/* isSeekable= */ true,
|
/* isSeekable= */ true,
|
||||||
/* isDynamic= */ false,
|
/* isDynamic= */ false,
|
||||||
/* durationUs =*/ 10 * C.MICROS_PER_SECOND,
|
/* durationUs= */ 10 * C.MICROS_PER_SECOND,
|
||||||
new AdPlaybackState(
|
new AdPlaybackState(
|
||||||
/* adsId= */ new Object(), /* adGroupTimesUs=... */ C.TIME_END_OF_SOURCE)
|
/* adsId= */ new Object(), /* adGroupTimesUs=... */ C.TIME_END_OF_SOURCE)
|
||||||
.withAdCount(/* adGroupIndex= */ 0, /* adCount= */ 1)));
|
.withAdCount(/* adGroupIndex= */ 0, /* adCount= */ 1)));
|
||||||
@ -905,7 +905,7 @@ public final class DefaultPlaybackSessionManagerTest {
|
|||||||
/* id= */ 0,
|
/* id= */ 0,
|
||||||
/* isSeekable= */ true,
|
/* isSeekable= */ true,
|
||||||
/* isDynamic= */ false,
|
/* isDynamic= */ false,
|
||||||
/* durationUs =*/ 10 * C.MICROS_PER_SECOND,
|
/* durationUs= */ 10 * C.MICROS_PER_SECOND,
|
||||||
new AdPlaybackState(
|
new AdPlaybackState(
|
||||||
/* adsId= */ new Object(), /* adGroupTimesUs=... */
|
/* adsId= */ new Object(), /* adGroupTimesUs=... */
|
||||||
0,
|
0,
|
||||||
@ -987,7 +987,7 @@ public final class DefaultPlaybackSessionManagerTest {
|
|||||||
/* id= */ 0,
|
/* id= */ 0,
|
||||||
/* isSeekable= */ true,
|
/* isSeekable= */ true,
|
||||||
/* isDynamic= */ false,
|
/* isDynamic= */ false,
|
||||||
/* durationUs =*/ 10 * C.MICROS_PER_SECOND,
|
/* durationUs= */ 10 * C.MICROS_PER_SECOND,
|
||||||
new AdPlaybackState(
|
new AdPlaybackState(
|
||||||
/* adsId= */ new Object(), /* adGroupTimesUs=... */
|
/* adsId= */ new Object(), /* adGroupTimesUs=... */
|
||||||
2 * C.MICROS_PER_SECOND,
|
2 * C.MICROS_PER_SECOND,
|
||||||
@ -1039,7 +1039,7 @@ public final class DefaultPlaybackSessionManagerTest {
|
|||||||
/* id= */ 0,
|
/* id= */ 0,
|
||||||
/* isSeekable= */ true,
|
/* isSeekable= */ true,
|
||||||
/* isDynamic= */ false,
|
/* isDynamic= */ false,
|
||||||
/* durationUs =*/ 10 * C.MICROS_PER_SECOND,
|
/* durationUs= */ 10 * C.MICROS_PER_SECOND,
|
||||||
new AdPlaybackState(
|
new AdPlaybackState(
|
||||||
/* adsId= */ new Object(), /* adGroupTimesUs=... */
|
/* adsId= */ new Object(), /* adGroupTimesUs=... */
|
||||||
0,
|
0,
|
||||||
|
@ -499,8 +499,8 @@ public final class ConcatenatingMediaSourceTest {
|
|||||||
mediaSource.addMediaSources(
|
mediaSource.addMediaSources(
|
||||||
Arrays.asList(new MediaSource[] {createFakeMediaSource(), createFakeMediaSource()}));
|
Arrays.asList(new MediaSource[] {createFakeMediaSource(), createFakeMediaSource()}));
|
||||||
mediaSource.moveMediaSource(
|
mediaSource.moveMediaSource(
|
||||||
/* fromIndex */ 1, /* toIndex */
|
/* currentIndex= */ 1,
|
||||||
0,
|
/* newIndex= */ 0,
|
||||||
Util.createHandlerForCurrentLooper(),
|
Util.createHandlerForCurrentLooper(),
|
||||||
runnableInvoked::countDown);
|
runnableInvoked::countDown);
|
||||||
});
|
});
|
||||||
@ -624,8 +624,8 @@ public final class ConcatenatingMediaSourceTest {
|
|||||||
testThread.runOnMainThread(
|
testThread.runOnMainThread(
|
||||||
() ->
|
() ->
|
||||||
mediaSource.moveMediaSource(
|
mediaSource.moveMediaSource(
|
||||||
/* fromIndex */ 1, /* toIndex */
|
/* currentIndex= */ 1,
|
||||||
0,
|
/* newIndex= */ 0,
|
||||||
Util.createHandlerForCurrentLooper(),
|
Util.createHandlerForCurrentLooper(),
|
||||||
timelineGrabber));
|
timelineGrabber));
|
||||||
Timeline timeline = timelineGrabber.assertTimelineChangeBlocking();
|
Timeline timeline = timelineGrabber.assertTimelineChangeBlocking();
|
||||||
|
@ -643,7 +643,7 @@ public class SimpleCacheTest {
|
|||||||
.isEqualTo(10);
|
.isEqualTo(10);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Tests https://github.com/google/ExoPlayer/issues/3260 case. */
|
// Regression test for https://github.com/google/ExoPlayer/issues/3260.
|
||||||
@Test
|
@Test
|
||||||
public void exceptionDuringIndexStore_doesNotPreventEviction() throws Exception {
|
public void exceptionDuringIndexStore_doesNotPreventEviction() throws Exception {
|
||||||
CachedContentIndex contentIndex =
|
CachedContentIndex contentIndex =
|
||||||
|
@ -90,7 +90,7 @@ public final class HlsMediaPeriodTest {
|
|||||||
.withParameters(/* windowIndex= */ 0, mediaPeriodId, /* mediaTimeOffsetMs= */ 0),
|
.withParameters(/* windowIndex= */ 0, mediaPeriodId, /* mediaTimeOffsetMs= */ 0),
|
||||||
mock(Allocator.class),
|
mock(Allocator.class),
|
||||||
mock(CompositeSequenceableLoaderFactory.class),
|
mock(CompositeSequenceableLoaderFactory.class),
|
||||||
/* allowChunklessPreparation =*/ true,
|
/* allowChunklessPreparation= */ true,
|
||||||
HlsMediaSource.METADATA_TYPE_ID3,
|
HlsMediaSource.METADATA_TYPE_ID3,
|
||||||
/* useSessionKeys= */ false);
|
/* useSessionKeys= */ false);
|
||||||
};
|
};
|
||||||
|
@ -571,7 +571,7 @@ public class PlayerNotificationManager {
|
|||||||
notificationId,
|
notificationId,
|
||||||
mediaDescriptionAdapter,
|
mediaDescriptionAdapter,
|
||||||
notificationListener,
|
notificationListener,
|
||||||
/* customActionReceiver*/ null);
|
/* customActionReceiver= */ null);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -599,7 +599,7 @@ public class PlayerNotificationManager {
|
|||||||
channelId,
|
channelId,
|
||||||
notificationId,
|
notificationId,
|
||||||
mediaDescriptionAdapter,
|
mediaDescriptionAdapter,
|
||||||
/* notificationListener */ null,
|
/* notificationListener= */ null,
|
||||||
customActionReceiver);
|
customActionReceiver);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user