Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

VEX-5798: Implement DRM L1 to L3 fallback #9

Merged
merged 13 commits into from
Oct 13, 2021
Merged

VEX-5798: Implement DRM L1 to L3 fallback #9

Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
ccaa23d
Fall back to L3 if L1 fails
armands-malejevs Oct 5, 2021
cfac688
Clean up
armands-malejevs Oct 5, 2021
efb4404
Fix missing semicolon
armands-malejevs Oct 5, 2021
6a67af7
Additional logging
armands-malejevs Oct 5, 2021
d201747
Properly re-init player on DRM failure
armands-malejevs Oct 5, 2021
265ffe7
Proper fallback handling
armands-malejevs Oct 5, 2021
e2f988e
Fix build issue
armands-malejevs Oct 5, 2021
c07664e
Fallback to L3 only on source error
armands-malejevs Oct 5, 2021
423c8d7
Remove fallback log
armands-malejevs Oct 8, 2021
182336a
Merge branch 'master' into drm/VEX-5798-drm-fallback
armands-malejevs Oct 12, 2021
200d07f
Update resume position before retrying DRM
armands-malejevs Oct 13, 2021
d12bc05
Improve error recovery
armands-malejevs Oct 13, 2021
678d8e5
Fix typo
armands-malejevs Oct 13, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 23 additions & 1 deletion android-exoplayer/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
import com.google.android.exoplayer2.DefaultLoadControl;
import com.google.android.exoplayer2.DefaultRenderersFactory;
import com.google.android.exoplayer2.ExoPlaybackException;
import com.google.android.exoplayer2.drm.MediaDrmCallbackException;
import com.google.android.exoplayer2.ExoPlayerFactory;
import com.google.android.exoplayer2.Format;
import com.google.android.exoplayer2.PlaybackParameters;
Expand Down Expand Up @@ -134,6 +135,7 @@ class ReactExoplayerView extends FrameLayout implements
private int minLoadRetryCount = 3;
private int maxBitRate = 0;
private long seekTime = C.TIME_UNSET;
private boolean hasDrmFailed = false;

private int minBufferMs = DefaultLoadControl.DEFAULT_MIN_BUFFER_MS;
private int maxBufferMs = DefaultLoadControl.DEFAULT_MAX_BUFFER_MS;
Expand Down Expand Up @@ -572,8 +574,13 @@ private DrmSessionManager buildDrmSessionManager(UUID uuid,
keyRequestPropertiesArray[i + 1]);
}
}
FrameworkMediaDrm mediaDrm = FrameworkMediaDrm.newInstance(uuid);
if (hasDrmFailed) {
// When DRM fails using L1 we want to switch to L3
mediaDrm.setPropertyString("securityLevel", "L3");
}
return new DefaultDrmSessionManager(uuid,
FrameworkMediaDrm.newInstance(uuid), drmCallback, null, false, 3);
mediaDrm, drmCallback, null, false, 3);
}

private MediaSource buildMediaSource(Uri uri, String overrideExtension, DrmSessionManager drmSessionManager) {
Expand Down Expand Up @@ -1029,6 +1036,7 @@ public void onPlaybackParametersChanged(PlaybackParameters params) {
public void onPlayerError(ExoPlaybackException e) {
String errorString = "ExoPlaybackException type : " + e.type;
String errorCode = "2001"; // Playback error code 2xxx (2001 - unknown playback exception)
boolean needsReInitialization = false;
Exception ex = e;
if (e.type == ExoPlaybackException.TYPE_RENDERER) {
Exception cause = e.getRendererException();
Expand Down Expand Up @@ -1057,6 +1065,9 @@ public void onPlayerError(ExoPlaybackException e) {
}
}
else if (e.type == ExoPlaybackException.TYPE_SOURCE) {
// Re-initialization improves recovery speed and properly resumes
needsReInitialization = true;
errorString = getResources().getString(R.string.unrecognized_media_format);
Exception cause = e.getSourceException();
if (cause instanceof DefaultDrmSessionManager.MissingSchemeDataException) {
errorCode = "3004";
Expand All @@ -1073,6 +1084,14 @@ else if (e.type == ExoPlaybackException.TYPE_SOURCE) {
if (rootCause instanceof MediaDrmCallbackException) {
errorCode = "3005";
errorString = getResources().getString(R.string.unrecognized_media_format);
if (!hasDrmFailed) {
// When DRM fails to reach the app level certificate server it will fail with a source error so we assume that it is DRM related and try one more time
hasDrmFailed = true;
playerNeedsSource = true;
updateResumePosition();
initializePlayer();
return;
}
}
}
}
Expand All @@ -1083,6 +1102,9 @@ else if (e.type == ExoPlaybackException.TYPE_SOURCE) {
initializePlayer();
} else {
updateResumePosition();
if (needsReInitialization) {
initializePlayer();
}
}
}

Expand Down