This repository has been archived by the owner on Feb 11, 2022. It is now read-only.
ALL-3936/Player Builder #57
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| package com.novoda.noplayer.player; | ||
|
|
||
| import android.content.Context; | ||
|
|
||
| import com.novoda.noplayer.Player; | ||
| import com.novoda.noplayer.drm.DrmHandler; | ||
| import com.novoda.noplayer.drm.DrmType; | ||
| import com.novoda.noplayer.exoplayer.NoPlayerExoPlayerCreator; | ||
| import com.novoda.noplayer.exoplayer.drm.DrmSessionCreator; | ||
| import com.novoda.noplayer.exoplayer.drm.DrmSessionCreatorFactory; | ||
| import com.novoda.noplayer.mediaplayer.NoPlayerMediaPlayerCreator; | ||
|
|
||
| class NoPlayerCreator { | ||
|
There was a problem hiding this comment. This is the old |
||
|
|
||
| private final Context context; | ||
| private final PrioritizedPlayerTypes prioritizedPlayerTypes; | ||
| private final NoPlayerExoPlayerCreator noPlayerExoPlayerCreator; | ||
| private final NoPlayerMediaPlayerCreator noPlayerMediaPlayerCreator; | ||
| private final DrmSessionCreatorFactory drmSessionCreatorFactory; | ||
|
|
||
| NoPlayerCreator(Context context, | ||
| PrioritizedPlayerTypes prioritizedPlayerTypes, | ||
| NoPlayerExoPlayerCreator noPlayerExoPlayerCreator, | ||
| NoPlayerMediaPlayerCreator noPlayerMediaPlayerCreator, | ||
| DrmSessionCreatorFactory drmSessionCreatorFactory) { | ||
| this.context = context; | ||
| this.prioritizedPlayerTypes = prioritizedPlayerTypes; | ||
| this.noPlayerExoPlayerCreator = noPlayerExoPlayerCreator; | ||
| this.noPlayerMediaPlayerCreator = noPlayerMediaPlayerCreator; | ||
| this.drmSessionCreatorFactory = drmSessionCreatorFactory; | ||
| } | ||
|
|
||
| Player create(DrmType drmType, DrmHandler drmHandler, boolean downgradeSecureDecoder) { | ||
| for (PlayerType player : prioritizedPlayerTypes) { | ||
| if (player.supports(drmType)) { | ||
| return createPlayerForType(player, drmType, drmHandler, downgradeSecureDecoder); | ||
| } | ||
| } | ||
| throw UnableToCreatePlayerException.unhandledDrmType(drmType); | ||
| } | ||
|
|
||
| private Player createPlayerForType(PlayerType playerType, DrmType drmType, DrmHandler drmHandler, boolean downgradeSecureDecoder) { | ||
| switch (playerType) { | ||
| case MEDIA_PLAYER: | ||
| return noPlayerMediaPlayerCreator.createMediaPlayer(context); | ||
| case EXO_PLAYER: | ||
| DrmSessionCreator drmSessionCreator = drmSessionCreatorFactory.createFor(drmType, drmHandler); | ||
| return noPlayerExoPlayerCreator.createExoPlayer(context, drmSessionCreator, downgradeSecureDecoder); | ||
| default: | ||
| throw UnableToCreatePlayerException.unhandledPlayerType(playerType); | ||
| } | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,71 @@ | ||
| package com.novoda.noplayer.player; | ||
|
|
||
| import android.content.Context; | ||
| import android.os.Handler; | ||
| import android.os.Looper; | ||
|
|
||
| import com.novoda.noplayer.Player; | ||
| import com.novoda.noplayer.drm.DownloadedModularDrm; | ||
| import com.novoda.noplayer.drm.DrmHandler; | ||
| import com.novoda.noplayer.drm.DrmType; | ||
| import com.novoda.noplayer.drm.StreamingModularDrm; | ||
| import com.novoda.noplayer.exoplayer.NoPlayerExoPlayerCreator; | ||
| import com.novoda.noplayer.exoplayer.drm.DrmSessionCreatorFactory; | ||
| import com.novoda.noplayer.mediaplayer.NoPlayerMediaPlayerCreator; | ||
| import com.novoda.utils.AndroidDeviceVersion; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.Arrays; | ||
| import java.util.List; | ||
|
|
||
| public class PlayerBuilder { | ||
|
|
||
|
|
||
| private DrmType drmType = DrmType.NONE; | ||
| private DrmHandler drmHandler = DrmHandler.NO_DRM; | ||
| private PrioritizedPlayerTypes prioritizedPlayerTypes = PrioritizedPlayerTypes.prioritizeExoPlayer(); | ||
| private boolean downgradeSecureDecoder = false; | ||
|
|
||
| public PlayerBuilder withWidevineClassicDrm() { | ||
| return withDrm(DrmType.WIDEVINE_CLASSIC, DrmHandler.NO_DRM); | ||
| } | ||
|
|
||
| public PlayerBuilder withWidevineModularStreamingDrm(StreamingModularDrm streamingModularDrm) { | ||
| return withDrm(DrmType.WIDEVINE_MODULAR_STREAM, streamingModularDrm); | ||
| } | ||
|
|
||
| public PlayerBuilder withWidevineModularDownloadDrm(DownloadedModularDrm downloadedModularDrm) { | ||
| return withDrm(DrmType.WIDEVINE_MODULAR_DOWNLOAD, downloadedModularDrm); | ||
| } | ||
|
|
||
| public PlayerBuilder withDrm(DrmType drmType, DrmHandler drmHandler) { | ||
| this.drmType = drmType; | ||
| this.drmHandler = drmHandler; | ||
| return this; | ||
| } | ||
|
|
||
| public PlayerBuilder withPriority(PlayerType playerType, PlayerType... playerTypes) { | ||
| List<PlayerType> types = new ArrayList<>(); | ||
| types.add(playerType); | ||
| types.addAll(Arrays.asList(playerTypes)); | ||
| prioritizedPlayerTypes = new PrioritizedPlayerTypes(types); | ||
| return this; | ||
| } | ||
|
|
||
| public PlayerBuilder withDowngradedSecureDecoder() { | ||
|
|
||
| downgradeSecureDecoder = true; | ||
| return this; | ||
| } | ||
|
|
||
| public Player build(Context context) { | ||
|
There was a problem hiding this comment. as a user of the library I can still use Is this intentional? There was a problem hiding this comment. I don't see how to avoid this without flattening all the packages 😢 There was a problem hiding this comment. 😢 I have taken a look and I don't see either There was a problem hiding this comment. Can There was a problem hiding this comment.
I don't think it's problem or enough of a reason to flatten the entire library. There's no issue or side effects of a client creating a single player directly via the public player creators, if anything it's an architectural feature. The There was a problem hiding this comment. It's the There was a problem hiding this comment. Agreed offline, we'll expose these creators as part of the public API |
||
| Handler handler = new Handler(Looper.getMainLooper()); | ||
| DrmSessionCreatorFactory drmSessionCreatorFactory = new DrmSessionCreatorFactory(AndroidDeviceVersion.newInstance(), handler); | ||
| NoPlayerCreator noPlayerCreator = new NoPlayerCreator( | ||
| context, | ||
| prioritizedPlayerTypes, | ||
| NoPlayerExoPlayerCreator.newInstance(handler), | ||
| NoPlayerMediaPlayerCreator.newInstance(handler), | ||
| drmSessionCreatorFactory | ||
| ); | ||
| return noPlayerCreator.create(drmType, drmHandler, downgradeSecureDecoder); | ||
| } | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
boolean downgradeSecureDecoderis transformed into the associatedMediaCodecSelector.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@joetimmins the boolean now lives on
PlayerBuilder->NoPlayerCreatorand finally here where it gets converted to the codec selector