Skip to content

SDK / exoplayer

Go to a project
Commit bd8a956d by olly Committed by Oliver Woodman
Options

Use lamdas everywhere 

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=209162373
parent 0831f6ca
Expand all
Inline Side-by-side
Showing with 543 additions and 1307 deletions
demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/MainActivity.java
...@@ -30,8 +30,6 @@ import android.view.Menu; ...@@ -30,8 +30,6 @@ import android.view.Menu;
import android.view.View; import android.view.View;
import android.view.View.OnClickListener; import android.view.View.OnClickListener;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.AdapterView;
import android.widget.AdapterView.OnItemClickListener;
import android.widget.ArrayAdapter; import android.widget.ArrayAdapter;
import android.widget.ListView; import android.widget.ListView;
import android.widget.TextView; import android.widget.TextView;
...@@ -145,13 +143,9 @@ public class MainActivity extends AppCompatActivity implements OnClickListener, ...@@ -145,13 +143,9 @@ public class MainActivity extends AppCompatActivity implements OnClickListener,
ListView sampleList = dialogList.findViewById(R.id.sample_list); ListView sampleList = dialogList.findViewById(R.id.sample_list);
sampleList.setAdapter(new SampleListAdapter(this)); sampleList.setAdapter(new SampleListAdapter(this));
sampleList.setOnItemClickListener( sampleList.setOnItemClickListener(
new OnItemClickListener() { (parent, view, position, id) -> {
playerManager.addItem(DemoUtil.SAMPLES.get(position));
@Override mediaQueueListAdapter.notifyItemInserted(playerManager.getMediaQueueSize() - 1);
public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
playerManager.addItem(DemoUtil.SAMPLES.get(position));
mediaQueueListAdapter.notifyItemInserted(playerManager.getMediaQueueSize() - 1);
}
}); });
return dialogList; return dialogList;
} }
......
demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadTracker.java
...@@ -175,14 +175,11 @@ public class DownloadTracker implements DownloadManager.Listener { ...@@ -175,14 +175,11 @@ public class DownloadTracker implements DownloadManager.Listener {
} }
final DownloadAction[] actions = trackedDownloadStates.values().toArray(new DownloadAction[0]); final DownloadAction[] actions = trackedDownloadStates.values().toArray(new DownloadAction[0]);
actionFileWriteHandler.post( actionFileWriteHandler.post(
new Runnable() { () -> {
@Override try {
public void run() { actionFile.store(actions);
try { } catch (IOException e) {
actionFile.store(actions); Log.e(TAG, "Failed to store tracked actions", e);
} catch (IOException e) {
Log.e(TAG, "Failed to store tracked actions", e);
}
} }
}); });
} }
......
extensions/flac/src/androidTest/java/com/google/android/exoplayer2/ext/flac/FlacExtractorTest.java
...@@ -16,9 +16,7 @@ ...@@ -16,9 +16,7 @@
package com.google.android.exoplayer2.ext.flac; package com.google.android.exoplayer2.ext.flac;
import android.test.InstrumentationTestCase; import android.test.InstrumentationTestCase;
import com.google.android.exoplayer2.extractor.Extractor;
import com.google.android.exoplayer2.testutil.ExtractorAsserts; import com.google.android.exoplayer2.testutil.ExtractorAsserts;
import com.google.android.exoplayer2.testutil.ExtractorAsserts.ExtractorFactory;
/** /**
* Unit test for {@link FlacExtractor}. * Unit test for {@link FlacExtractor}.
...@@ -35,25 +33,11 @@ public class FlacExtractorTest extends InstrumentationTestCase { ...@@ -35,25 +33,11 @@ public class FlacExtractorTest extends InstrumentationTestCase {
public void testExtractFlacSample() throws Exception { public void testExtractFlacSample() throws Exception {
ExtractorAsserts.assertBehavior( ExtractorAsserts.assertBehavior(
new ExtractorFactory() { FlacExtractor::new, "bear.flac", getInstrumentation().getContext());
@Override
public Extractor create() {
return new FlacExtractor();
}
},
"bear.flac",
getInstrumentation().getContext());
} }
public void testExtractFlacSampleWithId3Header() throws Exception { public void testExtractFlacSampleWithId3Header() throws Exception {
ExtractorAsserts.assertBehavior( ExtractorAsserts.assertBehavior(
new ExtractorFactory() { FlacExtractor::new, "bear_with_id3.flac", getInstrumentation().getContext());
@Override
public Extractor create() {
return new FlacExtractor();
}
},
"bear_with_id3.flac",
getInstrumentation().getContext());
} }
} }
library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java
...@@ -853,15 +853,12 @@ import java.util.Collections; ...@@ -853,15 +853,12 @@ import java.util.Collections;
private void sendMessageToTargetThread(final PlayerMessage message) { private void sendMessageToTargetThread(final PlayerMessage message) {
Handler handler = message.getHandler(); Handler handler = message.getHandler();
handler.post( handler.post(
new Runnable() { () -> {
@Override try {
public void run() { deliverMessage(message);
try { } catch (ExoPlaybackException e) {
deliverMessage(message); Log.e(TAG, "Unexpected error delivering message on external thread.", e);
} catch (ExoPlaybackException e) { throw new RuntimeException(e);
Log.e(TAG, "Unexpected error delivering message on external thread.", e);
throw new RuntimeException(e);
}
} }
}); });
} }
......
library/core/src/main/java/com/google/android/exoplayer2/audio/AudioRendererEventListener.java
...@@ -104,12 +104,7 @@ public interface AudioRendererEventListener { ...@@ -104,12 +104,7 @@ public interface AudioRendererEventListener {
*/ */
public void enabled(final DecoderCounters decoderCounters) { public void enabled(final DecoderCounters decoderCounters) {
if (listener != null) { if (listener != null) {
handler.post(new Runnable() { handler.post(() -> listener.onAudioEnabled(decoderCounters));
@Override
public void run() {
listener.onAudioEnabled(decoderCounters);
}
});
} }
} }
...@@ -119,13 +114,10 @@ public interface AudioRendererEventListener { ...@@ -119,13 +114,10 @@ public interface AudioRendererEventListener {
public void decoderInitialized(final String decoderName, public void decoderInitialized(final String decoderName,
final long initializedTimestampMs, final long initializationDurationMs) { final long initializedTimestampMs, final long initializationDurationMs) {
if (listener != null) { if (listener != null) {
handler.post(new Runnable() { handler.post(
@Override () ->
public void run() { listener.onAudioDecoderInitialized(
listener.onAudioDecoderInitialized(decoderName, initializedTimestampMs, decoderName, initializedTimestampMs, initializationDurationMs));
initializationDurationMs);
}
});
} }
} }
...@@ -134,12 +126,7 @@ public interface AudioRendererEventListener { ...@@ -134,12 +126,7 @@ public interface AudioRendererEventListener {
*/ */
public void inputFormatChanged(final Format format) { public void inputFormatChanged(final Format format) {
if (listener != null) { if (listener != null) {
handler.post(new Runnable() { handler.post(() -> listener.onAudioInputFormatChanged(format));
@Override
public void run() {
listener.onAudioInputFormatChanged(format);
}
});
} }
} }
...@@ -149,12 +136,8 @@ public interface AudioRendererEventListener { ...@@ -149,12 +136,8 @@ public interface AudioRendererEventListener {
public void audioTrackUnderrun(final int bufferSize, final long bufferSizeMs, public void audioTrackUnderrun(final int bufferSize, final long bufferSizeMs,
final long elapsedSinceLastFeedMs) { final long elapsedSinceLastFeedMs) {
if (listener != null) { if (listener != null) {
handler.post(new Runnable() { handler.post(
@Override () -> listener.onAudioSinkUnderrun(bufferSize, bufferSizeMs, elapsedSinceLastFeedMs));
public void run() {
listener.onAudioSinkUnderrun(bufferSize, bufferSizeMs, elapsedSinceLastFeedMs);
}
});
} }
} }
...@@ -163,13 +146,11 @@ public interface AudioRendererEventListener { ...@@ -163,13 +146,11 @@ public interface AudioRendererEventListener {
*/ */
public void disabled(final DecoderCounters counters) { public void disabled(final DecoderCounters counters) {
if (listener != null) { if (listener != null) {
handler.post(new Runnable() { handler.post(
@Override () -> {
public void run() { counters.ensureUpdated();
counters.ensureUpdated(); listener.onAudioDisabled(counters);
listener.onAudioDisabled(counters); });
}
});
} }
} }
...@@ -178,12 +159,7 @@ public interface AudioRendererEventListener { ...@@ -178,12 +159,7 @@ public interface AudioRendererEventListener {
*/ */
public void audioSessionId(final int audioSessionId) { public void audioSessionId(final int audioSessionId) {
if (listener != null) { if (listener != null) {
handler.post(new Runnable() { handler.post(() -> listener.onAudioSessionId(audioSessionId));
@Override
public void run() {
listener.onAudioSessionId(audioSessionId);
}
});
} }
} }
......
library/core/src/main/java/com/google/android/exoplayer2/drm/FrameworkMediaDrm.java
...@@ -24,8 +24,6 @@ import android.media.MediaDrm; ...@@ -24,8 +24,6 @@ import android.media.MediaDrm;
import android.media.MediaDrmException; import android.media.MediaDrmException;
import android.media.NotProvisionedException; import android.media.NotProvisionedException;
import android.media.UnsupportedSchemeException; import android.media.UnsupportedSchemeException;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.extractor.mp4.PsshAtomUtil; import com.google.android.exoplayer2.extractor.mp4.PsshAtomUtil;
import com.google.android.exoplayer2.util.Assertions; import com.google.android.exoplayer2.util.Assertions;
...@@ -80,13 +78,11 @@ public final class FrameworkMediaDrm implements ExoMediaDrm<FrameworkMediaCrypto ...@@ -80,13 +78,11 @@ public final class FrameworkMediaDrm implements ExoMediaDrm<FrameworkMediaCrypto
@Override @Override
public void setOnEventListener( public void setOnEventListener(
final ExoMediaDrm.OnEventListener<? super FrameworkMediaCrypto> listener) { final ExoMediaDrm.OnEventListener<? super FrameworkMediaCrypto> listener) {
mediaDrm.setOnEventListener(listener == null ? null : new MediaDrm.OnEventListener() { mediaDrm.setOnEventListener(
@Override listener == null
public void onEvent(@NonNull MediaDrm md, @Nullable byte[] sessionId, int event, int extra, ? null
byte[] data) { : (mediaDrm, sessionId, event, extra, data) ->
listener.onEvent(FrameworkMediaDrm.this, sessionId, event, extra, data); listener.onEvent(FrameworkMediaDrm.this, sessionId, event, extra, data));
}
});
} }
@Override @Override
...@@ -99,20 +95,13 @@ public final class FrameworkMediaDrm implements ExoMediaDrm<FrameworkMediaCrypto ...@@ -99,20 +95,13 @@ public final class FrameworkMediaDrm implements ExoMediaDrm<FrameworkMediaCrypto
mediaDrm.setOnKeyStatusChangeListener( mediaDrm.setOnKeyStatusChangeListener(
listener == null listener == null
? null ? null
: new MediaDrm.OnKeyStatusChangeListener() { : (mediaDrm, sessionId, keyInfo, hasNewUsableKey) -> {
@Override List<KeyStatus> exoKeyInfo = new ArrayList<>();
public void onKeyStatusChange( for (MediaDrm.KeyStatus keyStatus : keyInfo) {
@NonNull MediaDrm md, exoKeyInfo.add(new KeyStatus(keyStatus.getStatusCode(), keyStatus.getKeyId()));
@NonNull byte[] sessionId,
@NonNull List<MediaDrm.KeyStatus> keyInfo,
boolean hasNewUsableKey) {
List<KeyStatus> exoKeyInfo = new ArrayList<>();
for (MediaDrm.KeyStatus keyStatus : keyInfo) {
exoKeyInfo.add(new KeyStatus(keyStatus.getStatusCode(), keyStatus.getKeyId()));
}
listener.onKeyStatusChange(
FrameworkMediaDrm.this, sessionId, exoKeyInfo, hasNewUsableKey);
} }
listener.onKeyStatusChange(
FrameworkMediaDrm.this, sessionId, exoKeyInfo, hasNewUsableKey);
}, },
null); null);
} }
......
library/core/src/main/java/com/google/android/exoplayer2/extractor/GaplessInfoHolder.java
...@@ -29,16 +29,13 @@ import java.util.regex.Pattern; ...@@ -29,16 +29,13 @@ import java.util.regex.Pattern;
public final class GaplessInfoHolder { public final class GaplessInfoHolder {
/** /**
* A {@link FramePredicate} suitable for use when decoding {@link Metadata} that will be passed * A {@link FramePredicate} suitable for use when decoding {@link Metadata} that will be passed to
* to {@link #setFromMetadata(Metadata)}. Only frames that might contain gapless playback * {@link #setFromMetadata(Metadata)}. Only frames that might contain gapless playback information
* information are decoded. * are decoded.
*/ */
public static final FramePredicate GAPLESS_INFO_ID3_FRAME_PREDICATE = new FramePredicate() { public static final FramePredicate GAPLESS_INFO_ID3_FRAME_PREDICATE =
@Override (majorVersion, id0, id1, id2, id3) ->
public boolean evaluate(int majorVersion, int id0, int id1, int id2, int id3) { id0 == 'C' && id1 == 'O' && id2 == 'M' && (id3 == 'M' || majorVersion == 2);
return id0 == 'C' && id1 == 'O' && id2 == 'M' && (id3 == 'M' || majorVersion == 2);
}
};
private static final String GAPLESS_DOMAIN = "com.apple.iTunes"; private static final String GAPLESS_DOMAIN = "com.apple.iTunes";
private static final String GAPLESS_DESCRIPTION = "iTunSMPB"; private static final String GAPLESS_DESCRIPTION = "iTunSMPB";
......
library/core/src/main/java/com/google/android/exoplayer2/metadata/id3/Id3Decoder.java
...@@ -56,13 +56,7 @@ public final class Id3Decoder implements MetadataDecoder { ...@@ -56,13 +56,7 @@ public final class Id3Decoder implements MetadataDecoder {
/** A predicate that indicates no frames should be decoded. */ /** A predicate that indicates no frames should be decoded. */
public static final FramePredicate NO_FRAMES_PREDICATE = public static final FramePredicate NO_FRAMES_PREDICATE =
new FramePredicate() { (majorVersion, id0, id1, id2, id3) -> false;
@Override
public boolean evaluate(int majorVersion, int id0, int id1, int id2, int id3) {
return false;
}
};
private static final String TAG = "Id3Decoder"; private static final String TAG = "Id3Decoder";
......
library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadHelper.java
...@@ -59,21 +59,9 @@ public abstract class DownloadHelper { ...@@ -59,21 +59,9 @@ public abstract class DownloadHelper {
public void run() { public void run() {
try { try {
prepareInternal(); prepareInternal();
handler.post( handler.post(() -> callback.onPrepared(DownloadHelper.this));
new Runnable() {
@Override
public void run() {
callback.onPrepared(DownloadHelper.this);
}
});
} catch (final IOException e) { } catch (final IOException e) {
handler.post( handler.post(() -> callback.onPrepareError(DownloadHelper.this, e));
new Runnable() {
@Override
public void run() {
callback.onPrepareError(DownloadHelper.this, e);
}
});
} }
} }
}.start(); }.start();
......
library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadManager.java
...@@ -336,12 +336,7 @@ public final class DownloadManager { ...@@ -336,12 +336,7 @@ public final class DownloadManager {
tasks.get(i).stop(); tasks.get(i).stop();
} }
final ConditionVariable fileIOFinishedCondition = new ConditionVariable(); final ConditionVariable fileIOFinishedCondition = new ConditionVariable();
fileIOHandler.post(new Runnable() { fileIOHandler.post(fileIOFinishedCondition::open);
@Override
public void run() {
fileIOFinishedCondition.open();
}
});
fileIOFinishedCondition.block(); fileIOFinishedCondition.block();
fileIOThread.quit(); fileIOThread.quit();
logd("Released"); logd("Released");
...@@ -451,51 +446,45 @@ public final class DownloadManager { ...@@ -451,51 +446,45 @@ public final class DownloadManager {
private void loadActions() { private void loadActions() {
fileIOHandler.post( fileIOHandler.post(
new Runnable() { () -> {
@Override DownloadAction[] loadedActions;
public void run() { try {
DownloadAction[] loadedActions; loadedActions = actionFile.load(DownloadManager.this.deserializers);
try { logd("Action file is loaded.");
loadedActions = actionFile.load(DownloadManager.this.deserializers); } catch (Throwable e) {
logd("Action file is loaded."); Log.e(TAG, "Action file loading failed.", e);
} catch (Throwable e) { loadedActions = new DownloadAction[0];
Log.e(TAG, "Action file loading failed.", e);
loadedActions = new DownloadAction[0];
}
final DownloadAction[] actions = loadedActions;
handler.post(
new Runnable() {
@Override
public void run() {
if (released) {
return;
}
List<Task> pendingTasks = new ArrayList<>(tasks);
tasks.clear();
for (DownloadAction action : actions) {
addTaskForAction(action);
}
logd("Tasks are created.");
initialized = true;
for (Listener listener : listeners) {
listener.onInitialized(DownloadManager.this);
}
if (!pendingTasks.isEmpty()) {
tasks.addAll(pendingTasks);
saveActions();
}
maybeStartTasks();
for (int i = 0; i < tasks.size(); i++) {
Task task = tasks.get(i);
if (task.currentState == STATE_QUEUED) {
// Task did not change out of its initial state, and so its initial state
// won't have been reported to listeners. Do so now.
notifyListenersTaskStateChange(task);
}
}
}
});
} }
final DownloadAction[] actions = loadedActions;
handler.post(
() -> {
if (released) {
return;
}
List<Task> pendingTasks = new ArrayList<>(tasks);
tasks.clear();
for (DownloadAction action : actions) {
addTaskForAction(action);
}
logd("Tasks are created.");
initialized = true;
for (Listener listener : listeners) {
listener.onInitialized(DownloadManager.this);
}
if (!pendingTasks.isEmpty()) {
tasks.addAll(pendingTasks);
saveActions();
}
maybeStartTasks();
for (int i = 0; i < tasks.size(); i++) {
Task task = tasks.get(i);
if (task.currentState == STATE_QUEUED) {
// Task did not change out of its initial state, and so its initial state
// won't have been reported to listeners. Do so now.
notifyListenersTaskStateChange(task);
}
}
});
}); });
} }
...@@ -507,17 +496,15 @@ public final class DownloadManager { ...@@ -507,17 +496,15 @@ public final class DownloadManager {
for (int i = 0; i < tasks.size(); i++) { for (int i = 0; i < tasks.size(); i++) {
actions[i] = tasks.get(i).action; actions[i] = tasks.get(i).action;
} }
fileIOHandler.post(new Runnable() { fileIOHandler.post(
@Override () -> {
public void run() { try {
try { actionFile.store(actions);
actionFile.store(actions); logd("Actions persisted.");
logd("Actions persisted."); } catch (IOException e) {
} catch (IOException e) { Log.e(TAG, "Persisting actions failed.", e);
Log.e(TAG, "Persisting actions failed.", e); }
} });
}
});
} }
private static void logd(String message) { private static void logd(String message) {
...@@ -771,12 +758,7 @@ public final class DownloadManager { ...@@ -771,12 +758,7 @@ public final class DownloadManager {
private void cancel() { private void cancel() {
if (changeStateAndNotify(STATE_QUEUED, STATE_QUEUED_CANCELING)) { if (changeStateAndNotify(STATE_QUEUED, STATE_QUEUED_CANCELING)) {
downloadManager.handler.post( downloadManager.handler.post(
new Runnable() { () -> changeStateAndNotify(STATE_QUEUED_CANCELING, STATE_CANCELED));
@Override
public void run() {
changeStateAndNotify(STATE_QUEUED_CANCELING, STATE_CANCELED);
}
});
} else if (changeStateAndNotify(STATE_STARTED, STATE_STARTED_CANCELING)) { } else if (changeStateAndNotify(STATE_STARTED, STATE_STARTED_CANCELING)) {
cancelDownload(); cancelDownload();
} }
...@@ -851,19 +833,14 @@ public final class DownloadManager { ...@@ -851,19 +833,14 @@ public final class DownloadManager {
} }
final Throwable finalError = error; final Throwable finalError = error;
downloadManager.handler.post( downloadManager.handler.post(
new Runnable() { () -> {
@Override if (changeStateAndNotify(
public void run() { STATE_STARTED, finalError != null ? STATE_FAILED : STATE_COMPLETED, finalError)
if (changeStateAndNotify( || changeStateAndNotify(STATE_STARTED_CANCELING, STATE_CANCELED)
STATE_STARTED, || changeStateAndNotify(STATE_STARTED_STOPPING, STATE_QUEUED)) {
finalError != null ? STATE_FAILED : STATE_COMPLETED, return;
finalError)
|| changeStateAndNotify(STATE_STARTED_CANCELING, STATE_CANCELED)
|| changeStateAndNotify(STATE_STARTED_STOPPING, STATE_QUEUED)) {
return;
}
throw new IllegalStateException();
} }
throw new IllegalStateException();
}); });
} }
......
library/core/src/main/java/com/google/android/exoplayer2/source/CompositeMediaSource.java
...@@ -101,13 +101,7 @@ public abstract class CompositeMediaSource<T> extends BaseMediaSource { ...@@ -101,13 +101,7 @@ public abstract class CompositeMediaSource<T> extends BaseMediaSource {
protected final void prepareChildSource(final T id, MediaSource mediaSource) { protected final void prepareChildSource(final T id, MediaSource mediaSource) {
Assertions.checkArgument(!childSources.containsKey(id)); Assertions.checkArgument(!childSources.containsKey(id));
SourceInfoRefreshListener sourceListener = SourceInfoRefreshListener sourceListener =
new SourceInfoRefreshListener() { (source, timeline, manifest) -> onChildSourceInfoRefreshed(id, source, timeline, manifest);
@Override
public void onSourceInfoRefreshed(
MediaSource source, Timeline timeline, @Nullable Object manifest) {
onChildSourceInfoRefreshed(id, source, timeline, manifest);
}
};
MediaSourceEventListener eventListener = new ForwardingEventListener(id); MediaSourceEventListener eventListener = new ForwardingEventListener(id);
childSources.put(id, new MediaSourceAndListener(mediaSource, sourceListener, eventListener)); childSources.put(id, new MediaSourceAndListener(mediaSource, sourceListener, eventListener));
mediaSource.addEventListener(Assertions.checkNotNull(eventHandler), eventListener); mediaSource.addEventListener(Assertions.checkNotNull(eventHandler), eventListener);
......
library/core/src/main/java/com/google/android/exoplayer2/source/ads/AdsMediaSource.java
...@@ -325,12 +325,7 @@ public final class AdsMediaSource extends CompositeMediaSource<MediaPeriodId> { ...@@ -325,12 +325,7 @@ public final class AdsMediaSource extends CompositeMediaSource<MediaPeriodId> {
final ComponentListener componentListener = new ComponentListener(); final ComponentListener componentListener = new ComponentListener();
this.componentListener = componentListener; this.componentListener = componentListener;
prepareChildSource(DUMMY_CONTENT_MEDIA_PERIOD_ID, contentMediaSource); prepareChildSource(DUMMY_CONTENT_MEDIA_PERIOD_ID, contentMediaSource);
mainHandler.post(new Runnable() { mainHandler.post(() -> adsLoader.attachPlayer(player, componentListener, adUiViewGroup));
@Override
public void run() {
adsLoader.attachPlayer(player, componentListener, adUiViewGroup);
}
});
} }
@Override @Override
...@@ -397,12 +392,7 @@ public final class AdsMediaSource extends CompositeMediaSource<MediaPeriodId> { ...@@ -397,12 +392,7 @@ public final class AdsMediaSource extends CompositeMediaSource<MediaPeriodId> {
adPlaybackState = null; adPlaybackState = null;
adGroupMediaSources = new MediaSource[0][]; adGroupMediaSources = new MediaSource[0][];
adDurationsUs = new long[0][]; adDurationsUs = new long[0][];
mainHandler.post(new Runnable() { mainHandler.post(adsLoader::detachPlayer);
@Override
public void run() {
adsLoader.detachPlayer();
}
});
} }
@Override @Override
...@@ -500,15 +490,13 @@ public final class AdsMediaSource extends CompositeMediaSource<MediaPeriodId> { ...@@ -500,15 +490,13 @@ public final class AdsMediaSource extends CompositeMediaSource<MediaPeriodId> {
if (released) { if (released) {
return; return;
} }
playerHandler.post(new Runnable() { playerHandler.post(
@Override () -> {
public void run() { if (released) {
if (released) { return;
return; }
} AdsMediaSource.this.onAdPlaybackState(adPlaybackState);
AdsMediaSource.this.onAdPlaybackState(adPlaybackState); });
}
});
} }
@Override @Override
...@@ -517,14 +505,12 @@ public final class AdsMediaSource extends CompositeMediaSource<MediaPeriodId> { ...@@ -517,14 +505,12 @@ public final class AdsMediaSource extends CompositeMediaSource<MediaPeriodId> {
return; return;
} }
if (eventHandler != null && eventListener != null) { if (eventHandler != null && eventListener != null) {
eventHandler.post(new Runnable() { eventHandler.post(
@Override () -> {
public void run() { if (!released) {
if (!released) { eventListener.onAdClicked();
eventListener.onAdClicked(); }
} });
}
});
} }
} }
...@@ -534,14 +520,12 @@ public final class AdsMediaSource extends CompositeMediaSource<MediaPeriodId> { ...@@ -534,14 +520,12 @@ public final class AdsMediaSource extends CompositeMediaSource<MediaPeriodId> {
return; return;
} }
if (eventHandler != null && eventListener != null) { if (eventHandler != null && eventListener != null) {
eventHandler.post(new Runnable() { eventHandler.post(
@Override () -> {
public void run() { if (!released) {
if (!released) { eventListener.onAdTapped();
eventListener.onAdTapped(); }
} });
}
});
} }
} }
...@@ -562,15 +546,12 @@ public final class AdsMediaSource extends CompositeMediaSource<MediaPeriodId> { ...@@ -562,15 +546,12 @@ public final class AdsMediaSource extends CompositeMediaSource<MediaPeriodId> {
/* wasCanceled= */ true); /* wasCanceled= */ true);
if (eventHandler != null && eventListener != null) { if (eventHandler != null && eventListener != null) {
eventHandler.post( eventHandler.post(
new Runnable() { () -> {
@Override if (!released) {
public void run() { if (error.type == AdLoadException.TYPE_UNEXPECTED) {
if (!released) { eventListener.onInternalAdLoadError(error.getRuntimeExceptionForUnexpected());
if (error.type == AdLoadException.TYPE_UNEXPECTED) { } else {
eventListener.onInternalAdLoadError(error.getRuntimeExceptionForUnexpected()); eventListener.onAdLoadError(error);
} else {
eventListener.onAdLoadError(error);
}
} }
} }
}); });
...@@ -603,12 +584,7 @@ public final class AdsMediaSource extends CompositeMediaSource<MediaPeriodId> { ...@@ -603,12 +584,7 @@ public final class AdsMediaSource extends CompositeMediaSource<MediaPeriodId> {
AdLoadException.createForAd(exception), AdLoadException.createForAd(exception),
/* wasCanceled= */ true); /* wasCanceled= */ true);
mainHandler.post( mainHandler.post(
new Runnable() { () -> adsLoader.handlePrepareError(adGroupIndex, adIndexInAdGroup, exception));
@Override
public void run() {
adsLoader.handlePrepareError(adGroupIndex, adIndexInAdGroup, exception);
}
});
} }
} }
} }
library/core/src/main/java/com/google/android/exoplayer2/upstream/DummyDataSource.java
...@@ -27,12 +27,7 @@ public final class DummyDataSource implements DataSource { ...@@ -27,12 +27,7 @@ public final class DummyDataSource implements DataSource {
public static final DummyDataSource INSTANCE = new DummyDataSource(); public static final DummyDataSource INSTANCE = new DummyDataSource();
/** A factory that produces {@link DummyDataSource}. */ /** A factory that produces {@link DummyDataSource}. */
public static final Factory FACTORY = new Factory() { public static final Factory FACTORY = DummyDataSource::new;
@Override
public DataSource createDataSource() {
return new DummyDataSource();
}
};
private DummyDataSource() {} private DummyDataSource() {}
......
library/core/src/main/java/com/google/android/exoplayer2/upstream/HttpDataSource.java
...@@ -211,20 +211,15 @@ public interface HttpDataSource extends DataSource { ...@@ -211,20 +211,15 @@ public interface HttpDataSource extends DataSource {
} }
/** /** A {@link Predicate} that rejects content types often used for pay-walls. */
* A {@link Predicate} that rejects content types often used for pay-walls. Predicate<String> REJECT_PAYWALL_TYPES =
*/ contentType -> {
Predicate<String> REJECT_PAYWALL_TYPES = new Predicate<String>() { contentType = Util.toLowerInvariant(contentType);
return !TextUtils.isEmpty(contentType)
@Override && (!contentType.contains("text") || contentType.contains("text/vtt"))
public boolean evaluate(String contentType) { && !contentType.contains("html")
contentType = Util.toLowerInvariant(contentType); && !contentType.contains("xml");
return !TextUtils.isEmpty(contentType) };
&& (!contentType.contains("text") || contentType.contains("text/vtt"))
&& !contentType.contains("html") && !contentType.contains("xml");
}
};
/** /**
* Thrown when an error is encountered when trying to read from a {@link HttpDataSource}. * Thrown when an error is encountered when trying to read from a {@link HttpDataSource}.
......
library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheUtil.java
...@@ -55,13 +55,7 @@ public final class CacheUtil { ...@@ -55,13 +55,7 @@ public final class CacheUtil {
public static final int DEFAULT_BUFFER_SIZE_BYTES = 128 * 1024; public static final int DEFAULT_BUFFER_SIZE_BYTES = 128 * 1024;
/** Default {@link CacheKeyFactory} that calls through to {@link #getKey}. */ /** Default {@link CacheKeyFactory} that calls through to {@link #getKey}. */
public static final CacheKeyFactory DEFAULT_CACHE_KEY_FACTORY = public static final CacheKeyFactory DEFAULT_CACHE_KEY_FACTORY = CacheUtil::getKey;
new CacheKeyFactory() {
@Override
public String buildCacheKey(DataSpec dataSpec) {
return getKey(dataSpec);
}
};
/** /**
* Generates a cache key out of the given {@link Uri}. * Generates a cache key out of the given {@link Uri}.
......
library/core/src/main/java/com/google/android/exoplayer2/util/SlidingPercentile.java
...@@ -35,19 +35,9 @@ import java.util.Comparator; ...@@ -35,19 +35,9 @@ import java.util.Comparator;
public class SlidingPercentile { public class SlidingPercentile {
// Orderings. // Orderings.
private static final Comparator<Sample> INDEX_COMPARATOR = new Comparator<Sample>() { private static final Comparator<Sample> INDEX_COMPARATOR = (a, b) -> a.index - b.index;
@Override private static final Comparator<Sample> VALUE_COMPARATOR =
public int compare(Sample a, Sample b) { (a, b) -> Float.compare(a.value, b.value);
return a.index - b.index;
}
};
private static final Comparator<Sample> VALUE_COMPARATOR = new Comparator<Sample>() {
@Override
public int compare(Sample a, Sample b) {
return a.value < b.value ? -1 : b.value < a.value ? 1 : 0;
}
};
private static final int SORT_ORDER_NONE = -1; private static final int SORT_ORDER_NONE = -1;
private static final int SORT_ORDER_BY_VALUE = 0; private static final int SORT_ORDER_BY_VALUE = 0;
......
library/core/src/main/java/com/google/android/exoplayer2/util/Util.java
...@@ -34,7 +34,6 @@ import android.os.Handler; ...@@ -34,7 +34,6 @@ import android.os.Handler;
import android.os.Looper; import android.os.Looper;
import android.os.Parcel; import android.os.Parcel;
import android.security.NetworkSecurityPolicy; import android.security.NetworkSecurityPolicy;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable; import android.support.annotation.Nullable;
import android.telephony.TelephonyManager; import android.telephony.TelephonyManager;
import android.text.TextUtils; import android.text.TextUtils;
...@@ -67,7 +66,6 @@ import java.util.TimeZone; ...@@ -67,7 +66,6 @@ import java.util.TimeZone;
import java.util.UUID; import java.util.UUID;
import java.util.concurrent.ExecutorService; import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors; import java.util.concurrent.Executors;
import java.util.concurrent.ThreadFactory;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import java.util.zip.DataFormatException; import java.util.zip.DataFormatException;
...@@ -341,12 +339,7 @@ public final class Util { ...@@ -341,12 +339,7 @@ public final class Util {
* @return The executor. * @return The executor.
*/ */
public static ExecutorService newSingleThreadExecutor(final String threadName) { public static ExecutorService newSingleThreadExecutor(final String threadName) {
return Executors.newSingleThreadExecutor(new ThreadFactory() { return Executors.newSingleThreadExecutor(runnable -> new Thread(runnable, threadName));
@Override
public Thread newThread(@NonNull Runnable r) {
return new Thread(r, threadName);
}
});
} }
/** /**
......
library/core/src/main/java/com/google/android/exoplayer2/video/VideoRendererEventListener.java
...@@ -129,12 +129,7 @@ public interface VideoRendererEventListener { ...@@ -129,12 +129,7 @@ public interface VideoRendererEventListener {
*/ */
public void enabled(final DecoderCounters decoderCounters) { public void enabled(final DecoderCounters decoderCounters) {
if (listener != null) { if (listener != null) {
handler.post(new Runnable() { handler.post(() -> listener.onVideoEnabled(decoderCounters));
@Override
public void run() {
listener.onVideoEnabled(decoderCounters);
}
});
} }
} }
...@@ -144,13 +139,10 @@ public interface VideoRendererEventListener { ...@@ -144,13 +139,10 @@ public interface VideoRendererEventListener {
public void decoderInitialized(final String decoderName, public void decoderInitialized(final String decoderName,
final long initializedTimestampMs, final long initializationDurationMs) { final long initializedTimestampMs, final long initializationDurationMs) {
if (listener != null) { if (listener != null) {
handler.post(new Runnable() { handler.post(
@Override () ->
public void run() { listener.onVideoDecoderInitialized(
listener.onVideoDecoderInitialized(decoderName, initializedTimestampMs, decoderName, initializedTimestampMs, initializationDurationMs));
initializationDurationMs);
}
});
} }
} }
...@@ -159,12 +151,7 @@ public interface VideoRendererEventListener { ...@@ -159,12 +151,7 @@ public interface VideoRendererEventListener {
*/ */
public void inputFormatChanged(final Format format) { public void inputFormatChanged(final Format format) {
if (listener != null) { if (listener != null) {
handler.post(new Runnable() { handler.post(() -> listener.onVideoInputFormatChanged(format));
@Override
public void run() {
listener.onVideoInputFormatChanged(format);
}
});
} }
} }
...@@ -173,12 +160,7 @@ public interface VideoRendererEventListener { ...@@ -173,12 +160,7 @@ public interface VideoRendererEventListener {
*/ */
public void droppedFrames(final int droppedFrameCount, final long elapsedMs) { public void droppedFrames(final int droppedFrameCount, final long elapsedMs) {
if (listener != null) { if (listener != null) {
handler.post(new Runnable() { handler.post(() -> listener.onDroppedFrames(droppedFrameCount, elapsedMs));
@Override
public void run() {
listener.onDroppedFrames(droppedFrameCount, elapsedMs);
}
});
} }
} }
...@@ -188,13 +170,10 @@ public interface VideoRendererEventListener { ...@@ -188,13 +170,10 @@ public interface VideoRendererEventListener {
public void videoSizeChanged(final int width, final int height, public void videoSizeChanged(final int width, final int height,
final int unappliedRotationDegrees, final float pixelWidthHeightRatio) { final int unappliedRotationDegrees, final float pixelWidthHeightRatio) {
if (listener != null) { if (listener != null) {
handler.post(new Runnable() { handler.post(
@Override () ->
public void run() { listener.onVideoSizeChanged(
listener.onVideoSizeChanged(width, height, unappliedRotationDegrees, width, height, unappliedRotationDegrees, pixelWidthHeightRatio));
pixelWidthHeightRatio);
}
});
} }
} }
...@@ -203,12 +182,7 @@ public interface VideoRendererEventListener { ...@@ -203,12 +182,7 @@ public interface VideoRendererEventListener {
*/ */
public void renderedFirstFrame(final Surface surface) { public void renderedFirstFrame(final Surface surface) {
if (listener != null) { if (listener != null) {
handler.post(new Runnable() { handler.post(() -> listener.onRenderedFirstFrame(surface));
@Override
public void run() {
listener.onRenderedFirstFrame(surface);
}
});
} }
} }
...@@ -217,13 +191,11 @@ public interface VideoRendererEventListener { ...@@ -217,13 +191,11 @@ public interface VideoRendererEventListener {
*/ */
public void disabled(final DecoderCounters counters) { public void disabled(final DecoderCounters counters) {
if (listener != null) { if (listener != null) {
handler.post(new Runnable() { handler.post(
@Override () -> {
public void run() { counters.ensureUpdated();
counters.ensureUpdated(); listener.onVideoDisabled(counters);
listener.onVideoDisabled(counters); });
}
});
} }
} }
......
library/core/src/test/java/com/google/android/exoplayer2/ExoPlayerTest.java
...@@ -277,24 +277,15 @@ public final class ExoPlayerTest { ...@@ -277,24 +277,15 @@ public final class ExoPlayerTest {
.waitForTimelineChanged(timeline) .waitForTimelineChanged(timeline)
.prepareSource(secondSource) .prepareSource(secondSource)
.executeRunnable( .executeRunnable(
new Runnable() { () -> {
@Override try {
public void run() { queuedSourceInfoCountDownLatch.await();
try { } catch (InterruptedException e) {
queuedSourceInfoCountDownLatch.await(); // Ignore.
} catch (InterruptedException e) {
// Ignore.
}
} }
}) })
.prepareSource(thirdSource) .prepareSource(thirdSource)
.executeRunnable( .executeRunnable(completePreparationCountDownLatch::countDown)
new Runnable() {
@Override
public void run() {
completePreparationCountDownLatch.countDown();
}
})
.build(); .build();
ExoPlayerTestRunner testRunner = ExoPlayerTestRunner testRunner =
new Builder() new Builder()
...@@ -436,13 +427,7 @@ public final class ExoPlayerTest { ...@@ -436,13 +427,7 @@ public final class ExoPlayerTest {
new ActionSchedule.Builder("testAdGroupWithLoadErrorIsSkipped") new ActionSchedule.Builder("testAdGroupWithLoadErrorIsSkipped")
.pause() .pause()
.waitForPlaybackState(Player.STATE_READY) .waitForPlaybackState(Player.STATE_READY)
.executeRunnable( .executeRunnable(() -> fakeMediaSource.setNewSourceInfo(adErrorTimeline, null))
new Runnable() {
@Override
public void run() {
fakeMediaSource.setNewSourceInfo(adErrorTimeline, null);
}
})
.waitForTimelineChanged(adErrorTimeline) .waitForTimelineChanged(adErrorTimeline)
.play() .play()
.build(); .build();
...@@ -823,13 +808,7 @@ public final class ExoPlayerTest { ...@@ -823,13 +808,7 @@ public final class ExoPlayerTest {
new ActionSchedule.Builder("testDynamicTimelineChangeReason") new ActionSchedule.Builder("testDynamicTimelineChangeReason")
.pause() .pause()
.waitForTimelineChanged(timeline1) .waitForTimelineChanged(timeline1)
.executeRunnable( .executeRunnable(() -> mediaSource.setNewSourceInfo(timeline2, null))
new Runnable() {
@Override
public void run() {
mediaSource.setNewSourceInfo(timeline2, null);
}
})
.waitForTimelineChanged(timeline2) .waitForTimelineChanged(timeline2)
.play() .play()
.build(); .build();
...@@ -911,26 +890,17 @@ public final class ExoPlayerTest { ...@@ -911,26 +890,17 @@ public final class ExoPlayerTest {
.waitForPlaybackState(Player.STATE_BUFFERING) .waitForPlaybackState(Player.STATE_BUFFERING)
// Block until createPeriod has been called on the fake media source. // Block until createPeriod has been called on the fake media source.
.executeRunnable( .executeRunnable(
new Runnable() { () -> {
@Override try {
public void run() { createPeriodCalledCountDownLatch.await();
try { } catch (InterruptedException e) {
createPeriodCalledCountDownLatch.await(); throw new IllegalStateException(e);
} catch (InterruptedException e) {
throw new IllegalStateException(e);
}
} }
}) })
// Set playback parameters (while the fake media period is not yet prepared). // Set playback parameters (while the fake media period is not yet prepared).
.setPlaybackParameters(new PlaybackParameters(/* speed= */ 2f, /* pitch= */ 2f)) .setPlaybackParameters(new PlaybackParameters(/* speed= */ 2f, /* pitch= */ 2f))
// Complete preparation of the fake media period. // Complete preparation of the fake media period.
.executeRunnable( .executeRunnable(() -> fakeMediaPeriodHolder[0].setPreparationComplete())
new Runnable() {
@Override
public void run() {
fakeMediaPeriodHolder[0].setPreparationComplete();
}
})
.build(); .build();
new ExoPlayerTestRunner.Builder() new ExoPlayerTestRunner.Builder()
.setMediaSource(mediaSource) .setMediaSource(mediaSource)
...@@ -1280,13 +1250,7 @@ public final class ExoPlayerTest { ...@@ -1280,13 +1250,7 @@ public final class ExoPlayerTest {
// is still being prepared. The error will be thrown while the player handles the new // is still being prepared. The error will be thrown while the player handles the new
// source info. // source info.
.seek(/* windowIndex= */ 100, /* positionMs= */ 0) .seek(/* windowIndex= */ 100, /* positionMs= */ 0)
.executeRunnable( .executeRunnable(() -> mediaSource.setNewSourceInfo(timeline, /* newManifest= */ null))
new Runnable() {
@Override
public void run() {
mediaSource.setNewSourceInfo(timeline, /* newManifest= */ null);
}
})
.waitForPlaybackState(Player.STATE_IDLE) .waitForPlaybackState(Player.STATE_IDLE)
.build(); .build();
ExoPlayerTestRunner testRunner = ExoPlayerTestRunner testRunner =
...@@ -1789,13 +1753,7 @@ public final class ExoPlayerTest { ...@@ -1789,13 +1753,7 @@ public final class ExoPlayerTest {
.pause() .pause()
.waitForTimelineChanged(timeline) .waitForTimelineChanged(timeline)
.sendMessage(target, /* positionMs= */ 50) .sendMessage(target, /* positionMs= */ 50)
.executeRunnable( .executeRunnable(() -> mediaSource.setNewSourceInfo(secondTimeline, null))
new Runnable() {
@Override
public void run() {
mediaSource.setNewSourceInfo(secondTimeline, null);
}
})
.waitForTimelineChanged(secondTimeline) .waitForTimelineChanged(secondTimeline)
.play() .play()
.build(); .build();
...@@ -1868,13 +1826,7 @@ public final class ExoPlayerTest { ...@@ -1868,13 +1826,7 @@ public final class ExoPlayerTest {
.pause() .pause()
.waitForTimelineChanged(timeline) .waitForTimelineChanged(timeline)
.sendMessage(target, /* windowIndex = */ 1, /* positionMs= */ 50) .sendMessage(target, /* windowIndex = */ 1, /* positionMs= */ 50)
.executeRunnable( .executeRunnable(() -> mediaSource.setNewSourceInfo(secondTimeline, null))
new Runnable() {
@Override
public void run() {
mediaSource.setNewSourceInfo(secondTimeline, null);
}
})
.waitForTimelineChanged(secondTimeline) .waitForTimelineChanged(secondTimeline)
.seek(/* windowIndex= */ 0, /* positionMs= */ 0) .seek(/* windowIndex= */ 0, /* positionMs= */ 0)
.play() .play()
...@@ -1943,13 +1895,7 @@ public final class ExoPlayerTest { ...@@ -1943,13 +1895,7 @@ public final class ExoPlayerTest {
}) })
// Play a bit to ensure message arrived in internal player. // Play a bit to ensure message arrived in internal player.
.playUntilPosition(/* windowIndex= */ 0, /* positionMs= */ 30) .playUntilPosition(/* windowIndex= */ 0, /* positionMs= */ 30)
.executeRunnable( .executeRunnable(() -> message.get().cancel())
new Runnable() {
@Override
public void run() {
message.get().cancel();
}
})
.play() .play()
.build(); .build();
new Builder() new Builder()
...@@ -1987,13 +1933,7 @@ public final class ExoPlayerTest { ...@@ -1987,13 +1933,7 @@ public final class ExoPlayerTest {
.playUntilPosition(/* windowIndex= */ 0, /* positionMs= */ 51) .playUntilPosition(/* windowIndex= */ 0, /* positionMs= */ 51)
// Seek back, cancel the message, and play past the same position again. // Seek back, cancel the message, and play past the same position again.
.seek(/* positionMs= */ 0) .seek(/* positionMs= */ 0)
.executeRunnable( .executeRunnable(() -> message.get().cancel())
new Runnable() {
@Override
public void run() {
message.get().cancel();
}
})
.play() .play()
.build(); .build();
new Builder() new Builder()
...@@ -2064,13 +2004,7 @@ public final class ExoPlayerTest { ...@@ -2064,13 +2004,7 @@ public final class ExoPlayerTest {
.playUntilPosition( .playUntilPosition(
/* windowIndex= */ 0, /* windowIndex= */ 0,
/* positionMs= */ C.usToMs(TimelineWindowDefinition.DEFAULT_WINDOW_DURATION_US)) /* positionMs= */ C.usToMs(TimelineWindowDefinition.DEFAULT_WINDOW_DURATION_US))
.executeRunnable( .executeRunnable(() -> mediaSource.setNewSourceInfo(timeline2, /* newManifest= */ null))
new Runnable() {
@Override
public void run() {
mediaSource.setNewSourceInfo(timeline2, /* newManifest= */ null);
}
})
.waitForTimelineChanged(timeline2) .waitForTimelineChanged(timeline2)
.play() .play()
.build(); .build();
......
library/core/src/test/java/com/google/android/exoplayer2/analytics/AnalyticsCollectorTest.java
...@@ -17,9 +17,6 @@ package com.google.android.exoplayer2.analytics; ...@@ -17,9 +17,6 @@ package com.google.android.exoplayer2.analytics;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import android.content.Context;
import android.net.ConnectivityManager;
import android.net.NetworkInfo;
import android.os.Handler; import android.os.Handler;
import android.os.SystemClock; import android.os.SystemClock;
import android.support.annotation.Nullable; import android.support.annotation.Nullable;
...@@ -35,10 +32,7 @@ import com.google.android.exoplayer2.Timeline; ...@@ -35,10 +32,7 @@ import com.google.android.exoplayer2.Timeline;
import com.google.android.exoplayer2.Timeline.Window; import com.google.android.exoplayer2.Timeline.Window;
import com.google.android.exoplayer2.audio.AudioRendererEventListener; import com.google.android.exoplayer2.audio.AudioRendererEventListener;
import com.google.android.exoplayer2.decoder.DecoderCounters; import com.google.android.exoplayer2.decoder.DecoderCounters;
import com.google.android.exoplayer2.drm.DrmSessionManager;
import com.google.android.exoplayer2.drm.FrameworkMediaCrypto;
import com.google.android.exoplayer2.metadata.Metadata; import com.google.android.exoplayer2.metadata.Metadata;
import com.google.android.exoplayer2.metadata.MetadataOutput;
import com.google.android.exoplayer2.source.ConcatenatingMediaSource; import com.google.android.exoplayer2.source.ConcatenatingMediaSource;
import com.google.android.exoplayer2.source.MediaSource; import com.google.android.exoplayer2.source.MediaSource;
import com.google.android.exoplayer2.source.MediaSource.MediaPeriodId; import com.google.android.exoplayer2.source.MediaSource.MediaPeriodId;
...@@ -53,7 +47,6 @@ import com.google.android.exoplayer2.testutil.FakeMediaSource; ...@@ -53,7 +47,6 @@ import com.google.android.exoplayer2.testutil.FakeMediaSource;
import com.google.android.exoplayer2.testutil.FakeRenderer; import com.google.android.exoplayer2.testutil.FakeRenderer;
import com.google.android.exoplayer2.testutil.FakeTimeline; import com.google.android.exoplayer2.testutil.FakeTimeline;
import com.google.android.exoplayer2.testutil.RobolectricUtil; import com.google.android.exoplayer2.testutil.RobolectricUtil;
import com.google.android.exoplayer2.text.TextOutput;
import com.google.android.exoplayer2.trackselection.TrackSelectionArray; import com.google.android.exoplayer2.trackselection.TrackSelectionArray;
import com.google.android.exoplayer2.util.Util; import com.google.android.exoplayer2.util.Util;
import com.google.android.exoplayer2.video.VideoRendererEventListener; import com.google.android.exoplayer2.video.VideoRendererEventListener;
...@@ -601,13 +594,9 @@ public final class AnalyticsCollectorTest { ...@@ -601,13 +594,9 @@ public final class AnalyticsCollectorTest {
// Ensure second period is already being read from. // Ensure second period is already being read from.
.playUntilPosition(/* windowIndex= */ 0, /* positionMs= */ periodDurationMs) .playUntilPosition(/* windowIndex= */ 0, /* positionMs= */ periodDurationMs)
.executeRunnable( .executeRunnable(
new Runnable() { () ->
@Override
public void run() {
concatenatedMediaSource.moveMediaSource( concatenatedMediaSource.moveMediaSource(
/* currentIndex= */ 0, /* newIndex= */ 1); /* currentIndex= */ 0, /* newIndex= */ 1))
}
})
.waitForTimelineChanged(/* expectedTimeline= */ null) .waitForTimelineChanged(/* expectedTimeline= */ null)
.play() .play()
.build(); .build();
...@@ -658,10 +647,6 @@ public final class AnalyticsCollectorTest { ...@@ -658,10 +647,6 @@ public final class AnalyticsCollectorTest {
@Test @Test
public void testNotifyExternalEvents() throws Exception { public void testNotifyExternalEvents() throws Exception {
MediaSource mediaSource = new FakeMediaSource(SINGLE_PERIOD_TIMELINE, /* manifest= */ null); MediaSource mediaSource = new FakeMediaSource(SINGLE_PERIOD_TIMELINE, /* manifest= */ null);
final NetworkInfo networkInfo =
((ConnectivityManager)
RuntimeEnvironment.application.getSystemService(Context.CONNECTIVITY_SERVICE))
.getActiveNetworkInfo();
ActionSchedule actionSchedule = ActionSchedule actionSchedule =
new ActionSchedule.Builder("AnalyticsCollectorTest") new ActionSchedule.Builder("AnalyticsCollectorTest")
.pause() .pause()
...@@ -689,21 +674,16 @@ public final class AnalyticsCollectorTest { ...@@ -689,21 +674,16 @@ public final class AnalyticsCollectorTest {
private static TestAnalyticsListener runAnalyticsTest( private static TestAnalyticsListener runAnalyticsTest(
MediaSource mediaSource, @Nullable ActionSchedule actionSchedule) throws Exception { MediaSource mediaSource, @Nullable ActionSchedule actionSchedule) throws Exception {
RenderersFactory renderersFactory = RenderersFactory renderersFactory =
new RenderersFactory() { (eventHandler,
@Override videoRendererEventListener,
public Renderer[] createRenderers( audioRendererEventListener,
Handler eventHandler, textRendererOutput,
VideoRendererEventListener videoRendererEventListener, metadataRendererOutput,
AudioRendererEventListener audioRendererEventListener, drmSessionManager) ->
TextOutput textRendererOutput, new Renderer[] {
MetadataOutput metadataRendererOutput,
@Nullable DrmSessionManager<FrameworkMediaCrypto> drmSessionManager) {
return new Renderer[] {
new FakeVideoRenderer(eventHandler, videoRendererEventListener), new FakeVideoRenderer(eventHandler, videoRendererEventListener),
new FakeAudioRenderer(eventHandler, audioRendererEventListener) new FakeAudioRenderer(eventHandler, audioRendererEventListener)
}; };
}
};
TestAnalyticsListener listener = new TestAnalyticsListener(); TestAnalyticsListener listener = new TestAnalyticsListener();
try { try {
new ExoPlayerTestRunner.Builder() new ExoPlayerTestRunner.Builder()
......
library/core/src/test/java/com/google/android/exoplayer2/extractor/Id3PeekerTest.java
...@@ -21,7 +21,6 @@ import static com.google.common.truth.Truth.assertThat; ...@@ -21,7 +21,6 @@ import static com.google.common.truth.Truth.assertThat;
import com.google.android.exoplayer2.metadata.Metadata; import com.google.android.exoplayer2.metadata.Metadata;
import com.google.android.exoplayer2.metadata.id3.ApicFrame; import com.google.android.exoplayer2.metadata.id3.ApicFrame;
import com.google.android.exoplayer2.metadata.id3.CommentFrame; import com.google.android.exoplayer2.metadata.id3.CommentFrame;
import com.google.android.exoplayer2.metadata.id3.Id3Decoder;
import com.google.android.exoplayer2.metadata.id3.Id3DecoderTest; import com.google.android.exoplayer2.metadata.id3.Id3DecoderTest;
import com.google.android.exoplayer2.testutil.FakeExtractorInput; import com.google.android.exoplayer2.testutil.FakeExtractorInput;
import java.io.IOException; import java.io.IOException;
...@@ -95,12 +94,8 @@ public final class Id3PeekerTest { ...@@ -95,12 +94,8 @@ public final class Id3PeekerTest {
Metadata metadata = Metadata metadata =
id3Peeker.peekId3Data( id3Peeker.peekId3Data(
input, input,
new Id3Decoder.FramePredicate() { (majorVersion, id0, id1, id2, id3) ->
@Override id0 == 'C' && id1 == 'O' && id2 == 'M' && id3 == 'M');
public boolean evaluate(int majorVersion, int id0, int id1, int id2, int id3) {
return id0 == 'C' && id1 == 'O' && id2 == 'M' && id3 == 'M';
}
});
assertThat(metadata.length()).isEqualTo(1); assertThat(metadata.length()).isEqualTo(1);
CommentFrame commentFrame = (CommentFrame) metadata.get(0); CommentFrame commentFrame = (CommentFrame) metadata.get(0);
......
library/core/src/test/java/com/google/android/exoplayer2/extractor/amr/AmrExtractorTest.java
...@@ -250,14 +250,11 @@ public final class AmrExtractorTest { ...@@ -250,14 +250,11 @@ public final class AmrExtractorTest {
@NonNull @NonNull
private static ExtractorAsserts.ExtractorFactory createAmrExtractorFactory(boolean withSeeking) { private static ExtractorAsserts.ExtractorFactory createAmrExtractorFactory(boolean withSeeking) {
return new ExtractorAsserts.ExtractorFactory() { return () -> {
@Override if (!withSeeking) {
public Extractor create() { return new AmrExtractor();
if (!withSeeking) { } else {
return new AmrExtractor(); return new AmrExtractor(AmrExtractor.FLAG_ENABLE_CONSTANT_BITRATE_SEEKING);
} else {
return new AmrExtractor(AmrExtractor.FLAG_ENABLE_CONSTANT_BITRATE_SEEKING);
}
} }
}; };
} }
......
library/core/src/test/java/com/google/android/exoplayer2/extractor/flv/FlvExtractorTest.java
...@@ -15,9 +15,7 @@ ...@@ -15,9 +15,7 @@
*/ */
package com.google.android.exoplayer2.extractor.flv; package com.google.android.exoplayer2.extractor.flv;
import com.google.android.exoplayer2.extractor.Extractor;
import com.google.android.exoplayer2.testutil.ExtractorAsserts; import com.google.android.exoplayer2.testutil.ExtractorAsserts;
import com.google.android.exoplayer2.testutil.ExtractorAsserts.ExtractorFactory;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner; import org.robolectric.RobolectricTestRunner;
...@@ -28,13 +26,6 @@ public final class FlvExtractorTest { ...@@ -28,13 +26,6 @@ public final class FlvExtractorTest {
@Test @Test
public void testSample() throws Exception { public void testSample() throws Exception {
ExtractorAsserts.assertBehavior( ExtractorAsserts.assertBehavior(FlvExtractor::new, "flv/sample.flv");
new ExtractorFactory() {
@Override
public Extractor create() {
return new FlvExtractor();
}
},
"flv/sample.flv");
} }
} }
library/core/src/test/java/com/google/android/exoplayer2/extractor/mkv/MatroskaExtractorTest.java
...@@ -15,9 +15,7 @@ ...@@ -15,9 +15,7 @@
*/ */
package com.google.android.exoplayer2.extractor.mkv; package com.google.android.exoplayer2.extractor.mkv;
import com.google.android.exoplayer2.extractor.Extractor;
import com.google.android.exoplayer2.testutil.ExtractorAsserts; import com.google.android.exoplayer2.testutil.ExtractorAsserts;
import com.google.android.exoplayer2.testutil.ExtractorAsserts.ExtractorFactory;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner; import org.robolectric.RobolectricTestRunner;
...@@ -28,37 +26,17 @@ public final class MatroskaExtractorTest { ...@@ -28,37 +26,17 @@ public final class MatroskaExtractorTest {
@Test @Test
public void testMkvSample() throws Exception { public void testMkvSample() throws Exception {
ExtractorAsserts.assertBehavior( ExtractorAsserts.assertBehavior(MatroskaExtractor::new, "mkv/sample.mkv");
new ExtractorFactory() {
@Override
public Extractor create() {
return new MatroskaExtractor();
}
},
"mkv/sample.mkv");
} }
@Test @Test
public void testWebmSubsampleEncryption() throws Exception { public void testWebmSubsampleEncryption() throws Exception {
ExtractorAsserts.assertBehavior( ExtractorAsserts.assertBehavior(
new ExtractorFactory() { MatroskaExtractor::new, "mkv/subsample_encrypted_noaltref.webm");
@Override
public Extractor create() {
return new MatroskaExtractor();
}
},
"mkv/subsample_encrypted_noaltref.webm");
} }
@Test @Test
public void testWebmSubsampleEncryptionWithAltrefFrames() throws Exception { public void testWebmSubsampleEncryptionWithAltrefFrames() throws Exception {
ExtractorAsserts.assertBehavior( ExtractorAsserts.assertBehavior(MatroskaExtractor::new, "mkv/subsample_encrypted_altref.webm");
new ExtractorFactory() {
@Override
public Extractor create() {
return new MatroskaExtractor();
}
},
"mkv/subsample_encrypted_altref.webm");
} }
} }
library/core/src/test/java/com/google/android/exoplayer2/extractor/mp3/Mp3ExtractorTest.java
...@@ -15,9 +15,7 @@ ...@@ -15,9 +15,7 @@
*/ */
package com.google.android.exoplayer2.extractor.mp3; package com.google.android.exoplayer2.extractor.mp3;
import com.google.android.exoplayer2.extractor.Extractor;
import com.google.android.exoplayer2.testutil.ExtractorAsserts; import com.google.android.exoplayer2.testutil.ExtractorAsserts;
import com.google.android.exoplayer2.testutil.ExtractorAsserts.ExtractorFactory;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner; import org.robolectric.RobolectricTestRunner;
...@@ -28,25 +26,11 @@ public final class Mp3ExtractorTest { ...@@ -28,25 +26,11 @@ public final class Mp3ExtractorTest {
@Test @Test
public void testMp3Sample() throws Exception { public void testMp3Sample() throws Exception {
ExtractorAsserts.assertBehavior( ExtractorAsserts.assertBehavior(Mp3Extractor::new, "mp3/bear.mp3");
new ExtractorFactory() {
@Override
public Extractor create() {
return new Mp3Extractor();
}
},
"mp3/bear.mp3");
} }
@Test @Test
public void testTrimmedMp3Sample() throws Exception { public void testTrimmedMp3Sample() throws Exception {
ExtractorAsserts.assertBehavior( ExtractorAsserts.assertBehavior(Mp3Extractor::new, "mp3/play-trimmed.mp3");
new ExtractorFactory() {
@Override
public Extractor create() {
return new Mp3Extractor();
}
},
"mp3/play-trimmed.mp3");
} }
} }
library/core/src/test/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4ExtractorTest.java
...@@ -16,7 +16,6 @@ ...@@ -16,7 +16,6 @@
package com.google.android.exoplayer2.extractor.mp4; package com.google.android.exoplayer2.extractor.mp4;
import com.google.android.exoplayer2.Format; import com.google.android.exoplayer2.Format;
import com.google.android.exoplayer2.extractor.Extractor;
import com.google.android.exoplayer2.testutil.ExtractorAsserts; import com.google.android.exoplayer2.testutil.ExtractorAsserts;
import com.google.android.exoplayer2.testutil.ExtractorAsserts.ExtractorFactory; import com.google.android.exoplayer2.testutil.ExtractorAsserts.ExtractorFactory;
import com.google.android.exoplayer2.util.MimeTypes; import com.google.android.exoplayer2.util.MimeTypes;
...@@ -53,11 +52,6 @@ public final class FragmentedMp4ExtractorTest { ...@@ -53,11 +52,6 @@ public final class FragmentedMp4ExtractorTest {
} }
private static ExtractorFactory getExtractorFactory(final List<Format> closedCaptionFormats) { private static ExtractorFactory getExtractorFactory(final List<Format> closedCaptionFormats) {
return new ExtractorFactory() { return () -> new FragmentedMp4Extractor(0, null, null, null, closedCaptionFormats);
@Override
public Extractor create() {
return new FragmentedMp4Extractor(0, null, null, null, closedCaptionFormats);
}
};
} }
} }
library/core/src/test/java/com/google/android/exoplayer2/extractor/mp4/Mp4ExtractorTest.java
...@@ -16,9 +16,7 @@ ...@@ -16,9 +16,7 @@
package com.google.android.exoplayer2.extractor.mp4; package com.google.android.exoplayer2.extractor.mp4;
import android.annotation.TargetApi; import android.annotation.TargetApi;
import com.google.android.exoplayer2.extractor.Extractor;
import com.google.android.exoplayer2.testutil.ExtractorAsserts; import com.google.android.exoplayer2.testutil.ExtractorAsserts;
import com.google.android.exoplayer2.testutil.ExtractorAsserts.ExtractorFactory;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner; import org.robolectric.RobolectricTestRunner;
...@@ -30,13 +28,6 @@ public final class Mp4ExtractorTest { ...@@ -30,13 +28,6 @@ public final class Mp4ExtractorTest {
@Test @Test
public void testMp4Sample() throws Exception { public void testMp4Sample() throws Exception {
ExtractorAsserts.assertBehavior( ExtractorAsserts.assertBehavior(Mp4Extractor::new, "mp4/sample.mp4");
new ExtractorFactory() {
@Override
public Extractor create() {
return new Mp4Extractor();
}
},
"mp4/sample.mp4");
} }
} }
library/core/src/test/java/com/google/android/exoplayer2/extractor/ogg/OggExtractorTest.java
...@@ -17,7 +17,6 @@ package com.google.android.exoplayer2.extractor.ogg; ...@@ -17,7 +17,6 @@ package com.google.android.exoplayer2.extractor.ogg;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import com.google.android.exoplayer2.extractor.Extractor;
import com.google.android.exoplayer2.testutil.ExtractorAsserts; import com.google.android.exoplayer2.testutil.ExtractorAsserts;
import com.google.android.exoplayer2.testutil.ExtractorAsserts.ExtractorFactory; import com.google.android.exoplayer2.testutil.ExtractorAsserts.ExtractorFactory;
import com.google.android.exoplayer2.testutil.FakeExtractorInput; import com.google.android.exoplayer2.testutil.FakeExtractorInput;
...@@ -32,13 +31,7 @@ import org.robolectric.RobolectricTestRunner; ...@@ -32,13 +31,7 @@ import org.robolectric.RobolectricTestRunner;
@RunWith(RobolectricTestRunner.class) @RunWith(RobolectricTestRunner.class)
public final class OggExtractorTest { public final class OggExtractorTest {
private static final ExtractorFactory OGG_EXTRACTOR_FACTORY = private static final ExtractorFactory OGG_EXTRACTOR_FACTORY = OggExtractor::new;
new ExtractorFactory() {
@Override
public Extractor create() {
return new OggExtractor();
}
};
@Test @Test
public void testOpus() throws Exception { public void testOpus() throws Exception {
......
library/core/src/test/java/com/google/android/exoplayer2/extractor/rawcc/RawCcExtractorTest.java
...@@ -17,9 +17,7 @@ package com.google.android.exoplayer2.extractor.rawcc; ...@@ -17,9 +17,7 @@ package com.google.android.exoplayer2.extractor.rawcc;
import android.annotation.TargetApi; import android.annotation.TargetApi;
import com.google.android.exoplayer2.Format; import com.google.android.exoplayer2.Format;
import com.google.android.exoplayer2.extractor.Extractor;
import com.google.android.exoplayer2.testutil.ExtractorAsserts; import com.google.android.exoplayer2.testutil.ExtractorAsserts;
import com.google.android.exoplayer2.testutil.ExtractorAsserts.ExtractorFactory;
import com.google.android.exoplayer2.util.MimeTypes; import com.google.android.exoplayer2.util.MimeTypes;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
...@@ -33,10 +31,8 @@ public final class RawCcExtractorTest { ...@@ -33,10 +31,8 @@ public final class RawCcExtractorTest {
@Test @Test
public void testRawCcSample() throws Exception { public void testRawCcSample() throws Exception {
ExtractorAsserts.assertBehavior( ExtractorAsserts.assertBehavior(
new ExtractorFactory() { () ->
@Override new RawCcExtractor(
public Extractor create() {
return new RawCcExtractor(
Format.createTextContainerFormat( Format.createTextContainerFormat(
/* id= */ null, /* id= */ null,
/* label= */ null, /* label= */ null,
...@@ -46,9 +42,7 @@ public final class RawCcExtractorTest { ...@@ -46,9 +42,7 @@ public final class RawCcExtractorTest {
/* bitrate= */ Format.NO_VALUE, /* bitrate= */ Format.NO_VALUE,
/* selectionFlags= */ 0, /* selectionFlags= */ 0,
/* language= */ null, /* language= */ null,
/* accessibilityChannel= */ 1)); /* accessibilityChannel= */ 1)),
}
},
"rawcc/sample.rawcc"); "rawcc/sample.rawcc");
} }
} }
library/core/src/test/java/com/google/android/exoplayer2/extractor/ts/Ac3ExtractorTest.java
...@@ -15,9 +15,7 @@ ...@@ -15,9 +15,7 @@
*/ */
package com.google.android.exoplayer2.extractor.ts; package com.google.android.exoplayer2.extractor.ts;
import com.google.android.exoplayer2.extractor.Extractor;
import com.google.android.exoplayer2.testutil.ExtractorAsserts; import com.google.android.exoplayer2.testutil.ExtractorAsserts;
import com.google.android.exoplayer2.testutil.ExtractorAsserts.ExtractorFactory;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner; import org.robolectric.RobolectricTestRunner;
...@@ -28,13 +26,6 @@ public final class Ac3ExtractorTest { ...@@ -28,13 +26,6 @@ public final class Ac3ExtractorTest {
@Test @Test
public void testSample() throws Exception { public void testSample() throws Exception {
ExtractorAsserts.assertBehavior( ExtractorAsserts.assertBehavior(Ac3Extractor::new, "ts/sample.ac3");
new ExtractorFactory() {
@Override
public Extractor create() {
return new Ac3Extractor();
}
},
"ts/sample.ac3");
} }
} }
library/core/src/test/java/com/google/android/exoplayer2/extractor/ts/AdtsExtractorTest.java
...@@ -15,9 +15,7 @@ ...@@ -15,9 +15,7 @@
*/ */
package com.google.android.exoplayer2.extractor.ts; package com.google.android.exoplayer2.extractor.ts;
import com.google.android.exoplayer2.extractor.Extractor;
import com.google.android.exoplayer2.testutil.ExtractorAsserts; import com.google.android.exoplayer2.testutil.ExtractorAsserts;
import com.google.android.exoplayer2.testutil.ExtractorAsserts.ExtractorFactory;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner; import org.robolectric.RobolectricTestRunner;
...@@ -28,27 +26,16 @@ public final class AdtsExtractorTest { ...@@ -28,27 +26,16 @@ public final class AdtsExtractorTest {
@Test @Test
public void testSample() throws Exception { public void testSample() throws Exception {
ExtractorAsserts.assertBehavior( ExtractorAsserts.assertBehavior(AdtsExtractor::new, "ts/sample.adts");
new ExtractorFactory() {
@Override
public Extractor create() {
return new AdtsExtractor();
}
},
"ts/sample.adts");
} }
@Test @Test
public void testSample_withSeeking() throws Exception { public void testSample_withSeeking() throws Exception {
ExtractorAsserts.assertBehavior( ExtractorAsserts.assertBehavior(
new ExtractorFactory() { () ->
@Override new AdtsExtractor(
public Extractor create() {
return new AdtsExtractor(
/* firstStreamSampleTimestampUs= */ 0, /* firstStreamSampleTimestampUs= */ 0,
/* flags= */ AdtsExtractor.FLAG_ENABLE_CONSTANT_BITRATE_SEEKING); /* flags= */ AdtsExtractor.FLAG_ENABLE_CONSTANT_BITRATE_SEEKING),
}
},
"ts/sample_cbs.adts"); "ts/sample_cbs.adts");
} }
} }
library/core/src/test/java/com/google/android/exoplayer2/extractor/ts/PsExtractorTest.java
...@@ -15,9 +15,7 @@ ...@@ -15,9 +15,7 @@
*/ */
package com.google.android.exoplayer2.extractor.ts; package com.google.android.exoplayer2.extractor.ts;
import com.google.android.exoplayer2.extractor.Extractor;
import com.google.android.exoplayer2.testutil.ExtractorAsserts; import com.google.android.exoplayer2.testutil.ExtractorAsserts;
import com.google.android.exoplayer2.testutil.ExtractorAsserts.ExtractorFactory;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner; import org.robolectric.RobolectricTestRunner;
...@@ -28,13 +26,6 @@ public final class PsExtractorTest { ...@@ -28,13 +26,6 @@ public final class PsExtractorTest {
@Test @Test
public void testSample() throws Exception { public void testSample() throws Exception {
ExtractorAsserts.assertBehavior( ExtractorAsserts.assertBehavior(PsExtractor::new, "ts/sample.ps");
new ExtractorFactory() {
@Override
public Extractor create() {
return new PsExtractor();
}
},
"ts/sample.ps");
} }
} }
library/core/src/test/java/com/google/android/exoplayer2/extractor/ts/TsExtractorTest.java
...@@ -27,7 +27,6 @@ import com.google.android.exoplayer2.extractor.TrackOutput; ...@@ -27,7 +27,6 @@ import com.google.android.exoplayer2.extractor.TrackOutput;
import com.google.android.exoplayer2.extractor.ts.TsPayloadReader.EsInfo; import com.google.android.exoplayer2.extractor.ts.TsPayloadReader.EsInfo;
import com.google.android.exoplayer2.extractor.ts.TsPayloadReader.TrackIdGenerator; import com.google.android.exoplayer2.extractor.ts.TsPayloadReader.TrackIdGenerator;
import com.google.android.exoplayer2.testutil.ExtractorAsserts; import com.google.android.exoplayer2.testutil.ExtractorAsserts;
import com.google.android.exoplayer2.testutil.ExtractorAsserts.ExtractorFactory;
import com.google.android.exoplayer2.testutil.FakeExtractorInput; import com.google.android.exoplayer2.testutil.FakeExtractorInput;
import com.google.android.exoplayer2.testutil.FakeExtractorOutput; import com.google.android.exoplayer2.testutil.FakeExtractorOutput;
import com.google.android.exoplayer2.testutil.FakeTrackOutput; import com.google.android.exoplayer2.testutil.FakeTrackOutput;
...@@ -50,14 +49,7 @@ public final class TsExtractorTest { ...@@ -50,14 +49,7 @@ public final class TsExtractorTest {
@Test @Test
public void testSample() throws Exception { public void testSample() throws Exception {
ExtractorAsserts.assertBehavior( ExtractorAsserts.assertBehavior(TsExtractor::new, "ts/sample.ts");
new ExtractorFactory() {
@Override
public Extractor create() {
return new TsExtractor();
}
},
"ts/sample.ts");
} }
@Test @Test
...@@ -82,15 +74,7 @@ public final class TsExtractorTest { ...@@ -82,15 +74,7 @@ public final class TsExtractorTest {
fileData = out.toByteArray(); fileData = out.toByteArray();
ExtractorAsserts.assertOutput( ExtractorAsserts.assertOutput(
new ExtractorFactory() { TsExtractor::new, "ts/sample.ts", fileData, RuntimeEnvironment.application);
@Override
public Extractor create() {
return new TsExtractor();
}
},
"ts/sample.ts",
fileData,
RuntimeEnvironment.application);
} }
@Test @Test
......
library/core/src/test/java/com/google/android/exoplayer2/extractor/wav/WavExtractorTest.java
...@@ -15,9 +15,7 @@ ...@@ -15,9 +15,7 @@
*/ */
package com.google.android.exoplayer2.extractor.wav; package com.google.android.exoplayer2.extractor.wav;
import com.google.android.exoplayer2.extractor.Extractor;
import com.google.android.exoplayer2.testutil.ExtractorAsserts; import com.google.android.exoplayer2.testutil.ExtractorAsserts;
import com.google.android.exoplayer2.testutil.ExtractorAsserts.ExtractorFactory;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner; import org.robolectric.RobolectricTestRunner;
...@@ -28,13 +26,6 @@ public final class WavExtractorTest { ...@@ -28,13 +26,6 @@ public final class WavExtractorTest {
@Test @Test
public void testSample() throws Exception { public void testSample() throws Exception {
ExtractorAsserts.assertBehavior( ExtractorAsserts.assertBehavior(WavExtractor::new, "wav/sample.wav");
new ExtractorFactory() {
@Override
public Extractor create() {
return new WavExtractor();
}
},
"wav/sample.wav");
} }
} }
library/core/src/test/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java
...@@ -331,13 +331,7 @@ public class DownloadManagerTest { ...@@ -331,13 +331,7 @@ public class DownloadManagerTest {
remove2Action.post().assertStarted(); remove2Action.post().assertStarted();
download2Action.post().assertDoesNotStart(); download2Action.post().assertDoesNotStart();
runOnMainThread( runOnMainThread(() -> downloadManager.stopDownloads());
new Runnable() {
@Override
public void run() {
downloadManager.stopDownloads();
}
});
download1Action.assertStopped(); download1Action.assertStopped();
...@@ -354,13 +348,7 @@ public class DownloadManagerTest { ...@@ -354,13 +348,7 @@ public class DownloadManagerTest {
// New download actions can be added but they don't start. // New download actions can be added but they don't start.
download3Action.post().assertDoesNotStart(); download3Action.post().assertDoesNotStart();
runOnMainThread( runOnMainThread(() -> downloadManager.startDownloads());
new Runnable() {
@Override
public void run() {
downloadManager.startDownloads();
}
});
download2Action.assertStarted().unblock().assertCompleted(); download2Action.assertStarted().unblock().assertCompleted();
download3Action.assertStarted().unblock().assertCompleted(); download3Action.assertStarted().unblock().assertCompleted();
...@@ -380,24 +368,12 @@ public class DownloadManagerTest { ...@@ -380,24 +368,12 @@ public class DownloadManagerTest {
// download3Action doesn't start as DM was configured to run two downloads in parallel. // download3Action doesn't start as DM was configured to run two downloads in parallel.
download3Action.post().assertDoesNotStart(); download3Action.post().assertDoesNotStart();
runOnMainThread( runOnMainThread(() -> downloadManager.stopDownloads());
new Runnable() {
@Override
public void run() {
downloadManager.stopDownloads();
}
});
// download1Action doesn't stop yet as it ignores interrupts. // download1Action doesn't stop yet as it ignores interrupts.
download2Action.assertStopped(); download2Action.assertStopped();
runOnMainThread( runOnMainThread(() -> downloadManager.startDownloads());
new Runnable() {
@Override
public void run() {
downloadManager.startDownloads();
}
});
// download2Action starts immediately. // download2Action starts immediately.
download2Action.assertStarted(); download2Action.assertStarted();
...@@ -421,22 +397,19 @@ public class DownloadManagerTest { ...@@ -421,22 +397,19 @@ public class DownloadManagerTest {
} }
try { try {
runOnMainThread( runOnMainThread(
new Runnable() { () -> {
@Override downloadManager =
public void run() { new DownloadManager(
downloadManager = new DownloaderConstructorHelper(
new DownloadManager( Mockito.mock(Cache.class), DummyDataSource.FACTORY),
new DownloaderConstructorHelper( maxActiveDownloadTasks,
Mockito.mock(Cache.class), DummyDataSource.FACTORY), MIN_RETRY_COUNT,
maxActiveDownloadTasks, actionFile,
MIN_RETRY_COUNT, ProgressiveDownloadAction.DESERIALIZER);
actionFile, downloadManagerListener =
ProgressiveDownloadAction.DESERIALIZER); new TestDownloadManagerListener(downloadManager, dummyMainThread);
downloadManagerListener = downloadManager.addListener(downloadManagerListener);
new TestDownloadManagerListener(downloadManager, dummyMainThread); downloadManager.startDownloads();
downloadManager.addListener(downloadManagerListener);
downloadManager.startDownloads();
}
}); });
} catch (Throwable throwable) { } catch (Throwable throwable) {
throw new Exception(throwable); throw new Exception(throwable);
...@@ -445,13 +418,7 @@ public class DownloadManagerTest { ...@@ -445,13 +418,7 @@ public class DownloadManagerTest {
private void releaseDownloadManager() throws Exception { private void releaseDownloadManager() throws Exception {
try { try {
runOnMainThread( runOnMainThread(() -> downloadManager.release());
new Runnable() {
@Override
public void run() {
downloadManager.release();
}
});
} catch (Throwable throwable) { } catch (Throwable throwable) {
throw new Exception(throwable); throw new Exception(throwable);
} }
...@@ -519,13 +486,7 @@ public class DownloadManagerTest { ...@@ -519,13 +486,7 @@ public class DownloadManagerTest {
} }
private FakeDownloadAction post() { private FakeDownloadAction post() {
runOnMainThread( runOnMainThread(() -> downloadManager.handleAction(FakeDownloadAction.this));
new Runnable() {
@Override
public void run() {
downloadManager.handleAction(FakeDownloadAction.this);
}
});
return this; return this;
} }
......
library/core/src/test/java/com/google/android/exoplayer2/source/ClippingMediaSourceTest.java
...@@ -501,9 +501,7 @@ public final class ClippingMediaSourceTest { ...@@ -501,9 +501,7 @@ public final class ClippingMediaSourceTest {
final MediaLoadData[] reportedMediaLoadData = new MediaLoadData[1]; final MediaLoadData[] reportedMediaLoadData = new MediaLoadData[1];
try { try {
testRunner.runOnPlaybackThread( testRunner.runOnPlaybackThread(
new Runnable() { () ->
@Override
public void run() {
clippingMediaSource.addEventListener( clippingMediaSource.addEventListener(
new Handler(), new Handler(),
new DefaultMediaSourceEventListener() { new DefaultMediaSourceEventListener() {
...@@ -514,9 +512,7 @@ public final class ClippingMediaSourceTest { ...@@ -514,9 +512,7 @@ public final class ClippingMediaSourceTest {
MediaLoadData mediaLoadData) { MediaLoadData mediaLoadData) {
reportedMediaLoadData[0] = mediaLoadData; reportedMediaLoadData[0] = mediaLoadData;
} }
}); }));
}
});
testRunner.prepareSource(); testRunner.prepareSource();
// Create period to send the test event configured above. // Create period to send the test event configured above.
testRunner.createPeriod( testRunner.createPeriod(
......
library/core/src/test/java/com/google/android/exoplayer2/source/ConcatenatingMediaSourceTest.java
...@@ -247,12 +247,7 @@ public final class ConcatenatingMediaSourceTest { ...@@ -247,12 +247,7 @@ public final class ConcatenatingMediaSourceTest {
// Trigger source info refresh for lazy source and check that the timeline now contains all // Trigger source info refresh for lazy source and check that the timeline now contains all
// information for all windows. // information for all windows.
testRunner.runOnPlaybackThread( testRunner.runOnPlaybackThread(
new Runnable() { () -> lazySources[1].setNewSourceInfo(createFakeTimeline(8), null));
@Override
public void run() {
lazySources[1].setNewSourceInfo(createFakeTimeline(8), null);
}
});
timeline = testRunner.assertTimelineChangeBlocking(); timeline = testRunner.assertTimelineChangeBlocking();
TimelineAsserts.assertPeriodCounts(timeline, 1, 9); TimelineAsserts.assertPeriodCounts(timeline, 1, 9);
TimelineAsserts.assertWindowTags(timeline, 111, 999); TimelineAsserts.assertWindowTags(timeline, 111, 999);
...@@ -292,12 +287,7 @@ public final class ConcatenatingMediaSourceTest { ...@@ -292,12 +287,7 @@ public final class ConcatenatingMediaSourceTest {
// Trigger source info refresh for lazy media source. Assert that now all information is // Trigger source info refresh for lazy media source. Assert that now all information is
// available again and the previously created period now also finished preparing. // available again and the previously created period now also finished preparing.
testRunner.runOnPlaybackThread( testRunner.runOnPlaybackThread(
new Runnable() { () -> lazySources[3].setNewSourceInfo(createFakeTimeline(7), null));
@Override
public void run() {
lazySources[3].setNewSourceInfo(createFakeTimeline(7), null);
}
});
timeline = testRunner.assertTimelineChangeBlocking(); timeline = testRunner.assertTimelineChangeBlocking();
TimelineAsserts.assertPeriodCounts(timeline, 8, 1, 2, 9); TimelineAsserts.assertPeriodCounts(timeline, 8, 1, 2, 9);
TimelineAsserts.assertWindowTags(timeline, 888, 111, 222, 999); TimelineAsserts.assertWindowTags(timeline, 888, 111, 222, 999);
...@@ -484,12 +474,7 @@ public final class ConcatenatingMediaSourceTest { ...@@ -484,12 +474,7 @@ public final class ConcatenatingMediaSourceTest {
testRunner.prepareSource(); testRunner.prepareSource();
final TimelineGrabber timelineGrabber = new TimelineGrabber(testRunner); final TimelineGrabber timelineGrabber = new TimelineGrabber(testRunner);
dummyMainThread.runOnMainThread( dummyMainThread.runOnMainThread(
new Runnable() { () -> mediaSource.addMediaSource(createFakeMediaSource(), timelineGrabber));
@Override
public void run() {
mediaSource.addMediaSource(createFakeMediaSource(), timelineGrabber);
}
});
Timeline timeline = timelineGrabber.assertTimelineChangeBlocking(); Timeline timeline = timelineGrabber.assertTimelineChangeBlocking();
assertThat(timeline.getWindowCount()).isEqualTo(1); assertThat(timeline.getWindowCount()).isEqualTo(1);
} finally { } finally {
...@@ -504,15 +489,11 @@ public final class ConcatenatingMediaSourceTest { ...@@ -504,15 +489,11 @@ public final class ConcatenatingMediaSourceTest {
testRunner.prepareSource(); testRunner.prepareSource();
final TimelineGrabber timelineGrabber = new TimelineGrabber(testRunner); final TimelineGrabber timelineGrabber = new TimelineGrabber(testRunner);
dummyMainThread.runOnMainThread( dummyMainThread.runOnMainThread(
new Runnable() { () ->
@Override
public void run() {
mediaSource.addMediaSources( mediaSource.addMediaSources(
Arrays.asList( Arrays.asList(
new MediaSource[] {createFakeMediaSource(), createFakeMediaSource()}), new MediaSource[] {createFakeMediaSource(), createFakeMediaSource()}),
timelineGrabber); timelineGrabber));
}
});
Timeline timeline = timelineGrabber.assertTimelineChangeBlocking(); Timeline timeline = timelineGrabber.assertTimelineChangeBlocking();
assertThat(timeline.getWindowCount()).isEqualTo(2); assertThat(timeline.getWindowCount()).isEqualTo(2);
} finally { } finally {
...@@ -527,12 +508,8 @@ public final class ConcatenatingMediaSourceTest { ...@@ -527,12 +508,8 @@ public final class ConcatenatingMediaSourceTest {
testRunner.prepareSource(); testRunner.prepareSource();
final TimelineGrabber timelineGrabber = new TimelineGrabber(testRunner); final TimelineGrabber timelineGrabber = new TimelineGrabber(testRunner);
dummyMainThread.runOnMainThread( dummyMainThread.runOnMainThread(
new Runnable() { () ->
@Override mediaSource.addMediaSource(/* index */ 0, createFakeMediaSource(), timelineGrabber));
public void run() {
mediaSource.addMediaSource(/* index */ 0, createFakeMediaSource(), timelineGrabber);
}
});
Timeline timeline = timelineGrabber.assertTimelineChangeBlocking(); Timeline timeline = timelineGrabber.assertTimelineChangeBlocking();
assertThat(timeline.getWindowCount()).isEqualTo(1); assertThat(timeline.getWindowCount()).isEqualTo(1);
} finally { } finally {
...@@ -547,16 +524,12 @@ public final class ConcatenatingMediaSourceTest { ...@@ -547,16 +524,12 @@ public final class ConcatenatingMediaSourceTest {
testRunner.prepareSource(); testRunner.prepareSource();
final TimelineGrabber timelineGrabber = new TimelineGrabber(testRunner); final TimelineGrabber timelineGrabber = new TimelineGrabber(testRunner);
dummyMainThread.runOnMainThread( dummyMainThread.runOnMainThread(
new Runnable() { () ->
@Override
public void run() {
mediaSource.addMediaSources( mediaSource.addMediaSources(
/* index */ 0, /* index */ 0,
Arrays.asList( Arrays.asList(
new MediaSource[] {createFakeMediaSource(), createFakeMediaSource()}), new MediaSource[] {createFakeMediaSource(), createFakeMediaSource()}),
timelineGrabber); timelineGrabber));
}
});
Timeline timeline = timelineGrabber.assertTimelineChangeBlocking(); Timeline timeline = timelineGrabber.assertTimelineChangeBlocking();
assertThat(timeline.getWindowCount()).isEqualTo(2); assertThat(timeline.getWindowCount()).isEqualTo(2);
} finally { } finally {
...@@ -569,23 +542,12 @@ public final class ConcatenatingMediaSourceTest { ...@@ -569,23 +542,12 @@ public final class ConcatenatingMediaSourceTest {
DummyMainThread dummyMainThread = new DummyMainThread(); DummyMainThread dummyMainThread = new DummyMainThread();
try { try {
testRunner.prepareSource(); testRunner.prepareSource();
dummyMainThread.runOnMainThread( dummyMainThread.runOnMainThread(() -> mediaSource.addMediaSource(createFakeMediaSource()));
new Runnable() {
@Override
public void run() {
mediaSource.addMediaSource(createFakeMediaSource());
}
});
testRunner.assertTimelineChangeBlocking(); testRunner.assertTimelineChangeBlocking();
final TimelineGrabber timelineGrabber = new TimelineGrabber(testRunner); final TimelineGrabber timelineGrabber = new TimelineGrabber(testRunner);
dummyMainThread.runOnMainThread( dummyMainThread.runOnMainThread(
new Runnable() { () -> mediaSource.removeMediaSource(/* index */ 0, timelineGrabber));
@Override
public void run() {
mediaSource.removeMediaSource(/* index */ 0, timelineGrabber);
}
});
Timeline timeline = timelineGrabber.assertTimelineChangeBlocking(); Timeline timeline = timelineGrabber.assertTimelineChangeBlocking();
assertThat(timeline.getWindowCount()).isEqualTo(0); assertThat(timeline.getWindowCount()).isEqualTo(0);
} finally { } finally {
...@@ -599,24 +561,15 @@ public final class ConcatenatingMediaSourceTest { ...@@ -599,24 +561,15 @@ public final class ConcatenatingMediaSourceTest {
try { try {
testRunner.prepareSource(); testRunner.prepareSource();
dummyMainThread.runOnMainThread( dummyMainThread.runOnMainThread(
new Runnable() { () ->
@Override
public void run() {
mediaSource.addMediaSources( mediaSource.addMediaSources(
Arrays.asList( Arrays.asList(
new MediaSource[] {createFakeMediaSource(), createFakeMediaSource()})); new MediaSource[] {createFakeMediaSource(), createFakeMediaSource()})));
}
});
testRunner.assertTimelineChangeBlocking(); testRunner.assertTimelineChangeBlocking();
final TimelineGrabber timelineGrabber = new TimelineGrabber(testRunner); final TimelineGrabber timelineGrabber = new TimelineGrabber(testRunner);
dummyMainThread.runOnMainThread( dummyMainThread.runOnMainThread(
new Runnable() { () -> mediaSource.moveMediaSource(/* fromIndex */ 1, /* toIndex */ 0, timelineGrabber));
@Override
public void run() {
mediaSource.moveMediaSource(/* fromIndex */ 1, /* toIndex */ 0, timelineGrabber);
}
});
Timeline timeline = timelineGrabber.assertTimelineChangeBlocking(); Timeline timeline = timelineGrabber.assertTimelineChangeBlocking();
assertThat(timeline.getWindowCount()).isEqualTo(2); assertThat(timeline.getWindowCount()).isEqualTo(2);
} finally { } finally {
...@@ -849,23 +802,14 @@ public final class ConcatenatingMediaSourceTest { ...@@ -849,23 +802,14 @@ public final class ConcatenatingMediaSourceTest {
final FakeMediaSource unpreparedChildSource = final FakeMediaSource unpreparedChildSource =
new FakeMediaSource(/* timeline= */ null, /* manifest= */ null); new FakeMediaSource(/* timeline= */ null, /* manifest= */ null);
dummyMainThread.runOnMainThread( dummyMainThread.runOnMainThread(
new Runnable() { () -> {
@Override mediaSource.addMediaSource(preparedChildSource);
public void run() { mediaSource.addMediaSource(unpreparedChildSource);
mediaSource.addMediaSource(preparedChildSource);
mediaSource.addMediaSource(unpreparedChildSource);
}
}); });
testRunner.prepareSource(); testRunner.prepareSource();
final TimelineGrabber timelineGrabber = new TimelineGrabber(testRunner); final TimelineGrabber timelineGrabber = new TimelineGrabber(testRunner);
dummyMainThread.runOnMainThread( dummyMainThread.runOnMainThread(() -> mediaSource.clear(timelineGrabber));
new Runnable() {
@Override
public void run() {
mediaSource.clear(timelineGrabber);
}
});
Timeline timeline = timelineGrabber.assertTimelineChangeBlocking(); Timeline timeline = timelineGrabber.assertTimelineChangeBlocking();
assertThat(timeline.isEmpty()).isTrue(); assertThat(timeline.isEmpty()).isTrue();
......
library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheDataSourceTest.java
...@@ -60,13 +60,7 @@ public final class CacheDataSourceTest { ...@@ -60,13 +60,7 @@ public final class CacheDataSourceTest {
testDataUri = Uri.parse("test_data"); testDataUri = Uri.parse("test_data");
fixedCacheKey = CacheUtil.generateKey(testDataUri); fixedCacheKey = CacheUtil.generateKey(testDataUri);
expectedCacheKey = fixedCacheKey; expectedCacheKey = fixedCacheKey;
cacheKeyFactory = cacheKeyFactory = dataSpec -> CACHE_KEY_PREFIX + "." + CacheUtil.generateKey(dataSpec.uri);
new CacheKeyFactory() {
@Override
public String buildCacheKey(DataSpec dataSpec) {
return CACHE_KEY_PREFIX + "." + CacheUtil.generateKey(dataSpec.uri);
}
};
tempFolder = Util.createTempDirectory(RuntimeEnvironment.application, "ExoPlayerTest"); tempFolder = Util.createTempDirectory(RuntimeEnvironment.application, "ExoPlayerTest");
cache = new SimpleCache(tempFolder, new NoOpCacheEvictor()); cache = new SimpleCache(tempFolder, new NoOpCacheEvictor());
} }
...@@ -366,13 +360,7 @@ public final class CacheDataSourceTest { ...@@ -366,13 +360,7 @@ public final class CacheDataSourceTest {
// Insert an action just before the end of the data to fail the test if reading from upstream // Insert an action just before the end of the data to fail the test if reading from upstream
// reaches end of the data. // reaches end of the data.
fakeData fakeData
.appendReadAction( .appendReadAction(() -> fail("Read from upstream shouldn't reach to the end of the data."))
new Runnable() {
@Override
public void run() {
fail("Read from upstream shouldn't reach to the end of the data.");
}
})
.appendReadData(1); .appendReadData(1);
// Create cache read-only CacheDataSource. // Create cache read-only CacheDataSource.
CacheDataSource cacheDataSource = CacheDataSource cacheDataSource =
...@@ -408,13 +396,7 @@ public final class CacheDataSourceTest { ...@@ -408,13 +396,7 @@ public final class CacheDataSourceTest {
// Insert an action just before the end of the data to fail the test if reading from upstream // Insert an action just before the end of the data to fail the test if reading from upstream
// reaches end of the data. // reaches end of the data.
fakeData fakeData
.appendReadAction( .appendReadAction(() -> fail("Read from upstream shouldn't reach to the end of the data."))
new Runnable() {
@Override
public void run() {
fail("Read from upstream shouldn't reach to the end of the data.");
}
})
.appendReadData(1); .appendReadData(1);
// Lock the content on the cache. // Lock the content on the cache.
......
library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheUtilTest.java
...@@ -292,22 +292,15 @@ public final class CacheUtilTest { ...@@ -292,22 +292,15 @@ public final class CacheUtilTest {
@Test @Test
public void testCachePolling() throws Exception { public void testCachePolling() throws Exception {
final CachingCounters counters = new CachingCounters(); final CachingCounters counters = new CachingCounters();
FakeDataSet fakeDataSet = new FakeDataSet().newData("test_data") FakeDataSet fakeDataSet =
.appendReadData(TestUtil.buildTestData(100)) new FakeDataSet()
.appendReadAction(new Runnable() { .newData("test_data")
@Override .appendReadData(TestUtil.buildTestData(100))
public void run() { .appendReadAction(() -> assertCounters(counters, 0, 100, 300))
assertCounters(counters, 0, 100, 300); .appendReadData(TestUtil.buildTestData(100))
} .appendReadAction(() -> assertCounters(counters, 0, 200, 300))
}) .appendReadData(TestUtil.buildTestData(100))
.appendReadData(TestUtil.buildTestData(100)) .endData();
.appendReadAction(new Runnable() {
@Override
public void run() {
assertCounters(counters, 0, 200, 300);
}
})
.appendReadData(TestUtil.buildTestData(100)).endData();
FakeDataSource dataSource = new FakeDataSource(fakeDataSet); FakeDataSource dataSource = new FakeDataSource(fakeDataSet);
CacheUtil.cache( CacheUtil.cache(
......
library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheTest.java
...@@ -37,8 +37,6 @@ import org.junit.Test; ...@@ -37,8 +37,6 @@ import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.mockito.Mockito; import org.mockito.Mockito;
import org.mockito.MockitoAnnotations; import org.mockito.MockitoAnnotations;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
import org.robolectric.RobolectricTestRunner; import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment; import org.robolectric.RuntimeEnvironment;
...@@ -259,12 +257,12 @@ public class SimpleCacheTest { ...@@ -259,12 +257,12 @@ public class SimpleCacheTest {
addCache(simpleCache, KEY_1, 0, 15); addCache(simpleCache, KEY_1, 0, 15);
// Make index.store() throw exception from now on. // Make index.store() throw exception from now on.
doAnswer(new Answer<Object>() { doAnswer(
@Override invocation -> {
public Object answer(InvocationOnMock invocation) throws Throwable { throw new CacheException("SimpleCacheTest");
throw new Cache.CacheException("SimpleCacheTest"); })
} .when(index)
}).when(index).store(); .store();
// Adding more content will make LeastRecentlyUsedCacheEvictor evict previous content. // Adding more content will make LeastRecentlyUsedCacheEvictor evict previous content.
try { try {
......
library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaSource.java
...@@ -589,18 +589,8 @@ public final class DashMediaSource extends BaseMediaSource { ...@@ -589,18 +589,8 @@ public final class DashMediaSource extends BaseMediaSource {
} else { } else {
manifestCallback = new ManifestCallback(); manifestCallback = new ManifestCallback();
manifestLoadErrorThrower = new ManifestLoadErrorThrower(); manifestLoadErrorThrower = new ManifestLoadErrorThrower();
refreshManifestRunnable = new Runnable() { refreshManifestRunnable = this::startLoadingManifest;
@Override simulateManifestRefreshRunnable = () -> processManifest(false);
public void run() {
startLoadingManifest();
}
};
simulateManifestRefreshRunnable = new Runnable() {
@Override
public void run() {
processManifest(false);
}
};
} }
} }
......
library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadManagerDashTest.java
...@@ -110,18 +110,14 @@ public class DownloadManagerDashTest { ...@@ -110,18 +110,14 @@ public class DownloadManagerDashTest {
fakeDataSet fakeDataSet
.newData(TEST_MPD_URI) .newData(TEST_MPD_URI)
.appendReadAction( .appendReadAction(
new Runnable() { () -> {
@SuppressWarnings("InfiniteLoopStatement") try {
@Override // Wait until interrupted.
public void run() { while (true) {
try { Thread.sleep(100000);
// Wait until interrupted.
while (true) {
Thread.sleep(100000);
}
} catch (InterruptedException ignored) {
Thread.currentThread().interrupt();
} }
} catch (InterruptedException ignored) {
Thread.currentThread().interrupt();
} }
}) })
.appendReadData(TEST_MPD) .appendReadData(TEST_MPD)
...@@ -130,13 +126,10 @@ public class DownloadManagerDashTest { ...@@ -130,13 +126,10 @@ public class DownloadManagerDashTest {
// Run DM accessing code on UI/main thread as it should be. Also not to block handling of loaded // Run DM accessing code on UI/main thread as it should be. Also not to block handling of loaded
// actions. // actions.
dummyMainThread.runOnMainThread( dummyMainThread.runOnMainThread(
new Runnable() { () -> {
@Override // Setup an Action and immediately release the DM.
public void run() { handleDownloadAction(fakeStreamKey1, fakeStreamKey2);
// Setup an Action and immediately release the DM. downloadManager.release();
handleDownloadAction(fakeStreamKey1, fakeStreamKey2);
downloadManager.release();
}
}); });
assertThat(actionFile.exists()).isTrue(); assertThat(actionFile.exists()).isTrue();
...@@ -146,13 +139,7 @@ public class DownloadManagerDashTest { ...@@ -146,13 +139,7 @@ public class DownloadManagerDashTest {
// Revert fakeDataSet to normal. // Revert fakeDataSet to normal.
fakeDataSet.setData(TEST_MPD_URI, TEST_MPD); fakeDataSet.setData(TEST_MPD_URI, TEST_MPD);
dummyMainThread.runOnMainThread( dummyMainThread.runOnMainThread(this::createDownloadManager);
new Runnable() {
@Override
public void run() {
createDownloadManager();
}
});
// Block on the test thread. // Block on the test thread.
blockUntilTasksCompleteAndThrowAnyDownloadError(); blockUntilTasksCompleteAndThrowAnyDownloadError();
...@@ -178,13 +165,7 @@ public class DownloadManagerDashTest { ...@@ -178,13 +165,7 @@ public class DownloadManagerDashTest {
public void testHandleInterferingDownloadAction() throws Throwable { public void testHandleInterferingDownloadAction() throws Throwable {
fakeDataSet fakeDataSet
.newData("audio_segment_2") .newData("audio_segment_2")
.appendReadAction( .appendReadAction(() -> handleDownloadAction(fakeStreamKey2))
new Runnable() {
@Override
public void run() {
handleDownloadAction(fakeStreamKey2);
}
})
.appendReadData(TestUtil.buildTestData(5)) .appendReadData(TestUtil.buildTestData(5))
.endData(); .endData();
...@@ -224,13 +205,7 @@ public class DownloadManagerDashTest { ...@@ -224,13 +205,7 @@ public class DownloadManagerDashTest {
final ConditionVariable downloadInProgressCondition = new ConditionVariable(); final ConditionVariable downloadInProgressCondition = new ConditionVariable();
fakeDataSet fakeDataSet
.newData("audio_segment_2") .newData("audio_segment_2")
.appendReadAction( .appendReadAction(downloadInProgressCondition::open)
new Runnable() {
@Override
public void run() {
downloadInProgressCondition.open();
}
})
.appendReadData(TestUtil.buildTestData(5)) .appendReadData(TestUtil.buildTestData(5))
.endData(); .endData();
...@@ -259,24 +234,21 @@ public class DownloadManagerDashTest { ...@@ -259,24 +234,21 @@ public class DownloadManagerDashTest {
private void createDownloadManager() { private void createDownloadManager() {
dummyMainThread.runOnMainThread( dummyMainThread.runOnMainThread(
new Runnable() { () -> {
@Override Factory fakeDataSourceFactory =
public void run() { new FakeDataSource.Factory(null).setFakeDataSet(fakeDataSet);
Factory fakeDataSourceFactory = downloadManager =
new FakeDataSource.Factory(null).setFakeDataSet(fakeDataSet); new DownloadManager(
downloadManager = new DownloaderConstructorHelper(cache, fakeDataSourceFactory),
new DownloadManager( /* maxSimultaneousDownloads= */ 1,
new DownloaderConstructorHelper(cache, fakeDataSourceFactory), /* minRetryCount= */ 3,
/* maxSimultaneousDownloads= */ 1, actionFile,
/* minRetryCount= */ 3, DashDownloadAction.DESERIALIZER);
actionFile,
DashDownloadAction.DESERIALIZER); downloadManagerListener =
new TestDownloadManagerListener(downloadManager, dummyMainThread);
downloadManagerListener = downloadManager.addListener(downloadManagerListener);
new TestDownloadManagerListener(downloadManager, dummyMainThread); downloadManager.startDownloads();
downloadManager.addListener(downloadManagerListener);
downloadManager.startDownloads();
}
}); });
} }
......
library/dash/src/test/java/com/google/android/exoplayer2/source/dash/offline/DownloadServiceDashTest.java
...@@ -78,15 +78,12 @@ public class DownloadServiceDashTest { ...@@ -78,15 +78,12 @@ public class DownloadServiceDashTest {
cache = new SimpleCache(tempFolder, new NoOpCacheEvictor()); cache = new SimpleCache(tempFolder, new NoOpCacheEvictor());
Runnable pauseAction = Runnable pauseAction =
new Runnable() { () -> {
@Override if (pauseDownloadCondition != null) {
public void run() { try {
if (pauseDownloadCondition != null) { pauseDownloadCondition.block();
try { } catch (InterruptedException e) {
pauseDownloadCondition.block(); Thread.currentThread().interrupt();
} catch (InterruptedException e) {
Thread.currentThread().interrupt();
}
} }
} }
}; };
...@@ -109,55 +106,46 @@ public class DownloadServiceDashTest { ...@@ -109,55 +106,46 @@ public class DownloadServiceDashTest {
fakeStreamKey2 = new StreamKey(0, 1, 0); fakeStreamKey2 = new StreamKey(0, 1, 0);
dummyMainThread.runOnMainThread( dummyMainThread.runOnMainThread(
new Runnable() { () -> {
@Override File actionFile;
public void run() { try {
File actionFile; actionFile = Util.createTempFile(context, "ExoPlayerTest");
try { } catch (IOException e) {
actionFile = Util.createTempFile(context, "ExoPlayerTest"); throw new RuntimeException(e);
} catch (IOException e) {
throw new RuntimeException(e);
}
actionFile.delete();
final DownloadManager dashDownloadManager =
new DownloadManager(
new DownloaderConstructorHelper(cache, fakeDataSourceFactory),
1,
3,
actionFile,
DashDownloadAction.DESERIALIZER);
downloadManagerListener =
new TestDownloadManagerListener(dashDownloadManager, dummyMainThread);
dashDownloadManager.addListener(downloadManagerListener);
dashDownloadManager.startDownloads();
dashDownloadService =
new DownloadService(DownloadService.FOREGROUND_NOTIFICATION_ID_NONE) {
@Override
protected DownloadManager getDownloadManager() {
return dashDownloadManager;
}
@Nullable
@Override
protected Scheduler getScheduler() {
return null;
}
};
dashDownloadService.onCreate();
} }
actionFile.delete();
final DownloadManager dashDownloadManager =
new DownloadManager(
new DownloaderConstructorHelper(cache, fakeDataSourceFactory),
1,
3,
actionFile,
DashDownloadAction.DESERIALIZER);
downloadManagerListener =
new TestDownloadManagerListener(dashDownloadManager, dummyMainThread);
dashDownloadManager.addListener(downloadManagerListener);
dashDownloadManager.startDownloads();
dashDownloadService =
new DownloadService(DownloadService.FOREGROUND_NOTIFICATION_ID_NONE) {
@Override
protected DownloadManager getDownloadManager() {
return dashDownloadManager;
}
@Nullable
@Override
protected Scheduler getScheduler() {
return null;
}
};
dashDownloadService.onCreate();
}); });
} }
@After @After
public void tearDown() { public void tearDown() {
dummyMainThread.runOnMainThread( dummyMainThread.runOnMainThread(() -> dashDownloadService.onDestroy());
new Runnable() {
@Override
public void run() {
dashDownloadService.onDestroy();
}
});
Util.recursiveDelete(tempFolder); Util.recursiveDelete(tempFolder);
dummyMainThread.release(); dummyMainThread.release();
} }
...@@ -210,13 +198,10 @@ public class DownloadServiceDashTest { ...@@ -210,13 +198,10 @@ public class DownloadServiceDashTest {
private void callDownloadServiceOnStart(final DownloadAction action) { private void callDownloadServiceOnStart(final DownloadAction action) {
dummyMainThread.runOnMainThread( dummyMainThread.runOnMainThread(
new Runnable() { () -> {
@Override Intent startIntent =
public void run() { DownloadService.buildAddActionIntent(context, DownloadService.class, action, false);
Intent startIntent = dashDownloadService.onStartCommand(startIntent, 0, 0);
DownloadService.buildAddActionIntent(context, DownloadService.class, action, false);
dashDownloadService.onStartCommand(startIntent, 0, 0);
}
}); });
} }
......
library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/SsMediaSource.java
...@@ -684,12 +684,7 @@ public final class SsMediaSource extends BaseMediaSource ...@@ -684,12 +684,7 @@ public final class SsMediaSource extends BaseMediaSource
} }
long nextLoadTimestamp = manifestLoadStartTimestamp + MINIMUM_MANIFEST_REFRESH_PERIOD_MS; long nextLoadTimestamp = manifestLoadStartTimestamp + MINIMUM_MANIFEST_REFRESH_PERIOD_MS;
long delayUntilNextLoad = Math.max(0, nextLoadTimestamp - SystemClock.elapsedRealtime()); long delayUntilNextLoad = Math.max(0, nextLoadTimestamp - SystemClock.elapsedRealtime());
manifestRefreshHandler.postDelayed(new Runnable() { manifestRefreshHandler.postDelayed(this::startLoadingManifest, delayUntilNextLoad);
@Override
public void run() {
startLoadingManifest();
}
}, delayUntilNextLoad);
} }
private void startLoadingManifest() { private void startLoadingManifest() {
......
library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerControlView.java
...@@ -208,6 +208,8 @@ public class PlayerControlView extends FrameLayout { ...@@ -208,6 +208,8 @@ public class PlayerControlView extends FrameLayout {
private final Formatter formatter; private final Formatter formatter;
private final Timeline.Period period; private final Timeline.Period period;
private final Timeline.Window window; private final Timeline.Window window;
private final Runnable updateProgressAction;
private final Runnable hideAction;
private final Drawable repeatOffButtonDrawable; private final Drawable repeatOffButtonDrawable;
private final Drawable repeatOneButtonDrawable; private final Drawable repeatOneButtonDrawable;
...@@ -236,22 +238,6 @@ public class PlayerControlView extends FrameLayout { ...@@ -236,22 +238,6 @@ public class PlayerControlView extends FrameLayout {
private long[] extraAdGroupTimesMs; private long[] extraAdGroupTimesMs;
private boolean[] extraPlayedAdGroups; private boolean[] extraPlayedAdGroups;
private final Runnable updateProgressAction =
new Runnable() {
@Override
public void run() {
updateProgress();
}
};
private final Runnable hideAction =
new Runnable() {
@Override
public void run() {
hide();
}
};
public PlayerControlView(Context context) { public PlayerControlView(Context context) {
this(context, null); this(context, null);
} }
...@@ -303,6 +289,8 @@ public class PlayerControlView extends FrameLayout { ...@@ -303,6 +289,8 @@ public class PlayerControlView extends FrameLayout {
extraPlayedAdGroups = new boolean[0]; extraPlayedAdGroups = new boolean[0];
componentListener = new ComponentListener(); componentListener = new ComponentListener();
controlDispatcher = new com.google.android.exoplayer2.DefaultControlDispatcher(); controlDispatcher = new com.google.android.exoplayer2.DefaultControlDispatcher();
updateProgressAction = this::updateProgress;
hideAction = this::hide;
LayoutInflater.from(context).inflate(controllerLayoutId, this); LayoutInflater.from(context).inflate(controllerLayoutId, this);
setDescendantFocusability(FOCUS_AFTER_DESCENDANTS); setDescendantFocusability(FOCUS_AFTER_DESCENDANTS);
......
library/ui/src/main/java/com/google/android/exoplayer2/ui/PlayerNotificationManager.java
...@@ -203,14 +203,11 @@ public class PlayerNotificationManager { ...@@ -203,14 +203,11 @@ public class PlayerNotificationManager {
public void onBitmap(final Bitmap bitmap) { public void onBitmap(final Bitmap bitmap) {
if (bitmap != null) { if (bitmap != null) {
mainHandler.post( mainHandler.post(
new Runnable() { () -> {
@Override if (player != null
public void run() { && notificationTag == currentNotificationTag
if (player != null && isNotificationStarted) {
&& notificationTag == currentNotificationTag updateNotification(bitmap);
&& isNotificationStarted) {
updateNotification(bitmap);
}
} }
}); });
} }
......
library/ui/src/main/java/com/google/android/exoplayer2/ui/TrackSelectionView.java
...@@ -19,7 +19,6 @@ import android.app.Activity; ...@@ -19,7 +19,6 @@ import android.app.Activity;
import android.app.AlertDialog; import android.app.AlertDialog;
import android.app.Dialog; import android.app.Dialog;
import android.content.Context; import android.content.Context;
import android.content.DialogInterface;
import android.content.res.TypedArray; import android.content.res.TypedArray;
import android.support.annotation.AttrRes; import android.support.annotation.AttrRes;
import android.support.annotation.Nullable; import android.support.annotation.Nullable;
...@@ -80,13 +79,7 @@ public class TrackSelectionView extends LinearLayout { ...@@ -80,13 +79,7 @@ public class TrackSelectionView extends LinearLayout {
final TrackSelectionView selectionView = dialogView.findViewById(R.id.exo_track_selection_view); final TrackSelectionView selectionView = dialogView.findViewById(R.id.exo_track_selection_view);
selectionView.init(trackSelector, rendererIndex); selectionView.init(trackSelector, rendererIndex);
Dialog.OnClickListener okClickListener = Dialog.OnClickListener okClickListener = (dialog, which) -> selectionView.applySelection();
new Dialog.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
selectionView.applySelection();
}
};
AlertDialog dialog = AlertDialog dialog =
builder builder
......
testutils/src/main/java/com/google/android/exoplayer2/testutil/Action.java
...@@ -469,12 +469,8 @@ public abstract class Action { ...@@ -469,12 +469,8 @@ public abstract class Action {
SimpleExoPlayer player, DefaultTrackSelector trackSelector, Surface surface) { SimpleExoPlayer player, DefaultTrackSelector trackSelector, Surface surface) {
player player
.createMessage( .createMessage(
new Target() { (messageType, payload) -> {
@Override throw exception;
public void handleMessage(int messageType, Object payload)
throws ExoPlaybackException {
throw exception;
}
}) })
.send(); .send();
} }
...@@ -510,25 +506,14 @@ public abstract class Action { ...@@ -510,25 +506,14 @@ public abstract class Action {
// Schedule one message on the playback thread to pause the player immediately. // Schedule one message on the playback thread to pause the player immediately.
player player
.createMessage( .createMessage(
new Target() { (messageType, payload) -> player.setPlayWhenReady(/* playWhenReady= */ false))
@Override
public void handleMessage(int messageType, Object payload)
throws ExoPlaybackException {
player.setPlayWhenReady(/* playWhenReady= */ false);
}
})
.setPosition(windowIndex, positionMs) .setPosition(windowIndex, positionMs)
.send(); .send();
// Schedule another message on this test thread to continue action schedule. // Schedule another message on this test thread to continue action schedule.
player player
.createMessage( .createMessage(
new Target() { (messageType, payload) ->
@Override nextAction.schedule(player, trackSelector, surface, handler))
public void handleMessage(int messageType, Object payload)
throws ExoPlaybackException {
nextAction.schedule(player, trackSelector, surface, handler);
}
})
.setPosition(windowIndex, positionMs) .setPosition(windowIndex, positionMs)
.setHandler(new Handler()) .setHandler(new Handler())
.send(); .send();
......
testutils/src/main/java/com/google/android/exoplayer2/testutil/ActionSchedule.java
...@@ -610,13 +610,7 @@ public final class ActionSchedule { ...@@ -610,13 +610,7 @@ public final class ActionSchedule {
ActionNode nextAction) { ActionNode nextAction) {
Assertions.checkArgument(nextAction == null); Assertions.checkArgument(nextAction == null);
if (callback != null) { if (callback != null) {
handler.post( handler.post(() -> callback.onActionScheduleFinished());
new Runnable() {
@Override
public void run() {
callback.onActionScheduleFinished();
}
});
} }
} }
......
testutils/src/main/java/com/google/android/exoplayer2/testutil/DummyMainThread.java
...@@ -60,12 +60,9 @@ public final class DummyMainThread { ...@@ -60,12 +60,9 @@ public final class DummyMainThread {
} else { } else {
final ConditionVariable finishedCondition = new ConditionVariable(); final ConditionVariable finishedCondition = new ConditionVariable();
handler.post( handler.post(
new Runnable() { () -> {
@Override runnable.run();
public void run() { finishedCondition.open();
runnable.run();
finishedCondition.open();
}
}); });
assertThat(finishedCondition.block(timeoutMs)).isTrue(); assertThat(finishedCondition.block(timeoutMs)).isTrue();
} }
......
testutils/src/main/java/com/google/android/exoplayer2/testutil/ExoHostedTest.java
...@@ -344,12 +344,7 @@ public abstract class ExoHostedTest ...@@ -344,12 +344,7 @@ public abstract class ExoHostedTest
player = null; player = null;
// We post opening of the finished condition so that any events posted to the main thread as a // We post opening of the finished condition so that any events posted to the main thread as a
// result of player.release() are guaranteed to be handled before the test returns. // result of player.release() are guaranteed to be handled before the test returns.
actionHandler.post(new Runnable() { actionHandler.post(testFinished::open);
@Override
public void run() {
testFinished.open();
}
});
return true; return true;
} }
......
testutils/src/main/java/com/google/android/exoplayer2/testutil/ExoPlayerTestRunner.java
...@@ -33,12 +33,8 @@ import com.google.android.exoplayer2.Timeline; ...@@ -33,12 +33,8 @@ import com.google.android.exoplayer2.Timeline;
import com.google.android.exoplayer2.analytics.AnalyticsCollector; import com.google.android.exoplayer2.analytics.AnalyticsCollector;
import com.google.android.exoplayer2.analytics.AnalyticsListener; import com.google.android.exoplayer2.analytics.AnalyticsListener;
import com.google.android.exoplayer2.audio.AudioRendererEventListener; import com.google.android.exoplayer2.audio.AudioRendererEventListener;
import com.google.android.exoplayer2.drm.DrmSessionManager;
import com.google.android.exoplayer2.drm.FrameworkMediaCrypto;
import com.google.android.exoplayer2.metadata.MetadataOutput;
import com.google.android.exoplayer2.source.MediaSource; import com.google.android.exoplayer2.source.MediaSource;
import com.google.android.exoplayer2.source.TrackGroupArray; import com.google.android.exoplayer2.source.TrackGroupArray;
import com.google.android.exoplayer2.text.TextOutput;
import com.google.android.exoplayer2.trackselection.DefaultTrackSelector; import com.google.android.exoplayer2.trackselection.DefaultTrackSelector;
import com.google.android.exoplayer2.trackselection.TrackSelectionArray; import com.google.android.exoplayer2.trackselection.TrackSelectionArray;
import com.google.android.exoplayer2.trackselection.TrackSelector; import com.google.android.exoplayer2.trackselection.TrackSelector;
...@@ -307,18 +303,12 @@ public final class ExoPlayerTestRunner implements Player.EventListener, ActionSc ...@@ -307,18 +303,12 @@ public final class ExoPlayerTestRunner implements Player.EventListener, ActionSc
renderers = new Renderer[] {new FakeRenderer(supportedFormats)}; renderers = new Renderer[] {new FakeRenderer(supportedFormats)};
} }
renderersFactory = renderersFactory =
new RenderersFactory() { (eventHandler,
@Override videoRendererEventListener,
public Renderer[] createRenderers( audioRendererEventListener,
android.os.Handler eventHandler, textRendererOutput,
VideoRendererEventListener videoRendererEventListener, metadataRendererOutput,
AudioRendererEventListener audioRendererEventListener, drmSessionManager) -> renderers;
TextOutput textRendererOutput,
MetadataOutput metadataRendererOutput,
DrmSessionManager<FrameworkMediaCrypto> drmSessionManager) {
return renderers;
}
};
} }
if (loadControl == null) { if (loadControl == null) {
loadControl = new DefaultLoadControl(); loadControl = new DefaultLoadControl();
...@@ -425,35 +415,31 @@ public final class ExoPlayerTestRunner implements Player.EventListener, ActionSc ...@@ -425,35 +415,31 @@ public final class ExoPlayerTestRunner implements Player.EventListener, ActionSc
*/ */
public ExoPlayerTestRunner start() { public ExoPlayerTestRunner start() {
handler.post( handler.post(
new Runnable() { () -> {
@Override try {
public void run() { player =
try { new TestSimpleExoPlayer(
player = context, renderersFactory, trackSelector, loadControl, clock);
new TestSimpleExoPlayer( player.addListener(ExoPlayerTestRunner.this);
context, renderersFactory, trackSelector, loadControl, clock); if (eventListener != null) {
player.addListener(ExoPlayerTestRunner.this); player.addListener(eventListener);
if (eventListener != null) {
player.addListener(eventListener);
}
if (videoRendererEventListener != null) {
player.addVideoDebugListener(videoRendererEventListener);
}
if (audioRendererEventListener != null) {
player.addAudioDebugListener(audioRendererEventListener);
}
if (analyticsListener != null) {
player.addAnalyticsListener(analyticsListener);
}
player.setPlayWhenReady(true);
if (actionSchedule != null) {
actionSchedule.start(
player, trackSelector, null, handler, ExoPlayerTestRunner.this);
}
player.prepare(mediaSource);
} catch (Exception e) {
handleException(e);
} }
if (videoRendererEventListener != null) {
player.addVideoDebugListener(videoRendererEventListener);
}
if (audioRendererEventListener != null) {
player.addAudioDebugListener(audioRendererEventListener);
}
if (analyticsListener != null) {
player.addAnalyticsListener(analyticsListener);
}
player.setPlayWhenReady(true);
if (actionSchedule != null) {
actionSchedule.start(player, trackSelector, null, handler, ExoPlayerTestRunner.this);
}
player.prepare(mediaSource);
} catch (Exception e) {
handleException(e);
} }
}); });
return this; return this;
...@@ -579,20 +565,18 @@ public final class ExoPlayerTestRunner implements Player.EventListener, ActionSc ...@@ -579,20 +565,18 @@ public final class ExoPlayerTestRunner implements Player.EventListener, ActionSc
// Private implementation details. // Private implementation details.
private void release() throws InterruptedException { private void release() throws InterruptedException {
handler.post(new Runnable() { handler.post(
@Override () -> {
public void run() { try {
try { if (player != null) {
if (player != null) { player.release();
player.release(); }
} catch (Exception e) {
handleException(e);
} finally {
playerThread.quit();
} }
} catch (Exception e) { });
handleException(e);
} finally {
playerThread.quit();
}
}
});
playerThread.join(); playerThread.join();
} }
......
testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeMediaPeriod.java
...@@ -93,13 +93,7 @@ public class FakeMediaPeriod implements MediaPeriod { ...@@ -93,13 +93,7 @@ public class FakeMediaPeriod implements MediaPeriod {
public synchronized void setPreparationComplete() { public synchronized void setPreparationComplete() {
deferOnPrepared = false; deferOnPrepared = false;
if (playerHandler != null && prepareCallback != null) { if (playerHandler != null && prepareCallback != null) {
playerHandler.post( playerHandler.post(this::finishPreparation);
new Runnable() {
@Override
public void run() {
finishPreparation();
}
});
} }
} }
......
testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeMediaSource.java
...@@ -149,15 +149,12 @@ public class FakeMediaSource extends BaseMediaSource { ...@@ -149,15 +149,12 @@ public class FakeMediaSource extends BaseMediaSource {
public synchronized void setNewSourceInfo(final Timeline newTimeline, final Object newManifest) { public synchronized void setNewSourceInfo(final Timeline newTimeline, final Object newManifest) {
if (sourceInfoRefreshHandler != null) { if (sourceInfoRefreshHandler != null) {
sourceInfoRefreshHandler.post( sourceInfoRefreshHandler.post(
new Runnable() { () -> {
@Override assertThat(releasedSource).isFalse();
public void run() { assertThat(preparedSource).isTrue();
assertThat(releasedSource).isFalse(); timeline = newTimeline;
assertThat(preparedSource).isTrue(); manifest = newManifest;
timeline = newTimeline; finishSourcePreparation();
manifest = newManifest;
finishSourcePreparation();
}
}); });
} else { } else {
timeline = newTimeline; timeline = newTimeline;
......
testutils/src/main/java/com/google/android/exoplayer2/testutil/HostActivity.java
...@@ -118,13 +118,11 @@ public final class HostActivity extends Activity implements SurfaceHolder.Callba ...@@ -118,13 +118,11 @@ public final class HostActivity extends Activity implements SurfaceHolder.Callba
forcedStopped = false; forcedStopped = false;
hostedTestStarted = false; hostedTestStarted = false;
runOnUiThread(new Runnable() { runOnUiThread(
@Override () -> {
public void run() { HostActivity.this.hostedTest = hostedTest;
HostActivity.this.hostedTest = hostedTest; maybeStartHostedTest();
maybeStartHostedTest(); });
}
});
if (!hostedTestStartedCondition.block(START_TIMEOUT_MS)) { if (!hostedTestStartedCondition.block(START_TIMEOUT_MS)) {
String message = String message =
...@@ -145,12 +143,7 @@ public final class HostActivity extends Activity implements SurfaceHolder.Callba ...@@ -145,12 +143,7 @@ public final class HostActivity extends Activity implements SurfaceHolder.Callba
fail(message); fail(message);
} }
} else { } else {
runOnUiThread(new Runnable() { runOnUiThread(hostedTest::forceStop);
@Override
public void run() {
hostedTest.forceStop();
}
});
String message = "Test timed out after " + timeoutMs + " ms."; String message = "Test timed out after " + timeoutMs + " ms.";
Log.e(TAG, message); Log.e(TAG, message);
if (failOnTimeout) { if (failOnTimeout) {
......
testutils/src/test/java/com/google/android/exoplayer2/testutil/FakeClockTest.java
...@@ -131,13 +131,7 @@ public final class FakeClockTest { ...@@ -131,13 +131,7 @@ public final class FakeClockTest {
private static void waitForHandler(HandlerWrapper handler) { private static void waitForHandler(HandlerWrapper handler) {
final ConditionVariable handlerFinished = new ConditionVariable(); final ConditionVariable handlerFinished = new ConditionVariable();
handler.post( handler.post(handlerFinished::open);
new Runnable() {
@Override
public void run() {
handlerFinished.open();
}
});
handlerFinished.block(); handlerFinished.block();
} }
......
testutils/src/test/java/com/google/android/exoplayer2/testutil/FakeDataSetTest.java
...@@ -65,11 +65,8 @@ public final class FakeDataSetTest { ...@@ -65,11 +65,8 @@ public final class FakeDataSetTest {
public void testSegmentTypes() { public void testSegmentTypes() {
byte[] testData = TestUtil.buildTestData(3); byte[] testData = TestUtil.buildTestData(3);
Runnable runnable = Runnable runnable =
new Runnable() { () -> {
@Override // Do nothing.
public void run() {
// Do nothing.
}
}; };
IOException exception = new IOException(); IOException exception = new IOException();
FakeDataSet fakeDataSet = FakeDataSet fakeDataSet =
......
testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/MediaSourceTestRunner.java
...@@ -97,16 +97,13 @@ public class MediaSourceTestRunner { ...@@ -97,16 +97,13 @@ public class MediaSourceTestRunner {
final Throwable[] throwable = new Throwable[1]; final Throwable[] throwable = new Throwable[1];
final ConditionVariable finishedCondition = new ConditionVariable(); final ConditionVariable finishedCondition = new ConditionVariable();
playbackHandler.post( playbackHandler.post(
new Runnable() { () -> {
@Override try {
public void run() { runnable.run();
try { } catch (Throwable e) {
runnable.run(); throwable[0] = e;
} catch (Throwable e) { } finally {
throwable[0] = e; finishedCondition.open();
} finally {
finishedCondition.open();
}
} }
}); });
assertThat(finishedCondition.block(TIMEOUT_MS)).isTrue(); assertThat(finishedCondition.block(TIMEOUT_MS)).isTrue();
...@@ -123,22 +120,19 @@ public class MediaSourceTestRunner { ...@@ -123,22 +120,19 @@ public class MediaSourceTestRunner {
public Timeline prepareSource() throws IOException { public Timeline prepareSource() throws IOException {
final IOException[] prepareError = new IOException[1]; final IOException[] prepareError = new IOException[1];
runOnPlaybackThread( runOnPlaybackThread(
new Runnable() { () -> {
@Override mediaSource.prepareSource(
public void run() { player,
mediaSource.prepareSource( /* isTopLevelSource= */ true,
player, mediaSourceListener,
/* isTopLevelSource= */ true, /* mediaTransferListener= */ null);
mediaSourceListener, try {
/* mediaTransferListener= */ null); // TODO: This only catches errors that are set synchronously in prepareSource. To
try { // capture async errors we'll need to poll maybeThrowSourceInfoRefreshError until the
// TODO: This only catches errors that are set synchronously in prepareSource. To // first call to onSourceInfoRefreshed.
// capture async errors we'll need to poll maybeThrowSourceInfoRefreshError until the mediaSource.maybeThrowSourceInfoRefreshError();
// first call to onSourceInfoRefreshed. } catch (IOException e) {
mediaSource.maybeThrowSourceInfoRefreshError(); prepareError[0] = e;
} catch (IOException e) {
prepareError[0] = e;
}
} }
}); });
if (prepareError[0] != null) { if (prepareError[0] != null) {
...@@ -156,13 +150,7 @@ public class MediaSourceTestRunner { ...@@ -156,13 +150,7 @@ public class MediaSourceTestRunner {
*/ */
public MediaPeriod createPeriod(final MediaPeriodId periodId) { public MediaPeriod createPeriod(final MediaPeriodId periodId) {
final MediaPeriod[] holder = new MediaPeriod[1]; final MediaPeriod[] holder = new MediaPeriod[1];
runOnPlaybackThread( runOnPlaybackThread(() -> holder[0] = mediaSource.createPeriod(periodId, allocator));
new Runnable() {
@Override
public void run() {
holder[0] = mediaSource.createPeriod(periodId, allocator);
}
});
assertThat(holder[0]).isNotNull(); assertThat(holder[0]).isNotNull();
return holder[0]; return holder[0];
} }
...@@ -179,24 +167,21 @@ public class MediaSourceTestRunner { ...@@ -179,24 +167,21 @@ public class MediaSourceTestRunner {
final ConditionVariable prepareCalled = new ConditionVariable(); final ConditionVariable prepareCalled = new ConditionVariable();
final CountDownLatch preparedCountDown = new CountDownLatch(1); final CountDownLatch preparedCountDown = new CountDownLatch(1);
runOnPlaybackThread( runOnPlaybackThread(
new Runnable() { () -> {
@Override mediaPeriod.prepare(
public void run() { new MediaPeriod.Callback() {
mediaPeriod.prepare( @Override
new MediaPeriod.Callback() { public void onPrepared(MediaPeriod mediaPeriod1) {
@Override preparedCountDown.countDown();
public void onPrepared(MediaPeriod mediaPeriod) { }
preparedCountDown.countDown();
} @Override
public void onContinueLoadingRequested(MediaPeriod source) {
@Override // Do nothing.
public void onContinueLoadingRequested(MediaPeriod source) { }
// Do nothing. },
} positionUs);
}, prepareCalled.open();
positionUs);
prepareCalled.open();
}
}); });
prepareCalled.block(); prepareCalled.block();
return preparedCountDown; return preparedCountDown;
...@@ -208,13 +193,7 @@ public class MediaSourceTestRunner { ...@@ -208,13 +193,7 @@ public class MediaSourceTestRunner {
* @param mediaPeriod The {@link MediaPeriod} to release. * @param mediaPeriod The {@link MediaPeriod} to release.
*/ */
public void releasePeriod(final MediaPeriod mediaPeriod) { public void releasePeriod(final MediaPeriod mediaPeriod) {
runOnPlaybackThread( runOnPlaybackThread(() -> mediaSource.releasePeriod(mediaPeriod));
new Runnable() {
@Override
public void run() {
mediaSource.releasePeriod(mediaPeriod);
}
});
} }
/** /**
...@@ -222,13 +201,7 @@ public class MediaSourceTestRunner { ...@@ -222,13 +201,7 @@ public class MediaSourceTestRunner {
* thread. * thread.
*/ */
public void releaseSource() { public void releaseSource() {
runOnPlaybackThread( runOnPlaybackThread(() -> mediaSource.releaseSource(mediaSourceListener));
new Runnable() {
@Override
public void run() {
mediaSource.releaseSource(mediaSourceListener);
}
});
} }
/** /**
......
testutils_robolectric/src/main/java/com/google/android/exoplayer2/testutil/TestDownloadManagerListener.java
...@@ -81,12 +81,9 @@ public final class TestDownloadManagerListener implements DownloadManager.Listen ...@@ -81,12 +81,9 @@ public final class TestDownloadManagerListener implements DownloadManager.Listen
downloadFinishedCondition = new CountDownLatch(1); downloadFinishedCondition = new CountDownLatch(1);
} }
dummyMainThread.runOnMainThread( dummyMainThread.runOnMainThread(
new Runnable() { () -> {
@Override if (downloadManager.isIdle()) {
public void run() { downloadFinishedCondition.countDown();
if (downloadManager.isIdle()) {
downloadFinishedCondition.countDown();
}
} }
}); });
assertThat(downloadFinishedCondition.await(TIMEOUT, TimeUnit.MILLISECONDS)).isTrue(); assertThat(downloadFinishedCondition.await(TIMEOUT, TimeUnit.MILLISECONDS)).isTrue();
......
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