Chore(android): refactor drm props #3846
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,66 @@ | ||
| package com.brentvatne.common.api | ||
|
|
||
| import com.brentvatne.common.toolbox.ReactBridgeUtils.safeGetArray | ||
| import com.brentvatne.common.toolbox.ReactBridgeUtils.safeGetString | ||
| import com.facebook.react.bridge.ReadableMap | ||
| import java.util.UUID | ||
|
|
||
| /** | ||
| * Class representing DRM props for host. | ||
| * Only generic code here, no reference to the player. | ||
| */ | ||
| class DRMProps { | ||
| /** | ||
| * string version of configured UUID for drm prop | ||
| */ | ||
| var drmType: String? = null | ||
|
|
||
| /** | ||
| * Configured UUID for drm prop | ||
| */ | ||
| var drmUUID: UUID? = null | ||
|
|
||
| /** | ||
| * DRM license server to be used | ||
| */ | ||
| var drmLicenseServer: String? = null | ||
|
|
||
| /** | ||
| * DRM Http Header to access to license server | ||
| */ | ||
| var drmLicenseHeader: Array<String> = emptyArray<String>() | ||
| companion object { | ||
| private const val PROP_DRM_TYPE = "type" | ||
| private const val PROP_DRM_LICENSE_SERVER = "licenseServer" | ||
| private const val PROP_DRM_HEADERS = "headers" | ||
| private const val PROP_DRM_HEADERS_KEY = "key" | ||
| private const val PROP_DRM_HEADERS_VALUE = "value" | ||
|
|
||
| /** parse the source ReadableMap received from app */ | ||
| @JvmStatic | ||
| fun parse(src: ReadableMap?): DRMProps? { | ||
| var drm: DRMProps? = null | ||
| if (src != null && src.hasKey(PROP_DRM_TYPE)) { | ||
| drm = DRMProps() | ||
| drm.drmType = safeGetString(src, PROP_DRM_TYPE) | ||
| drm.drmLicenseServer = safeGetString(src, PROP_DRM_LICENSE_SERVER) | ||
| val drmHeadersArray = safeGetArray(src, PROP_DRM_HEADERS) | ||
| if (drm.drmType != null && drm.drmLicenseServer != null) { | ||
| if (drmHeadersArray != null) { | ||
| val drmKeyRequestPropertiesList = ArrayList<String?>() | ||
| for (i in 0 until drmHeadersArray.size()) { | ||
| val current = drmHeadersArray.getMap(i) | ||
| drmKeyRequestPropertiesList.add(safeGetString(current, PROP_DRM_HEADERS_KEY)) | ||
| drmKeyRequestPropertiesList.add(safeGetString(current, PROP_DRM_HEADERS_VALUE)) | ||
| } | ||
| val array = emptyArray<String>() | ||
| drm.drmLicenseHeader = drmKeyRequestPropertiesList.toArray(array) | ||
| } | ||
| } else { | ||
| return null | ||
| } | ||
| } | ||
| return drm | ||
| } | ||
| } | ||
| } |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -12,6 +12,7 @@ | |
| import com.brentvatne.common.api.BufferConfig; | ||
| import com.brentvatne.common.api.BufferingStrategy; | ||
| import com.brentvatne.common.api.ControlsConfig; | ||
| import com.brentvatne.common.api.DRMProps; | ||
| import com.brentvatne.common.api.ResizeMode; | ||
| import com.brentvatne.common.api.SideLoadedTextTrackList; | ||
| import com.brentvatne.common.api.Source; | ||
|
|
@@ -39,9 +40,7 @@ public class ReactExoplayerViewManager extends ViewGroupManager<ReactExoplayerVi | |
| private static final String PROP_SRC = "src"; | ||
| private static final String PROP_AD_TAG_URL = "adTagUrl"; | ||
| private static final String PROP_DRM = "drm"; | ||
| private static final String PROP_SRC_HEADERS = "requestHeaders"; | ||
| private static final String PROP_RESIZE_MODE = "resizeMode"; | ||
| private static final String PROP_REPEAT = "repeat"; | ||
| private static final String PROP_SELECTED_AUDIO_TRACK = "selectedAudioTrack"; | ||
|
|
@@ -117,28 +116,9 @@ public void onDropViewInstance(ReactExoplayerView view) { | |
|
|
||
| @ReactProp(name = PROP_DRM) | ||
| public void setDRM(final ReactExoplayerView videoView, @Nullable ReadableMap drm) { | ||
| DRMProps drmProps = DRMProps.parse(drm); | ||
| videoView.setDrm(drmProps); | ||
| videoView.setUseTextureView(false); | ||
|
There was a problem hiding this comment. if drm props is null, we have to follow injected prop (useSecureView or useTextureView) There was a problem hiding this comment. Yes you are right, thank you. I am also wondering if it can make sense to use Surface View by default? What is your opinion? There was a problem hiding this comment. It's hard question. because it depends on what user using this library for Decision is yours🫡 There was a problem hiding this comment. I am working to remove this videoView.setUseTextureView(false); I would prefer implement it in another way:
I will try to implement it, but I think we can merge this part now, and the next fix will come soon ! I propose to merge this PR as the setUseTextureView is already present in the code ! There was a problem hiding this comment. @YangJonghun here is The patch I would to do for ensure we correctly reset the view state in the app: There was a problem hiding this comment. I apologize for late response. |
||
| } | ||
|
|
||
| @ReactProp(name = PROP_SRC) | ||
|
|
||
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.
I think above code could be moved inside the DrmProps.parse fn.
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.
I agree, but my problem with that is that I will have to import Utils from media3 in drmProp.kt. I really want to avoid including player specific code in the utils / data management classes ...
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.
I understand. but for that reason, it seems like parse function should be categorized in a different class. (for example, DRMUtils)
And I think removing dependencies from Utils seems hard to avoid because there's so much to prepare to implement as the SDK requires.🥲
If you worried deep dependencies, I recommend copying media3's implementation.
However, I'm not suggesting this because I think it's a serious issue, so you don't have to fix it.