Merge remote-tracking branch 'upstream/master' into feature/implement…

…-codegen-types

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -0,0 +1,64 @@
+name: Bug report
+description: Create a report to help us improve
+title: "[BUG]: "
+labels: ["bug"]
+assignees: []
+body:
+  - type: markdown
+    attributes:
+      value: Thanks for taking the time to fill out this bug report!
+
+  - type: dropdown
+    id: version
+    attributes:
+      label: Version
+      description: What version are you using?
+      options:
+        - v6 (Beta)
+        - v5 (Stable)
+    validations:
+      required: true
+
+  - type: dropdown
+    id: platforms
+    attributes:
+      label: What platforms are you having the problem on?
+      multiple: true
+      options:
+        - iOS
+        - Android
+        - Windows
+        - visionOS
+        - Android TV
+        - Apple tvOS
+
+  - type: dropdown
+    id: architecture
+    attributes:
+      label: Architecture
+      description: What architecture are you using?
+      options:
+        - Old architecture
+        - New architecture with interop layer
+    validations:
+      required: true
+
+  - type: textarea
+    id: what-happened
+    attributes:
+      label: What happened?
+      description: Also tell us, what did you expect to happen?
+      placeholder: Tell us what you see!
+      value: "A bug happened!"
+    validations:
+      required: true
+
+  - type: textarea
+    id: reproduction
+    attributes:
+      label: Reproduction
+      description: Tell us how can we reproduce this bug
+      placeholder: Reproduction
+      value: "Step to reproduce this bug are: "
+    validations:
+      required: true

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,11 @@
+blank_issues_enabled: false
+contact_links:
+  - name: GitHub Discussions
+    url: https://github.com/react-native-video/react-native-video/discussions
+    about: Please ask and answer questions here.
+  - name: Slack Channel
+    url: https://join.slack.com/t/video-dev/shared_invite/zt-24kgmctuv-2z0O9J_v6q_rg~x1RujdOA
+    about: You can find us on the VideoDev Slack in the react-native-video channel.
+  - name: TheWidlarzGroup Discord
+    url: https://discord.gg/7Y6eE62hXM
+    about: Feel free to join our Discord server and ask questions there.

.github/ISSUE_TEMPLATE/feature-request.yml

@@ -0,0 +1,52 @@
+name: Feature request
+description: Suggest an idea for this project
+title: "[Feature]: "
+labels: ["feature"]
+assignees: []
+body:
+  - type: markdown
+    attributes:
+      value: Thanks for taking the time to fill out this feature report!
+
+  - type: textarea
+    id: description
+    attributes:
+      label: Description
+      description: Tell us your idea and why will concern if we implement it. You can also create a PR 😄
+      placeholder: Tell us your idea!
+      value: "Very cool idea!"
+    validations:
+      required: true
+
+  - type: textarea
+    id: why-it-is-needed
+    attributes:
+      label: Why it is needed ?
+      description: Tell us your why it is needed!
+      placeholder: Why it is needed ?
+      value: "Because it is cool!"
+    validations:
+      required: true
+
+  - type: textarea
+    id: possible-implementation
+    attributes:
+      label: Possible implementation
+      description: |
+        Tell us your possible implementation! It really helps if you could describe from a technical POV how this new feature would work, which code it rely on, etc
+      placeholder: How to implement ?
+      value: "Technical POV how to do it"
+    validations:
+      required: false
+
+  - type: textarea
+    id: code-sample
+    attributes:
+      label: Code sample
+      description: Please show how the new code could work, if doable
+      placeholder: Code sample
+      value: "Code sample"
+    validations:
+      required: false
+
+

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,20 +1,25 @@
+<!--
 Thanks for opening a PR!
 Since this is a volunteer project and is very active, anything you can do to reduce the amount of time needed to review and merge your PR is appreciated.
 The following steps will help get your PR merged quickly:
 
-#### Update the documentation
+- Update the documentation
 If you've added new functionality, update the README.md with an entry for your prop or event.
 The entry should be inserted in alphabetical order.
 
