Commit 0a7745bc by tonihei Committed by Oliver Woodman

Fix some random Android Studio warnings.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=215904019
parent 8dedbd57
...@@ -350,8 +350,7 @@ public class SampleChooserActivity extends Activity ...@@ -350,8 +350,7 @@ public class SampleChooserActivity extends Activity
? null ? null
: new DrmInfo(drmScheme, drmLicenseUrl, drmKeyRequestProperties, drmMultiSession); : new DrmInfo(drmScheme, drmLicenseUrl, drmKeyRequestProperties, drmMultiSession);
if (playlistSamples != null) { if (playlistSamples != null) {
UriSample[] playlistSamplesArray = playlistSamples.toArray( UriSample[] playlistSamplesArray = playlistSamples.toArray(new UriSample[0]);
new UriSample[playlistSamples.size()]);
return new PlaylistSample(sampleName, drmInfo, playlistSamplesArray); return new PlaylistSample(sampleName, drmInfo, playlistSamplesArray);
} else { } else {
return new UriSample( return new UriSample(
......
...@@ -187,7 +187,7 @@ public class DefaultRenderersFactory implements RenderersFactory { ...@@ -187,7 +187,7 @@ public class DefaultRenderersFactory implements RenderersFactory {
extensionRendererMode, renderersList); extensionRendererMode, renderersList);
buildCameraMotionRenderers(context, extensionRendererMode, renderersList); buildCameraMotionRenderers(context, extensionRendererMode, renderersList);
buildMiscellaneousRenderers(context, eventHandler, extensionRendererMode, renderersList); buildMiscellaneousRenderers(context, eventHandler, extensionRendererMode, renderersList);
return renderersList.toArray(new Renderer[renderersList.size()]); return renderersList.toArray(new Renderer[0]);
} }
/** /**
......
...@@ -1002,7 +1002,7 @@ import java.util.Collections; ...@@ -1002,7 +1002,7 @@ import java.util.Collections;
MediaPeriodHolder periodHolder = queue.getPlayingPeriod(); MediaPeriodHolder periodHolder = queue.getPlayingPeriod();
MediaPeriodHolder readingPeriodHolder = queue.getReadingPeriod(); MediaPeriodHolder readingPeriodHolder = queue.getReadingPeriod();
boolean selectionsChangedForReadPeriod = true; boolean selectionsChangedForReadPeriod = true;
TrackSelectorResult newTrackSelectorResult = null; TrackSelectorResult newTrackSelectorResult;
while (true) { while (true) {
if (periodHolder == null || !periodHolder.prepared) { if (periodHolder == null || !periodHolder.prepared) {
// The reselection did not change any prepared periods. // The reselection did not change any prepared periods.
......
...@@ -351,8 +351,7 @@ public final class DefaultAudioSink implements AudioSink { ...@@ -351,8 +351,7 @@ public final class DefaultAudioSink implements AudioSink {
channelMappingAudioProcessor, channelMappingAudioProcessor,
trimmingAudioProcessor); trimmingAudioProcessor);
Collections.addAll(toIntPcmAudioProcessors, audioProcessorChain.getAudioProcessors()); Collections.addAll(toIntPcmAudioProcessors, audioProcessorChain.getAudioProcessors());
toIntPcmAvailableAudioProcessors = toIntPcmAvailableAudioProcessors = toIntPcmAudioProcessors.toArray(new AudioProcessor[0]);
toIntPcmAudioProcessors.toArray(new AudioProcessor[toIntPcmAudioProcessors.size()]);
toFloatPcmAvailableAudioProcessors = new AudioProcessor[] {new FloatResamplingAudioProcessor()}; toFloatPcmAvailableAudioProcessors = new AudioProcessor[] {new FloatResamplingAudioProcessor()};
volume = 1.0f; volume = 1.0f;
startMediaTimeState = START_NOT_SET; startMediaTimeState = START_NOT_SET;
......
...@@ -97,7 +97,7 @@ public final class DrmInitData implements Comparator<SchemeData>, Parcelable { ...@@ -97,7 +97,7 @@ public final class DrmInitData implements Comparator<SchemeData>, Parcelable {
* @param schemeDatas Scheme initialization data for possibly multiple DRM schemes. * @param schemeDatas Scheme initialization data for possibly multiple DRM schemes.
*/ */
public DrmInitData(List<SchemeData> schemeDatas) { public DrmInitData(List<SchemeData> schemeDatas) {
this(null, false, schemeDatas.toArray(new SchemeData[schemeDatas.size()])); this(null, false, schemeDatas.toArray(new SchemeData[0]));
} }
/** /**
...@@ -105,7 +105,7 @@ public final class DrmInitData implements Comparator<SchemeData>, Parcelable { ...@@ -105,7 +105,7 @@ public final class DrmInitData implements Comparator<SchemeData>, Parcelable {
* @param schemeDatas Scheme initialization data for possibly multiple DRM schemes. * @param schemeDatas Scheme initialization data for possibly multiple DRM schemes.
*/ */
public DrmInitData(@Nullable String schemeType, List<SchemeData> schemeDatas) { public DrmInitData(@Nullable String schemeType, List<SchemeData> schemeDatas) {
this(schemeType, false, schemeDatas.toArray(new SchemeData[schemeDatas.size()])); this(schemeType, false, schemeDatas.toArray(new SchemeData[0]));
} }
/** /**
......
...@@ -81,8 +81,9 @@ public abstract class BinarySearchSeeker { ...@@ -81,8 +81,9 @@ public abstract class BinarySearchSeeker {
*/ */
public static final class OutputFrameHolder { public static final class OutputFrameHolder {
public final ByteBuffer byteBuffer;
public long timeUs; public long timeUs;
public ByteBuffer byteBuffer;
/** Constructs an instance, wrapping the given byte buffer. */ /** Constructs an instance, wrapping the given byte buffer. */
public OutputFrameHolder(ByteBuffer outputByteBuffer) { public OutputFrameHolder(ByteBuffer outputByteBuffer) {
......
...@@ -423,7 +423,7 @@ public final class Mp4Extractor implements Extractor, SeekMap { ...@@ -423,7 +423,7 @@ public final class Mp4Extractor implements Extractor, SeekMap {
} }
this.firstVideoTrackIndex = firstVideoTrackIndex; this.firstVideoTrackIndex = firstVideoTrackIndex;
this.durationUs = durationUs; this.durationUs = durationUs;
this.tracks = tracks.toArray(new Mp4Track[tracks.size()]); this.tracks = tracks.toArray(new Mp4Track[0]);
accumulatedSampleSizes = calculateAccumulatedSampleSizes(this.tracks); accumulatedSampleSizes = calculateAccumulatedSampleSizes(this.tracks);
extractorOutput.endTracks(); extractorOutput.endTracks();
......
...@@ -801,6 +801,7 @@ public class ConcatenatingMediaSource extends CompositeMediaSource<MediaSourceHo ...@@ -801,6 +801,7 @@ public class ConcatenatingMediaSource extends CompositeMediaSource<MediaSourceHo
public final MediaSource mediaSource; public final MediaSource mediaSource;
public final Object uid; public final Object uid;
public final List<DeferredMediaPeriod> activeMediaPeriods;
public DeferredTimeline timeline; public DeferredTimeline timeline;
public int childIndex; public int childIndex;
...@@ -809,7 +810,6 @@ public class ConcatenatingMediaSource extends CompositeMediaSource<MediaSourceHo ...@@ -809,7 +810,6 @@ public class ConcatenatingMediaSource extends CompositeMediaSource<MediaSourceHo
public boolean hasStartedPreparing; public boolean hasStartedPreparing;
public boolean isPrepared; public boolean isPrepared;
public boolean isRemoved; public boolean isRemoved;
public List<DeferredMediaPeriod> activeMediaPeriods;
public MediaSourceHolder(MediaSource mediaSource) { public MediaSourceHolder(MediaSource mediaSource) {
this.mediaSource = mediaSource; this.mediaSource = mediaSource;
......
...@@ -18,6 +18,7 @@ package com.google.android.exoplayer2.upstream.cache; ...@@ -18,6 +18,7 @@ package com.google.android.exoplayer2.upstream.cache;
import android.support.annotation.NonNull; import android.support.annotation.NonNull;
import com.google.android.exoplayer2.extractor.ChunkIndex; import com.google.android.exoplayer2.extractor.ChunkIndex;
import com.google.android.exoplayer2.util.Log; import com.google.android.exoplayer2.util.Log;
import com.google.android.exoplayer2.util.Util;
import java.util.Arrays; import java.util.Arrays;
import java.util.Iterator; import java.util.Iterator;
import java.util.NavigableSet; import java.util.NavigableSet;
...@@ -195,8 +196,7 @@ public final class CachedRegionTracker implements Cache.Listener { ...@@ -195,8 +196,7 @@ public final class CachedRegionTracker implements Cache.Listener {
@Override @Override
public int compareTo(@NonNull Region another) { public int compareTo(@NonNull Region another) {
return startOffset < another.startOffset ? -1 return Util.compareLong(startOffset, another.startOffset);
: startOffset == another.startOffset ? 0 : 1;
} }
} }
......
...@@ -1032,6 +1032,12 @@ public class PlayerView extends FrameLayout { ...@@ -1032,6 +1032,12 @@ public class PlayerView extends FrameLayout {
if (ev.getActionMasked() != MotionEvent.ACTION_DOWN) { if (ev.getActionMasked() != MotionEvent.ACTION_DOWN) {
return false; return false;
} }
return performClick();
}
@Override
public boolean performClick() {
super.performClick();
return toggleControllerVisibility(); return toggleControllerVisibility();
} }
......
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