Merge branch 'master' into fix/invalidSideLoadedTextTracks

TheWidlarzGroup · Sep 2, 2024 · 8d9b10c · 8d9b10c
2 parents dd62084 + 688d98d
commit 8d9b10c
Show file tree

Hide file tree

Showing 6 changed files with 355 additions and 582 deletions.
diff --git a/examples/basic/ios/Podfile.lock b/examples/basic/ios/Podfile.lock
@@ -994,7 +994,7 @@ PODS:
   - React-Mapbuffer (0.74.3):
     - glog
     - React-debug
-  - react-native-video (6.4.3):
+  - react-native-video (6.4.4):
     - DoubleConversion
     - glog
     - hermes-engine
@@ -1008,7 +1008,7 @@ PODS:
     - React-featureflags
     - React-graphics
     - React-ImageManager
-    - react-native-video/Video (= 6.4.3)
+    - react-native-video/Video (= 6.4.4)
     - React-NativeModulesApple
     - React-RCTFabric
     - React-rendererdebug
@@ -1038,7 +1038,7 @@ PODS:
     - ReactCommon/turbomodule/bridging
     - ReactCommon/turbomodule/core
     - Yoga
-  - react-native-video/Video (6.4.3):
+  - react-native-video/Video (6.4.4):
     - DoubleConversion
     - glog
     - hermes-engine
@@ -1559,7 +1559,7 @@ SPEC CHECKSUMS:
   React-jsitracing: 1aa5681c353b41573b03e0e480a5adf5fa1c56d8
   React-logger: fa92ba4d3a5d39ac450f59be2a3cec7b099f0304
   React-Mapbuffer: 70da5955150a58732e9336a0c7e71cd49e909f25
-  react-native-video: 3d5881ee6643a9a87e0e259b742c2d07aee7b27e
+  react-native-video: f57ea9a2df4675386f57f48494853a54bdba0d9f
   react-native-video-plugin-sample: d3a93b7ad777cad7fa2c30473de75a2635ce5feb
   React-nativeconfig: 84806b820491db30175afbf027e99e8415dc63f0
   React-NativeModulesApple: 7b79212f8cf496ab554e0b7b09acbd4aa4690260
@@ -1594,4 +1594,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: a73d485df51877001f2b04a5a4379cfa5a3ba8fa
 
-COCOAPODS: 1.13.0
+COCOAPODS: 1.15.2
diff --git a/examples/basic/package.json b/examples/basic/package.json
@@ -14,12 +14,12 @@
   },
   "dependencies": {
     "@react-native-picker/picker": "2.7.5",
-    "expo": "^51.0.17",
-    "expo-asset": "^10.0.9",
-    "expo-image": "^1.12.12",
+    "expo": "^51.0.31",
+    "expo-asset": "~10.0.10",
+    "expo-image": "^1.12.15",
     "react": "18.2.0",
-    "react-native": "0.74.3",
-    "react-native-windows": "0.74.1"
+    "react-native": "0.74.5",
+    "react-native-windows": "0.74.19"
   },
   "devDependencies": {
     "@babel/core": "^7.24.0",

diff --git a/examples/basic/src/constants/general.ts b/examples/basic/src/constants/general.ts
@@ -78,6 +78,11 @@ export const srcAllPlatformList = [
     uri: 'https://bitmovin-a.akamaihd.net/content/sintel/hls/playlist.m3u8',
     startPosition: 50000,
   },
+  {
+    description: 'mp3 with texttrack',
+    uri: 'https://traffic.libsyn.com/democracynow/wx2024-0702_SOT_DeadCalm-LucileSmith-FULL-V2.mxf-audio.mp3', // an mp3 file
+    textTracks: [], // empty text track list
+  },
   {
     description: 'BigBugBunny sideLoaded subtitles',
     // sideloaded subtitles wont work for streaming like HLS on ios