Merge branch 'master' of github.com:react-native-video/react-native-v…

…ideo

# Conflicts:
#	android/src/main/java/com/brentvatne/exoplayer/ReactExoplayerViewManager.java
#	src/Video.tsx

.github/ISSUE_TEMPLATE/config.yml

@@ -1,7 +1,7 @@
 blank_issues_enabled: false
 contact_links:
   - name: GitHub Discussions
-    url: https://github.com/react-native-video/react-native-video/discussions
+    url: https://github.com/TheWidlarzGroup/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

CONTRIBUTING.md

@@ -1,7 +1,7 @@
 ## Issues
 
-* New issues are reviewed and if they require additional work will be marked with the [`triage needed`](https://github.com/react-native-video/react-native-video/labels/triage%20needed) label. This is an open call for help from the community to verify the issue and help categorize it. If an issue stays in this state for a long time, it will be closed unresolved.
-* Once an issue has been reviewed it will be labeled with [`help wanted`](https://github.com/react-native-video/react-native-video/labels/help%20wanted) to indicate it is ready to be worked on. Please wait for this label before submitting a PR to avoid spending time on something that is likely to be rejected.
+* New issues are reviewed and if they require additional work will be marked with the [`triage needed`](https://github.com/TheWidlarzGroup/react-native-video/labels/triage%20needed) label. This is an open call for help from the community to verify the issue and help categorize it. If an issue stays in this state for a long time, it will be closed unresolved.
+* Once an issue has been reviewed it will be labeled with [`help wanted`](https://github.com/TheWidlarzGroup/react-native-video/labels/help%20wanted) to indicate it is ready to be worked on. Please wait for this label before submitting a PR to avoid spending time on something that is likely to be rejected.
 
 ## Cleanup
 
@@ -22,7 +22,7 @@ For example, a single file JS code change requires 1 review while a 3 files iOS
 
 * Reviewers will be asked to assign a risk level when they are done from 1 (super safe) to 5 (super risky). A release with any risk level 4 or 5 will be published as a major version, otherwise as a patch or minor based on the changes. Prepare for some large version increments while we get more comfortable... (but remember versions are free).
 
-* If you have time to help out, look for the [`review requested`](https://github.com/react-native-video/react-native-video/labels/review%20requested) label. It will have another numeric label with it (`1`, `2`, or `3` indicating how many more reviews are needed to merge).
+* If you have time to help out, look for the [`review requested`](https://github.com/TheWidlarzGroup/react-native-video/labels/review%20requested) label. It will have another numeric label with it (`1`, `2`, or `3` indicating how many more reviews are needed to merge).
 
 ## Releases
 

README.md

@@ -4,9 +4,7 @@
 > **Note:** version 5.2.1 won't have any updates. We are currently working on making a 6.0.0 fully stable
 
 ## Documentation
-documentation is available at [react-native-video.github.io/react-native-video](https://react-native-video.github.io/react-native-video/)
-
-> if you find some issue with new version, don't hesitate to open a ticket! Also Old version can be found [here](https://github.com/react-native-video/react-native-video/tree/v6.0.0-alpha.8)
+documentation is available at [thewidlarzgroup.github.io/react-native-video/](https://thewidlarzgroup.github.io/react-native-video/)
 
 ## Usage
 
@@ -61,6 +59,6 @@ We have an discord server where you can ask questions and get help. [Join the di
   <picture>
     <source media="(prefers-color-scheme: dark)" srcset="./docs/assets/baners/twg-dark.png" />
     <source media="(prefers-color-scheme: light)" srcset="./docs/assets/baners/twg-light.png" />
-    <img alt="TheWidlarzGroup" src="./docs/assets/baners/twg-light-1.png" />
+    <img alt="TheWidlarzGroup" src="./docs/assets/baners/twg-light.png" />
   </picture>
 </a>

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

@@ -1,12 +1,18 @@
 package com.brentvatne.exoplayer;
 
+import android.net.Uri;
+
+import androidx.annotation.NonNull;
 import androidx.media3.common.util.Util;
+import androidx.media3.datasource.AssetDataSource;
 import androidx.media3.datasource.DataSource;
+import androidx.media3.datasource.DataSpec;
 import androidx.media3.datasource.DefaultDataSource;
 import androidx.media3.datasource.HttpDataSource;
 import androidx.media3.datasource.okhttp.OkHttpDataSource;
 import androidx.media3.exoplayer.upstream.DefaultBandwidthMeter;
 
+import com.brentvatne.common.toolbox.DebugLog;
 import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.modules.network.CookieJarContainer;
 import com.facebook.react.modules.network.ForwardingCookieHandler;
@@ -23,7 +29,6 @@ public class DataSourceUtil {
     private DataSourceUtil() {
     }
 
-    private static DataSource.Factory rawDataSourceFactory = null;
     private static DataSource.Factory defaultDataSourceFactory = null;
     private static HttpDataSource.Factory defaultHttpDataSourceFactory = null;
     private static String userAgent = null;
@@ -39,44 +44,20 @@ public static String getUserAgent(ReactContext context) {
         return userAgent;
     }
 
-    public static DataSource.Factory getRawDataSourceFactory(ReactContext context) {
-        if (rawDataSourceFactory == null) {
-            rawDataSourceFactory = buildRawDataSourceFactory(context);
-        }
-        return rawDataSourceFactory;
-    }
-
-    public static void setRawDataSourceFactory(DataSource.Factory factory) {
-        DataSourceUtil.rawDataSourceFactory = factory;
-    }
-
-
     public static DataSource.Factory getDefaultDataSourceFactory(ReactContext context, DefaultBandwidthMeter bandwidthMeter, Map<String, String> requestHeaders) {
         if (defaultDataSourceFactory == null || (requestHeaders != null && !requestHeaders.isEmpty())) {
             defaultDataSourceFactory = buildDataSourceFactory(context, bandwidthMeter, requestHeaders);
         }
         return defaultDataSourceFactory;
     }
 
-    public static void setDefaultDataSourceFactory(DataSource.Factory factory) {
-        DataSourceUtil.defaultDataSourceFactory = factory;
-    }
-
     public static HttpDataSource.Factory getDefaultHttpDataSourceFactory(ReactContext context, DefaultBandwidthMeter bandwidthMeter, Map<String, String> requestHeaders) {
         if (defaultHttpDataSourceFactory == null || (requestHeaders != null && !requestHeaders.isEmpty())) {
             defaultHttpDataSourceFactory = buildHttpDataSourceFactory(context, bandwidthMeter, requestHeaders);
         }
         return defaultHttpDataSourceFactory;
     }
 
-    public static void setDefaultHttpDataSourceFactory(HttpDataSource.Factory factory) {
-        DataSourceUtil.defaultHttpDataSourceFactory = factory;
-    }
-
-    private static DataSource.Factory buildRawDataSourceFactory(ReactContext context) {
-        return new RawResourceDataSourceFactory(context.getApplicationContext());
-    }
-
     private static DataSource.Factory buildDataSourceFactory(ReactContext context, DefaultBandwidthMeter bandwidthMeter, Map<String, String> requestHeaders) {
         return new DefaultDataSource.Factory(context, buildHttpDataSourceFactory(context, bandwidthMeter, requestHeaders));
     }
@@ -100,4 +81,17 @@ private static HttpDataSource.Factory buildHttpDataSourceFactory(ReactContext co
 
         return okHttpDataSourceFactory;
     }
+
+    public static DataSource.Factory buildAssetDataSourceFactory(ReactContext context, Uri srcUri) throws AssetDataSource.AssetDataSourceException {
+        DataSpec dataSpec = new DataSpec(srcUri);
+        final AssetDataSource rawResourceDataSource = new AssetDataSource(context);
+            rawResourceDataSource.open(dataSpec);
+        return new DataSource.Factory() {
+            @NonNull
+            @Override
+            public DataSource createDataSource() {
+                return rawResourceDataSource;
+            }
+        };
+    }
 }