-#### Update the changelog
-After you open the PR, update the CHANGELOG.md file with an entry pointing to your PR.
-
-#### Provide an example of how to test the change
+- Provide an example of how to test the change
 If the PR requires special testing setup provide all the relevant instructions and files. This may include a sample video file or URL, configuration, or setup steps.
 
-#### Focus the PR on only one area
-Testing multiple features takes longer than isolated changes and if there is a bug in one feature, prevents the other parts of your PR from getting merged until it gets fixed.
+- Focus the PR on only one area
 If you're touching multiple different areas that aren't related, break the changes up into multiple PRs.
 
-#### Describe the changes
+- Describe the changes
 Add a note describing what your PR does. If there is a change to the behavior of the code, explain why it needs to be updated.
+-->
+## Summary
+
+### Motivation
+
+### Changes
+
+## Test plan

.github/workflows/build-ios.yml

@@ -1,9 +1,10 @@
 name: Build iOS
 
 on:
+  workflow_dispatch:
   push:
     branches:
-      - main
+      - master
     paths:
       - '.github/workflows/build-ios.yml'
       - 'ios/**'
@@ -19,7 +20,7 @@ on:
 jobs:
   build:
     name: Build iOS Example App
-    runs-on: macOS-latest
+    runs-on: macos-14 # This allow us to use Xcode 15.0.1 which is a lot faster - TODO change to "macos-latest" once it's out of beta
     defaults:
       run:
         working-directory: examples/basic/ios
@@ -62,13 +63,13 @@ jobs:
           -scheme videoplayer \
           -sdk iphonesimulator \
           -configuration Debug \
-          -destination 'platform=iOS Simulator,name=iPhone 11 Pro' \
+          -destination 'platform=iOS Simulator,name=iPhone 14' \
           build \
           CODE_SIGNING_ALLOWED=NO | xcpretty"
 
   build-with-ads:
     name: Build iOS Example App With Ads
-    runs-on: macOS-latest
+    runs-on: macos-14 # This allow us to use Xcode 15.0.1 which is a lot faster - TODO change to "macos-latest" once it's out of beta
     defaults:
       run:
         working-directory: examples/basic/ios
@@ -111,13 +112,13 @@ jobs:
           -scheme videoplayer \
           -sdk iphonesimulator \
           -configuration Debug \
-          -destination 'platform=iOS Simulator,name=iPhone 11 Pro' \
+          -destination 'platform=iOS Simulator,name=iPhone 14' \
           build \
           CODE_SIGNING_ALLOWED=NO | xcpretty"
 
   build-with-caching:
     name: Build iOS Example App With Caching
-    runs-on: macOS-latest
+    runs-on: macos-14 # This allow us to use Xcode 15.0.1 which is a lot faster - TODO change to "macos-latest" once it's out of beta
     defaults:
       run:
         working-directory: examples/basic/ios
@@ -160,6 +161,6 @@ jobs:
           -scheme videoplayer \
           -sdk iphonesimulator \
           -configuration Debug \
-          -destination 'platform=iOS Simulator,name=iPhone 11 Pro' \
+          -destination 'platform=iOS Simulator,name=iPhone 14' \
           build \
           CODE_SIGNING_ALLOWED=NO | xcpretty"

.github/workflows/check-ios.yml

@@ -24,7 +24,7 @@ jobs:
         env:
           WORKING_DIRECTORY: ios
   Swift-Format:
-    runs-on: macOS-latest
+    runs-on: macos-14 # This allow us to use Xcode 15.0.1 which is a lot faster - TODO change to "macos-latest" once it's out of beta
     defaults:
       run:
         working-directory: ./ios

CHANGELOG.md

