Merge branch 'master' into feat/capture-method

.github/actions/setup-node/action.yml

@@ -20,12 +20,12 @@ runs:
       uses: actions/cache@v3
       with:
         path: |
-          **/node_modules
+          ${{ inputs.working-directory }}/node_modules
           .yarn/install-state.gz
-        key: ${{ runner.os }}-yarn-${{ hashFiles('yarn.lock') }}-${{ hashFiles('**/package.json', '!node_modules/**') }}
+        key: ${{ runner.os }}-yarn-${{ inputs.working-directory }}-${{ hashFiles('yarn.lock') }}-${{ hashFiles('**/package.json', '!node_modules/**') }}
         restore-keys: |
-          ${{ runner.os }}-yarn-${{ hashFiles('yarn.lock') }}
-          ${{ runner.os }}-yarn-
+          ${{ runner.os }}-yarn-${{ inputs.working-directory }}-${{ hashFiles('yarn.lock') }}-
+          ${{ runner.os }}-yarn-${{ inputs.working-directory }}
     - name: Install dependencies
       working-directory: ${{ inputs.working-directory }}
       if: steps.yarn-cache.outputs.cache-hit != 'true'

.github/workflows/test-build-docs.yml

@@ -1,5 +1,5 @@
 
-name: test build docs
+name: Test Docs build
 on:
   workflow_dispatch:
   pull_request:
@@ -8,7 +8,7 @@ on:
       - 'docs/**'
 
 jobs:
-  deploy-docs:
+  build-docs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout

CHANGELOG.md

