From 9104a6fa0e9367665f995ac35a78d4a0aed1d27e Mon Sep 17 00:00:00 2001 From: Brian Li Date: Tue, 27 Aug 2024 13:38:25 +1200 Subject: [PATCH 1/3] add hdcp level --- .../java/com/brentvatne/exoplayer/ReactExoplayerView.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/android/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java b/android/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java index 5e3d31eb2a..617617da3d 100644 --- a/android/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java +++ b/android/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java @@ -250,6 +250,7 @@ class ReactExoplayerView extends FrameLayout implements private long lastPos = -1; private long lastBufferDuration = -1; private long lastDuration = -1; + private int hdcp = 0; private final Handler progressHandler = new Handler(Looper.getMainLooper()) { @Override @@ -393,7 +394,7 @@ public void onBandwidthSample(int elapsedMs, long bytes, long bitrate) { int width = videoFormat != null ? videoFormat.width : 0; int height = videoFormat != null ? videoFormat.height : 0; String trackId = videoFormat != null ? videoFormat.id : "-1"; - eventEmitter.bandwidthReport(bitrate, height, width, trackId); + eventEmitter.bandwidthReport(bitrate, height, width, String.valueOf(hdcp)); } } } @@ -843,6 +844,9 @@ private DrmSessionManager buildDrmSessionManager(UUID uuid, String licenseUrl, S HttpMediaDrmCallback drmCallback = new HttpMediaDrmCallback(licenseUrl, buildHttpDataSourceFactory(false)); FrameworkMediaDrm mediaDrm = FrameworkMediaDrm.newInstance(uuid); + try (MediaDrm mediaDrmTemp = new MediaDrm(uuid)) { + hdcp = mediaDrmTemp.getConnectedHdcpLevel(); + } if (keyRequestPropertiesArray != null) { for (int i = 0; i < keyRequestPropertiesArray.length - 1; i += 2) { drmCallback.setKeyRequestProperty(keyRequestPropertiesArray[i], keyRequestPropertiesArray[i + 1]); From a0cb7b06c024021ed3b9259bcf5e12eeb40bbfc8 Mon Sep 17 00:00:00 2001 From: Brian Li Date: Tue, 27 Aug 2024 13:39:58 +1200 Subject: [PATCH 2/3] add media drm --- .../main/java/com/brentvatne/exoplayer/ReactExoplayerView.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/android/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java b/android/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java index 617617da3d..46b9122e3d 100644 --- a/android/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java +++ b/android/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java @@ -108,7 +108,7 @@ import com.npaw.youbora.lib6.exoplayer2.Exoplayer2Adapter; import com.npaw.youbora.lib6.plugin.Options; import com.npaw.youbora.lib6.plugin.Plugin; - +import android.media.MediaDrm; import java.io.IOException; import com.google.common.collect.ImmutableList; @@ -395,7 +395,6 @@ public void onBandwidthSample(int elapsedMs, long bytes, long bitrate) { int height = videoFormat != null ? videoFormat.height : 0; String trackId = videoFormat != null ? videoFormat.id : "-1"; eventEmitter.bandwidthReport(bitrate, height, width, String.valueOf(hdcp)); - } } } From 78e45014cca99f0ebf8c1a63323474f5c18ed77f Mon Sep 17 00:00:00 2001 From: Brian Li Date: Tue, 27 Aug 2024 13:44:41 +1200 Subject: [PATCH 3/3] update fix --- .../main/java/com/brentvatne/exoplayer/ReactExoplayerView.java | 1 + 1 file changed, 1 insertion(+) diff --git a/android/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java b/android/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java index 46b9122e3d..8c37621074 100644 --- a/android/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java +++ b/android/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java @@ -395,6 +395,7 @@ public void onBandwidthSample(int elapsedMs, long bytes, long bitrate) { int height = videoFormat != null ? videoFormat.height : 0; String trackId = videoFormat != null ? videoFormat.id : "-1"; eventEmitter.bandwidthReport(bitrate, height, width, String.valueOf(hdcp)); + } } }