sjs/media
1
0
Fork 0
mirror of https://github.com/samsonjs/media.git synced 2026-04-27 15:07:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix preparation of media sources with empty timeline

Browse source 
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=182533415
This commit is contained in:
aquilescanta 2018-01-19 07:41:02 -08:00 committed by Oliver Woodman
parent cf27bc84e6
commit fe1e4fa1f2
2 changed files with 46 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
library/core/src/androidTest/java/com/google/android/exoplayer2/ExoPlayerTest.java
View file

@ -1399,7 +1399,7 @@ public final class ExoPlayerTest extends TestCase {
assertEquals(2, target3.windowIndex); assertEquals(2, target3.windowIndex);
} }
public void testSetAndSwitchSurfaceTest() throws Exception { public void testSetAndSwitchSurface() throws Exception {
final List<Integer> rendererMessages = new ArrayList<>(); final List<Integer> rendererMessages = new ArrayList<>();
Renderer videoRenderer = Renderer videoRenderer =
new FakeRenderer(Builder.VIDEO_FORMAT) { new FakeRenderer(Builder.VIDEO_FORMAT) {
@ -1409,25 +1409,8 @@ public final class ExoPlayerTest extends TestCase {
rendererMessages.add(what); rendererMessages.add(what);
} }
}; };
final Surface surface1 = DummySurface.newInstanceV17(/* context= */ null, /* secure= */ false);
final Surface surface2 = DummySurface.newInstanceV17(/* context= */ null, /* secure= */ false);
ActionSchedule actionSchedule = ActionSchedule actionSchedule =
new ActionSchedule.Builder("setAndSwitchSurfaceTest") addSurfaceSwitch(new ActionSchedule.Builder("testSetAndSwitchSurface")).build();
.executeRunnable(
new PlayerRunnable() {
@Override
public void run(SimpleExoPlayer player) {
player.setVideoSurface(surface1);
}
})
.executeRunnable(
new PlayerRunnable() {
@Override
public void run(SimpleExoPlayer player) {
player.setVideoSurface(surface2);
}
})
.build();
new ExoPlayerTestRunner.Builder() new ExoPlayerTestRunner.Builder()
.setRenderers(videoRenderer) .setRenderers(videoRenderer)
.setActionSchedule(actionSchedule) .setActionSchedule(actionSchedule)
@ -1438,6 +1421,44 @@ public final class ExoPlayerTest extends TestCase {
assertEquals(2, Collections.frequency(rendererMessages, C.MSG_SET_SURFACE)); assertEquals(2, Collections.frequency(rendererMessages, C.MSG_SET_SURFACE));
} }
public void testSwitchSurfaceOnEndedState() throws Exception {
ActionSchedule.Builder scheduleBuilder =
new ActionSchedule.Builder("testSwitchSurfaceOnEndedState")
.waitForPlaybackState(Player.STATE_ENDED);
ActionSchedule waitForEndedAndSwitchSchedule = addSurfaceSwitch(scheduleBuilder).build();
new ExoPlayerTestRunner.Builder()
.setTimeline(Timeline.EMPTY)
.setActionSchedule(waitForEndedAndSwitchSchedule)
.build()
.start()
.blockUntilActionScheduleFinished(TIMEOUT_MS)
.blockUntilEnded(TIMEOUT_MS);
}
// Internal methods.
private static ActionSchedule.Builder addSurfaceSwitch(ActionSchedule.Builder builder) {
final Surface surface1 = DummySurface.newInstanceV17(/* context= */ null, /* secure= */ false);
final Surface surface2 = DummySurface.newInstanceV17(/* context= */ null, /* secure= */ false);
return builder
.executeRunnable(
new PlayerRunnable() {
@Override
public void run(SimpleExoPlayer player) {
player.setVideoSurface(surface1);
}
})
.executeRunnable(
new PlayerRunnable() {
@Override
public void run(SimpleExoPlayer player) {
player.setVideoSurface(surface2);
}
});
}
// Internal classes.
private static final class PositionGrabbingMessageTarget extends PlayerTarget { private static final class PositionGrabbingMessageTarget extends PlayerTarget {
public int windowIndex; public int windowIndex;

9
library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java
View file

@ -881,8 +881,11 @@ import java.util.Collections;
private void sendCustomMessageToTarget(PlayerMessage message) { private void sendCustomMessageToTarget(PlayerMessage message) {
if (message.getHandler().getLooper() == handler.getLooper()) { if (message.getHandler().getLooper() == handler.getLooper()) {
deliverCustomMessage(message); deliverCustomMessage(message);
// The message may have caused something to change that now requires us to do work. if (playbackInfo.playbackState == Player.STATE_READY
handler.sendEmptyMessage(MSG_DO_SOME_WORK); || playbackInfo.playbackState == Player.STATE_BUFFERING) {
// The message may have caused something to change that now requires us to do work.
handler.sendEmptyMessage(MSG_DO_SOME_WORK);
}
} else { } else {
handler.obtainMessage(MSG_SEND_MESSAGE_TO_TARGET, message).sendToTarget(); handler.obtainMessage(MSG_SEND_MESSAGE_TO_TARGET, message).sendToTarget();
} }
@ -1413,7 +1416,7 @@ import java.util.Collections;
MediaPeriodHolder loadingPeriodHolder = queue.getLoadingPeriod(); MediaPeriodHolder loadingPeriodHolder = queue.getLoadingPeriod();
if (loadingPeriodHolder == null || loadingPeriodHolder.isFullyBuffered()) { if (loadingPeriodHolder == null || loadingPeriodHolder.isFullyBuffered()) {
setIsLoading(false); setIsLoading(false);
} else if (loadingPeriodHolder != null && !playbackInfo.isLoading) { } else if (!playbackInfo.isLoading) {
maybeContinueLoading(); maybeContinueLoading();
} }