@@ -1,5 +1,36 @@
 
 
+# [6.0.0-beta.6](https://github.com/react-native-video/react-native-video/compare/v6.0.0-beta.5...v6.0.0-beta.6) (2024-03-18)
+
+
+### Bug Fixes
+
+* add missing node_modules paths to metro.config.js of basic example app ([#3555](https://github.com/react-native-video/react-native-video/issues/3555)) ([d505de5](https://github.com/react-native-video/react-native-video/commit/d505de5910a22ab9a0d7429e6b88a81cd2594b9c))
+* add missing shutterColor type ([#3561](https://github.com/react-native-video/react-native-video/issues/3561)) ([ba00881](https://github.com/react-native-video/react-native-video/commit/ba00881ddcd53c2f5a4e1fc6e30cb5eb7ef674a3))
+* **android:** check disableFocus when state is ready ([#3494](https://github.com/react-native-video/react-native-video/issues/3494)) ([366c841](https://github.com/react-native-video/react-native-video/commit/366c841c0b960fd461ae7dcfdcb76a928fadf2b8))
+* **android:** enableDecoderFallback to decrease DECODER_ERROR issue ([#3416](https://github.com/react-native-video/react-native-video/issues/3416)) ([eaa72c6](https://github.com/react-native-video/react-native-video/commit/eaa72c66659b9e2a22af9ff9d43013521f6a66e3))
+* **android:** onSeek called instantly ([#3530](https://github.com/react-native-video/react-native-video/issues/3530)) ([af6aea8](https://github.com/react-native-video/react-native-video/commit/af6aea8934e19467e1ed8e21808b2dbddb6f6356))
+* **android:** suppress lint `PrivateResource` ([#3531](https://github.com/react-native-video/react-native-video/issues/3531)) ([38e3625](https://github.com/react-native-video/react-native-video/commit/38e3625541753340e912e474b753e0f4fac4e9c1))
+* **docs/ci:** add typescript ([#3572](https://github.com/react-native-video/react-native-video/issues/3572)) ([0f31271](https://github.com/react-native-video/react-native-video/commit/0f31271dcf2bfe2f4429e22040660025be8a6a3c))
+* **docs:** fix build ([#3571](https://github.com/react-native-video/react-native-video/issues/3571)) ([4fc7d27](https://github.com/react-native-video/react-native-video/commit/4fc7d2788b4d01c581a31cc3ac733c3948b65a3a))
+* **ios:** add text tracks only if we successfully insertTimeRage ([#3557](https://github.com/react-native-video/react-native-video/issues/3557)) ([b73baad](https://github.com/react-native-video/react-native-video/commit/b73baad2c2c0c6ea701d865eee32d4e94ae58178))
+* **ios:** apply `cropStart` when in repeat mode ([#3525](https://github.com/react-native-video/react-native-video/issues/3525)) ([2c0e009](https://github.com/react-native-video/react-native-video/commit/2c0e00987685875f9603ae2084ae23b3c1aebce7))
+* **ios:** current release volume change observer ([#3565](https://github.com/react-native-video/react-native-video/issues/3565)) ([16f3cdb](https://github.com/react-native-video/react-native-video/commit/16f3cdbd9a7864206feaeef29344c09792d66d56))
+* **ios:** Do not crash when accessLog return nil ([#3549](https://github.com/react-native-video/react-native-video/issues/3549)) ([4d4b56c](https://github.com/react-native-video/react-native-video/commit/4d4b56c05dd3c09fce5ddc38f56b0391c357ac85))
+* **ios:** don't crop video when in repeat mode ([#3575](https://github.com/react-native-video/react-native-video/issues/3575)) ([90b31af](https://github.com/react-native-video/react-native-video/commit/90b31af2c969b6d6d57877c71ef3a4830a76aedc))
+* **ios:** ensure playback stopped in background ([#3587](https://github.com/react-native-video/react-native-video/issues/3587)) ([41c6785](https://github.com/react-native-video/react-native-video/commit/41c6785ee8c667ebe9c6c464223f6485473d94f8))
+* **ios:** fix missing bridge in bridgeless mode ([#3570](https://github.com/react-native-video/react-native-video/issues/3570)) ([46c8c49](https://github.com/react-native-video/react-native-video/commit/46c8c498c474600a0b35ebaf744306aefa42905f))
+* **ios:** fix tvOS build ([#3524](https://github.com/react-native-video/react-native-video/issues/3524)) ([9306d9a](https://github.com/react-native-video/react-native-video/commit/9306d9a15d281a60492f6d4166598a389a56f652))
+* **ios:** split licenseUrl and loadedLicenseUrl ([#3578](https://github.com/react-native-video/react-native-video/issues/3578)) ([7c4d19f](https://github.com/react-native-video/react-native-video/commit/7c4d19fa72a35449dd11ec59278b2ea11ec629fc))
+
+
+### Features
+
+* **android:** add subtitle event ([#3566](https://github.com/react-native-video/react-native-video/issues/3566)) ([6184c10](https://github.com/react-native-video/react-native-video/commit/6184c10acc90defd63cd55af51458864dfe112d5))
+* implement opacity to control visibility of subtitles ([#3583](https://github.com/react-native-video/react-native-video/issues/3583)) ([f4cce2e](https://github.com/react-native-video/react-native-video/commit/f4cce2ecdba0668c3ecf74d2fd7956df4dd8489d))
+* **ios:** Add ios support for accessing WebVTT Subtitle Content  ([#3541](https://github.com/react-native-video/react-native-video/issues/3541)) ([253ffb5](https://github.com/react-native-video/react-native-video/commit/253ffb595633a4b18221339278f73c8416225f56))
+* move require (local files) to `source.uri` ([#3535](https://github.com/react-native-video/react-native-video/issues/3535)) ([41ac781](https://github.com/react-native-video/react-native-video/commit/41ac7814121fc70a123fa4585dc9b1bd96e9629f))
+
 # [6.0.0-beta.5](https://github.com/react-native-video/react-native-video/compare/v6.0.0-beta.4...v6.0.0-beta.5) (2024-02-02)
 
 

android/src/main/java/com/brentvatne/common/api/SubtitleStyle.kt

@@ -17,13 +17,16 @@ class SubtitleStyle private constructor() {
         private set
     var paddingBottom = 0
         private set
+    var opacity = 1f
+        private set
 
     companion object {
         private const val PROP_FONT_SIZE_TRACK = "fontSize"
         private const val PROP_PADDING_BOTTOM = "paddingBottom"
         private const val PROP_PADDING_TOP = "paddingTop"
         private const val PROP_PADDING_LEFT = "paddingLeft"
         private const val PROP_PADDING_RIGHT = "paddingRight"
+        private const val PROP_OPACITY = "opacity"
 
         @JvmStatic
         fun parse(src: ReadableMap?): SubtitleStyle {
@@ -33,6 +36,7 @@ class SubtitleStyle private constructor() {
             subtitleStyle.paddingTop = ReactBridgeUtils.safeGetInt(src, PROP_PADDING_TOP, 0)
             subtitleStyle.paddingLeft = ReactBridgeUtils.safeGetInt(src, PROP_PADDING_LEFT, 0)
             subtitleStyle.paddingRight = ReactBridgeUtils.safeGetInt(src, PROP_PADDING_RIGHT, 0)
+            subtitleStyle.opacity = ReactBridgeUtils.safeGetFloat(src, PROP_OPACITY, 1f)
             return subtitleStyle
         }
     }

android/src/main/java/com/brentvatne/common/react/VideoEventEmitter.java

@@ -59,6 +59,8 @@ public VideoEventEmitter(ReactContext reactContext) {
     private static final String EVENT_VOLUME_CHANGE = "onVolumeChange";
     private static final String EVENT_AUDIO_TRACKS = "onAudioTracks";
     private static final String EVENT_TEXT_TRACKS = "onTextTracks";
+
+    private static final String EVENT_TEXT_TRACK_DATA_CHANGED = "onTextTrackDataChanged";
     private static final String EVENT_VIDEO_TRACKS = "onVideoTracks";
     private static final String EVENT_ON_RECEIVE_AD_EVENT = "onReceiveAdEvent";
 
@@ -86,6 +88,7 @@ public VideoEventEmitter(ReactContext reactContext) {
             EVENT_VOLUME_CHANGE,
             EVENT_AUDIO_TRACKS,
             EVENT_TEXT_TRACKS,
+            EVENT_TEXT_TRACK_DATA_CHANGED,
             EVENT_VIDEO_TRACKS,
             EVENT_BANDWIDTH,
             EVENT_ON_RECEIVE_AD_EVENT
@@ -116,6 +119,7 @@ public VideoEventEmitter(ReactContext reactContext) {
             EVENT_VOLUME_CHANGE,
             EVENT_AUDIO_TRACKS,
             EVENT_TEXT_TRACKS,
+            EVENT_TEXT_TRACK_DATA_CHANGED,
             EVENT_VIDEO_TRACKS,
             EVENT_BANDWIDTH,
             EVENT_ON_RECEIVE_AD_EVENT
@@ -144,6 +148,7 @@ public VideoEventEmitter(ReactContext reactContext) {
     private static final String EVENT_PROP_VIDEO_TRACKS = "videoTracks";
     private static final String EVENT_PROP_AUDIO_TRACKS = "audioTracks";
     private static final String EVENT_PROP_TEXT_TRACKS = "textTracks";
+    private static final String EVENT_PROP_TEXT_TRACK_DATA = "subtitleTracks";
     private static final String EVENT_PROP_HAS_AUDIO_FOCUS = "hasAudioFocus";
     private static final String EVENT_PROP_IS_BUFFERING = "isBuffering";
     private static final String EVENT_PROP_PLAYBACK_RATE = "playbackRate";
@@ -284,6 +289,12 @@ public void textTracks(ArrayList<Track> textTracks){
         receiveEvent(EVENT_TEXT_TRACKS, arrayToObject(EVENT_PROP_TEXT_TRACKS, textTracksToArray(textTracks)));
     }
 
+    public void textTrackDataChanged(String textTrackData){
+        WritableMap event = Arguments.createMap();
+        event.putString(EVENT_PROP_TEXT_TRACK_DATA, textTrackData);
+        receiveEvent(EVENT_TEXT_TRACK_DATA_CHANGED, event);
+    }
+
     public void videoTracks(ArrayList<VideoTrack> videoTracks){
         receiveEvent(EVENT_VIDEO_TRACKS, arrayToObject(EVENT_PROP_VIDEO_TRACKS, videoTracksToArray(videoTracks)));
     }

android/src/main/java/com/brentvatne/common/toolbox/ReactBridgeUtils.kt

@@ -66,6 +66,14 @@ object ReactBridgeUtils {
         return safeGetDouble(map, key, 0.0)
     }
 
+    @JvmStatic fun safeGetFloat(map: ReadableMap?, key: String?, fallback: Float): Float {
+        return if (map != null && map.hasKey(key!!) && !map.isNull(key)) map.getDouble(key).toFloat() else fallback
+    }
+
+    @JvmStatic fun safeGetFloat(map: ReadableMap?, key: String?): Float {
+        return safeGetFloat(map, key, 0.0f)
+    }
+
     /**
      * toStringMap converts a [ReadableMap] into a HashMap.
      *

android/src/main/java/com/brentvatne/exoplayer/ExoPlayerView.java

@@ -117,6 +117,13 @@ public void setSubtitleStyle(SubtitleStyle style) {
             subtitleLayout.setFixedTextSize(TypedValue.COMPLEX_UNIT_SP, style.getFontSize());
         }
         subtitleLayout.setPadding(style.getPaddingLeft(), style.getPaddingTop(), style.getPaddingRight(), style.getPaddingBottom());
+        if (style.getOpacity() != 0) {
+            subtitleLayout.setAlpha(style.getOpacity());
+            subtitleLayout.setVisibility(View.VISIBLE);
+        } else {
+            subtitleLayout.setVisibility(View.GONE);
+        }
+
     }
 
     public void setShutterColor(Integer color) {

android/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java

@@ -41,6 +41,7 @@
 import androidx.media3.common.TrackGroup;
 import androidx.media3.common.TrackSelectionOverride;
 import androidx.media3.common.Tracks;
+import androidx.media3.common.text.CueGroup;
 import androidx.media3.common.util.Util;
 import androidx.media3.datasource.DataSource;
 import androidx.media3.datasource.DataSpec;
@@ -626,7 +627,8 @@ private void initializePlayerCore(ReactExoplayerView self) {
         );
         DefaultRenderersFactory renderersFactory =
                 new DefaultRenderersFactory(getContext())
-                        .setExtensionRendererMode(DefaultRenderersFactory.EXTENSION_RENDERER_MODE_OFF);
+                        .setExtensionRendererMode(DefaultRenderersFactory.EXTENSION_RENDERER_MODE_OFF)
+                        .setEnableDecoderFallback(true);
 
         // Create an AdsLoader.
         adsLoader = new ImaAdsLoader
@@ -1521,6 +1523,13 @@ public void onMetadata(@NonNull Metadata metadata) {
         eventEmitter.timedMetadata(metadataArray);
     }
 
+    public void onCues(CueGroup cueGroup) {
+        if (!cueGroup.cues.isEmpty() && cueGroup.cues.get(0).text != null) {
+            String subtitleText = cueGroup.cues.get(0).text.toString();
+            eventEmitter.textTrackDataChanged(subtitleText);
+        }
+    }
+
     // ReactExoplayerViewManager public api
 
     public void setSrc(final Uri uri, final long startPositionMs, final long cropStartMs, final long cropEndMs, final String extension, Map<String, String> headers) {

docs/pages/component/drm.mdx

@@ -43,14 +43,18 @@ Rather than setting the `licenseServer` url to get the license, you can manually
 your `contentId` + the provided certificate via `objc [loadingRequest streamingContentKeyRequestDataForApp:certificateData
 contentIdentifier:contentIdData options:nil error:&spcError]; `
 
-Also, you will receive the `contentId` and a `licenseUrl` URL defined as `loadingRequest.request.URL.absoluteString ` or as the `licenseServer` prop if it's passed.
+Also, you will receive following parameter of getLicense:
+* `contentId` contentId if passed to `drm` object or loadingRequest.request.url?.host 
+* `loadedLicenseUrl` URL defined as `loadingRequest.request.URL.absoluteString`, this url starts with `skd://` or `clearkey://` 
+* `licenseServer` prop if prop is passed to `drm` object.
+* `spcString` the SPC used to validate playback with drm server
 
 You should return on this method a `CKC` in Base64, either by just returning it or returning a `Promise` that resolves with the `CKC`.
 
 With this prop you can override the license acquisition flow, as an example:
 
 ```js
-getLicense: (spcString, contentId, licenseUrl) => {
+getLicense: (spcString, contentId, licenseUrl, loadedLicenseUrl) => {
   const base64spc = Base64.encode(spcString);
   const formData = new FormData();
   formData.append('spc', base64spc);

docs/pages/component/events.mdx

@@ -516,7 +516,7 @@ Example:
 
 ### `onTextTrackDataChanged`
 
-<PlatformsList types={['iOS']} />
+<PlatformsList types={['Android', 'iOS']} />
 
 Callback function that is called when new subtitle data is available. It provides the actual subtitle content for the current selected text track, if available (mainly WebVTT).
 
@@ -534,6 +534,8 @@ Example:
 }
 ```
 
+For details on how to control the visibility of subtitles, see the [subtitleStyle](./props.mdx#subtitleStyle) section.
+
 ### `onVideoTracks`
 
 <PlatformsList types={['Android']} />

docs/pages/component/props.mdx

@@ -622,12 +622,21 @@ The docs for this prop are incomplete and will be updated as each option is inve
 
 Example:
 
+Pass directly the asset to play (deprecated)
+
 ```javascript
 const sintel = require('./sintel.mp4');
+source={ sintel };
+```
+
+Or by using an uri (starting from 6.0.0-beta.6)
 
-source = {sintel};
+```javascript
+const sintel = require('./sintel.mp4');
+source={{ uri: sintel }}
 ```
 
+
 #### URI string
 
 A number of URI schemes are supported by passing an object with a `uri` attribute.
@@ -739,11 +748,12 @@ source={{
 | paddingBottom | Adjust the bottom padding of the subtitles. Default: 0                  | Android   |
 | paddingLeft   | Adjust the left padding of the subtitles. Default: 0                    | Android   |
 | paddingRight  | Adjust the right padding of the subtitles. Default: 0                   | Android   |
+| opacity | Adjust the visibility of subtitles with 0 hiding and 1 fully showing them. Android supports float values between 0 and 1 for varying opacity levels, whereas iOS supports only 0 or 1. Default: 1. | Android, iOS |
 
 Example:
 
 ```javascript
-subtitleStyle={{ paddingBottom: 50, fontSize: 20 }}
+subtitleStyle={{ paddingBottom: 50, fontSize: 20, opacity: 0 }}
 ```
 
 ### `textTracks`

examples/basic/ios/Podfile.lock

@@ -1368,7 +1368,7 @@ SPEC CHECKSUMS:
   PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47
   PromisesSwift: 9d77319bbe72ebf6d872900551f7eeba9bce2851
   RCT-Folly: 045d6ecaa59d826c5736dfba0b2f4083ff8d79df
-  RCTDeprecation: 6cc9677aab2e9af79e75f2eeea9be22adbc657d9
+  RCTDeprecation: a6392cb4842ae80e6f13ea460517170be529c301
   RCTRequired: 1c308285f5125d3e65fd864d1ffbd51c84f19be0
   RCTTypeSafety: c66cf0ffe89d4c3a6f74c38a8b1396d9a06bd5f2
   React: 525ec60174ace50c7cc60fe92982e580b0b26cfb
@@ -1397,9 +1397,9 @@ SPEC CHECKSUMS:
   React-perflogger: bc4cdc9440a5ba3b462813447a5a6633010b1cc8
   React-RCTActionSheet: 8b27811da488f196167ca1756453cc1feacbed8f
   React-RCTAnimation: aba9dcc5c6c0213cd1e747076300261aa8d23845
-  React-RCTAppDelegate: bf765fc52328ba350794f1ca16d48e757278d2aa
+  React-RCTAppDelegate: f8d6afca137f95bac028b631c89c9648ae2e864d
   React-RCTBlob: 843bb240adc3bc28cf8893a5fad4b4d41c0b89ad
-  React-RCTFabric: e79eaae738addada21b4b728fd77f95a3255c2af
+  React-RCTFabric: 176ba2d8c621a38090b7759eafc046e8f76d081f
   React-RCTImage: 67ea59e43e222cde321675e49416e21b5adc52e6
   React-RCTLinking: 73f14ccf9ce161d5f7b61c4d18eb01876897fe17
   React-RCTNetwork: 157786ee39743278756977b8161631646bcf9770
@@ -1421,4 +1421,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: bbe1bd5f521b6b9366288dbaf8af1cec85c0a95a
 
-COCOAPODS: 1.13.0
+COCOAPODS: 1.12.0