@@ -1,3 +1,27 @@
+
+
+# [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)
+
+
+### Bug Fixes
+
+* **android:** fix crash with interop layer ([#3509](https://github.com/react-native-video/react-native-video/issues/3509)) ([41e9bcb](https://github.com/react-native-video/react-native-video/commit/41e9bcb1ef28c1532863186c83423814fcaf2372))
+* **android:** re-layout controls after fullscreen dismiss ([#3490](https://github.com/react-native-video/react-native-video/issues/3490)) ([135d97c](https://github.com/react-native-video/react-native-video/commit/135d97ce506bf1a0226042e0f29f4de5bcc10972))
+* fix typo ([#3497](https://github.com/react-native-video/react-native-video/issues/3497)) ([336eb44](https://github.com/react-native-video/react-native-video/commit/336eb44dc6061dad9cdc3382eb05d0a0effbef64))
+* **ios:** fix pip memory leak ([#3506](https://github.com/react-native-video/react-native-video/issues/3506)) ([53068dd](https://github.com/react-native-video/react-native-video/commit/53068ddd41218bb615cd129eba2c36d6347ccf25))
+* remove lifecycle listener after component unmount ([#3489](https://github.com/react-native-video/react-native-video/issues/3489)) ([3858a15](https://github.com/react-native-video/react-native-video/commit/3858a15b4268ae54d5b97c036d86b05aaf31bcf9)), closes [#3488](https://github.com/react-native-video/react-native-video/issues/3488)
+* remove pausePlayback when audio focus loss event ([#3496](https://github.com/react-native-video/react-native-video/issues/3496)) ([b1ab0f2](https://github.com/react-native-video/react-native-video/commit/b1ab0f24a3efbcc3be49005060f50b34a117664e))
+
+
+### Features
+
+* implement onAudioTracks and onTextTracks on ios ([#3503](https://github.com/react-native-video/react-native-video/issues/3503)) ([6a49cba](https://github.com/react-native-video/react-native-video/commit/6a49cba273fa0a47e106f4abb8caeb4ab6dbe4c8))
+
+
+### Reverts
+
+* Revert "fix: remove pausePlayback when audio focus loss event (#3496)" (#3504) ([aec7db6](https://github.com/react-native-video/react-native-video/commit/aec7db63901c42dd7a591b030bfc69daa8860341)), closes [#3496](https://github.com/react-native-video/react-native-video/issues/3496) [#3504](https://github.com/react-native-video/react-native-video/issues/3504)
+
 # [6.0.0-beta.4](https://github.com/react-native-video/react-native-video/compare/v6.0.0-beta.3...v6.0.0-beta.4) (2024-01-15)
 
 

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

@@ -9,8 +9,11 @@
 import com.brentvatne.common.api.VideoTrack;
 import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.ReactContext;
+import com.facebook.react.bridge.UIManager;
 import com.facebook.react.bridge.WritableArray;
 import com.facebook.react.bridge.WritableMap;
+import com.facebook.react.uimanager.UIManagerHelper;
+import com.facebook.react.uimanager.common.ViewUtil;
 import com.facebook.react.uimanager.events.RCTEventEmitter;
 import com.google.ads.interactivemedia.v3.api.AdError;
 
@@ -23,12 +26,12 @@
 
 public class VideoEventEmitter {
 
-    private final RCTEventEmitter eventEmitter;
+    private final ReactContext mReactContext;
 
     private int viewId = View.NO_ID;
 
     public VideoEventEmitter(ReactContext reactContext) {
-        this.eventEmitter = reactContext.getJSModule(RCTEventEmitter.class);
+        this.mReactContext = reactContext;
     }
 
     private static final String EVENT_LOAD_START = "onVideoLoadStart";
@@ -449,6 +452,10 @@ public void receiveAdErrorEvent(AdError error) {
     }
 
     private void receiveEvent(@VideoEvents String type, WritableMap event) {
-        eventEmitter.receiveEvent(viewId, type, event);
+        UIManager uiManager = UIManagerHelper.getUIManager(mReactContext, ViewUtil.getUIManagerType(viewId));
+
+        if(uiManager != null) {
+           uiManager.receiveEvent(UIManagerHelper.getSurfaceId(mReactContext), viewId, type, event);
+        }
     }
 }