cordova-plugin-media3 1.1.1 → 1.1.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cordova-plugin-media3",
-  "version": "1.1.001",
+  "version": "1.1.003",
   "description": "Media player for Cordova using Google's media3 ExoPlayer framework",
   "cordova": {
     "id": "cordova-plugin-media3",

package/plugin.xml

@@ -27,7 +27,7 @@
         <framework src="androidx.media3:media3-decoder:1.2.1"/>
         <framework src="androidx.media3:media3-session:1.2.1"/>
         <framework src="org.jellyfin.media3:media3-ffmpeg-decoder:1.2.1+1"/>
-        <framework src="com.squareup.picasso:picasso:2.5.2"/>
+        <framework src="com.squareup.picasso:picasso:2.8"/>
 
         <config-file target="res/xml/config.xml" parent="/*">
             <feature name="ExoPlayer">

package/src/android/LayoutProvider.java

@@ -29,8 +29,8 @@ import android.util.*;
 import android.view.*;
 import android.widget.*;
 
-import com.google.android.exoplayer2.ForwardingPlayer;
-import com.google.android.exoplayer2.ui.*;
+import androidx.media3.common.ForwardingPlayer;
+import androidx.media3.ui.*;
 import java.lang.String;
 
 import org.json.*;
@@ -51,8 +51,8 @@ public class LayoutProvider {
         return view;
     }
 
-    public static StyledPlayerView getExoPlayerView(Activity activity, Configuration config) {
-        StyledPlayerView view = new StyledPlayerView(activity);
+    public static PlayerView getExoPlayerView(Activity activity, Configuration config) {
+        PlayerView view = new PlayerView(activity);
         view.setLayoutParams(new LinearLayout.LayoutParams(WindowManager.LayoutParams.MATCH_PARENT, WindowManager.LayoutParams.MATCH_PARENT));
         if (config.isAspectRatioFillScreen()) {
             view.setResizeMode(AspectRatioFrameLayout.RESIZE_MODE_FILL);
@@ -67,7 +67,7 @@ public class LayoutProvider {
         return view;
     }
 
-    public static void setupController(StyledPlayerView parentView, Activity activity, JSONObject controller) {
+    public static void setupController(PlayerView parentView, Activity activity, JSONObject controller) {
         if (null != controller) {
             parentView.setUseController(true);
             setupButtons(parentView, activity, controller);
@@ -79,7 +79,7 @@ public class LayoutProvider {
         }
     }
 
-    private static void setupButtons(StyledPlayerView parentView, Activity activity, JSONObject controller) {
+    private static void setupButtons(PlayerView parentView, Activity activity, JSONObject controller) {
         String packageName = activity.getPackageName();
         String buttonsColor = controller.optString("buttonsColor");
 
@@ -115,7 +115,7 @@ public class LayoutProvider {
         }
     }
 
-    private static void setupBar(StyledPlayerView parentView, Activity activity, JSONObject controller) {
+    private static void setupBar(PlayerView parentView, Activity activity, JSONObject controller) {
         String streamTitle = controller.optString("streamTitle", null);
         String streamDescription = controller.optString("streamDescription", null);
         String streamImage = controller.optString("streamImage", null);
@@ -170,7 +170,7 @@ public class LayoutProvider {
         }
     }
 
-    private static void setupBuffering(StyledPlayerView parentView, Activity activity, JSONObject controller) {
+    private static void setupBuffering(PlayerView parentView, Activity activity, JSONObject controller) {
         String bufferingColor = controller.optString("bufferingColor");
         ProgressBar bufferingBar = (ProgressBar)findView(parentView, activity, "exo_buffering");
         if (null != bufferingBar && null != bufferingColor) {
@@ -178,7 +178,7 @@ public class LayoutProvider {
         }
     }
 
-    public static void setBufferingVisibility(StyledPlayerView parentView, Activity activity, boolean visible) {
+    public static void setBufferingVisibility(PlayerView parentView, Activity activity, boolean visible) {
         ProgressBar progressBar = (ProgressBar)findView(parentView, activity, "exo_buffering");
         if (null != progressBar) {
             progressBar.setVisibility(visible ? View.VISIBLE : View.GONE);

package/src/android/Player.java

@@ -49,6 +49,7 @@ import androidx.media3.datasource.*;
 import androidx.media3.common.util.*;
 import androidx.media3.exoplayer.trackselection.*;
 import androidx.media3.exoplayer.DefaultRenderersFactory;
+import androidx.media3.exoplayer.upstream.DefaultBandwidthMeter;
 
 import com.google.common.collect.ImmutableList;
 
@@ -64,7 +65,7 @@ public class Player {
     private final Configuration config;
     private Dialog dialog;
     private ExoPlayer exoPlayer;
-    private StyledPlayerView exoView;
+    private PlayerView exoView;
     private CordovaWebView webView;
     private int controllerVisibility;
     private boolean paused = false;
@@ -82,7 +83,7 @@ public class Player {
         this.audioManager = (AudioManager) activity.getSystemService(Context.AUDIO_SERVICE);
     }
 
-    private ExoPlayer.Listener playerEventListener = new ExoPlayer.Listener() {
+    private Player.Listener playerEventListener = new Player.Listener() {
         @Override
         public void onIsLoadingChanged(boolean isLoading) {
             JSONObject payload = Payload.loadingEvent(Player.this.exoPlayer, isLoading);
@@ -103,14 +104,14 @@ public class Player {
         @Override
         public void onPlaybackStateChanged(int playbackState) {
             if (config.getShowBuffering()) {
-                LayoutProvider.setBufferingVisibility(exoView, activity, playbackState == ExoPlayer.STATE_BUFFERING);
+                LayoutProvider.setBufferingVisibility(exoView, activity, playbackState == Player.STATE_BUFFERING);
             }
             JSONObject payload = Payload.stateEvent(Player.this.exoPlayer, playbackState, Player.this.controllerVisibility == View.VISIBLE);
             new CallbackResponse(Player.this.callbackContext).send(PluginResult.Status.OK, payload, true);
         }
 
         @Override
-        public void onPositionDiscontinuity(@NonNull PositionInfo oldPosition, @NonNull PositionInfo newPosition, int reason) {
+        public void onPositionDiscontinuity(@NonNull Player.PositionInfo oldPosition, @NonNull Player.PositionInfo newPosition, int reason) {
             JSONObject payload = Payload.positionDiscontinuityEvent(Player.this.exoPlayer, reason);
             new CallbackResponse(Player.this.callbackContext).send(PluginResult.Status.OK, payload, true);
         }
@@ -195,7 +196,7 @@ public class Player {
         }
     };
 
-    private StyledPlayerView.ControllerVisibilityListener playbackControlVisibilityListener = new StyledPlayerView.ControllerVisibilityListener() {
+    private PlayerView.ControllerVisibilityListener playbackControlVisibilityListener = new PlayerView.ControllerVisibilityListener() {
         @Override
         public void onVisibilityChanged(int visibility) {
             Player.this.controllerVisibility = visibility;
@@ -318,7 +319,7 @@ public class Player {
 
 
         /* Build with extyentions ffmpeg */
-        RenderersFactory renderersFactory = new DefaultRenderersFactory(this.activity)
+        DefaultRenderersFactory renderersFactory = new DefaultRenderersFactory(this.activity)
             .setExtensionRendererMode(DefaultRenderersFactory.EXTENSION_RENDERER_MODE_ON);
 
         // // /* lunch normal exoplayer player */
@@ -591,7 +592,7 @@ public class Player {
 
     public JSONObject getPlayerState() {
         return Payload.stateEvent(exoPlayer,
-                null != exoPlayer ? exoPlayer.getPlaybackState() : com.google.android.exoplayer2.Player.STATE_ENDED,
+                null != exoPlayer ? exoPlayer.getPlaybackState() : Player.STATE_ENDED,
                 Player.this.controllerVisibility == View.VISIBLE);
     }
 
@@ -649,67 +650,63 @@ public class Player {
     public JSONObject setAudioTrack(int trackId) {
         JSONObject response = new JSONObject();
 
-        // try {
-            DefaultTrackSelector trackSelector = (DefaultTrackSelector) exoPlayer.getTrackSelector();
-            Tracks currentTracks = exoPlayer.getCurrentTracks();
-            
-            if (currentTracks == null) {
-                try {
-                    response.put("success", true);
-                    response.put("message", "No current tracks found");
-
-                } catch (JSONException e) {
-                    Log.e(TAG, "Error creating response JSON", e);
-                }
+        DefaultTrackSelector trackSelector = (DefaultTrackSelector) exoPlayer.getTrackSelector();
+        Tracks currentTracks = exoPlayer.getCurrentTracks();
+        
+        if (currentTracks == null) {
+            try {
+                response.put("success", true);
+                response.put("message", "No current tracks found");
 
-                return response;
+            } catch (JSONException e) {
+                Log.e(TAG, "Error creating response JSON", e);
             }
 
-            // // Clear existing audio track overrides
-            // builder.clearOverrides();
+            return response;
+        }
 
-            for (Tracks.Group group : currentTracks.getGroups()) {
-                if (group.getType() == C.TRACK_TYPE_AUDIO) {
-                    for (int i = 0; i < group.length; i++) {
-                        try {
-                            Format format = group.getTrackFormat(i);
-                            int format_id = Integer.parseInt(format.id);
-
-                            if (trackId == format_id) {
-                                // response.put("Founded " + i, format.toString());
-                                // Create track selection override
-                                TrackSelectionParameters.Builder builder = exoPlayer.getTrackSelectionParameters().buildUpon();
-                                builder.clearOverridesOfType(C.TRACK_TYPE_AUDIO);
-                                TrackSelectionOverride override = new TrackSelectionOverride(group.getMediaTrackGroup(), i);
-                                builder.addOverride(override);
-                                
-                                // Apply the selection
-                                exoPlayer.setTrackSelectionParameters(builder.build());
+        for (Tracks.Group group : currentTracks.getGroups()) {
+            if (group.getType() == C.TRACK_TYPE_AUDIO) {
+                for (int i = 0; i < group.length; i++) {
+                    try {
+                        Format format = group.getTrackFormat(i);
+                        int format_id = Integer.parseInt(format.id);
+
+                        if (trackId == format_id) {
+                            // response.put("Founded " + i, format.toString());
+                            // Create track selection override
+                            TrackSelectionParameters.Builder builder = exoPlayer.getTrackSelectionParameters().buildUpon();
+                            builder.clearOverridesOfType(C.TRACK_TYPE_AUDIO);
+                            TrackSelectionOverride override = new TrackSelectionOverride(group.getMediaTrackGroup(), i);
+                            builder.addOverride(override);
                             
-                                response.put("success", true);
-                                response.put("message", "Audio track set successfully");
-
-                                return response;
-                            }
-                        } catch (JSONException e) {
-                            try {
-                                response.put("success", false);
-                                response.put("error", "Failed to check audio track: " + e.getMessage());
-                                Log.e(TAG, "Error creating response JSON", e);
-                            } catch (JSONException je) {
-                                Log.e(TAG, "Error creating response JSON", je);
-                            }
+                            // Apply the selection
+                            exoPlayer.setTrackSelectionParameters(builder.build());
+                            
+                            response.put("success", true);
+                            response.put("message", "Audio track set successfully");
+
+                            return response;
+                        }
+                    } catch (JSONException e) {
+                        try {
+                            response.put("success", false);
+                            response.put("error", "Failed to check audio track: " + e.getMessage());
+                            Log.e(TAG, "Error creating response JSON", e);
+                        } catch (JSONException je) {
+                            Log.e(TAG, "Error creating response JSON", je);
                         }
                     }
-                }       
-            }
+                }
+            }       
+        }
 
-            try {
-                response.put("success", false);
-                response.put("message", "Audio track not found " + trackId);
-            } catch (JSONException e) {
-                Log.e(TAG, "Error creating response JSON", e);
-            }
+        try {
+            response.put("success", false);
+            response.put("message", "Audio track not found " + trackId);
+        } catch (JSONException e) {
+            Log.e(TAG, "Error creating response JSON", e);
+        }
 
         return response;
     }
@@ -718,70 +715,66 @@ public class Player {
     public JSONObject setSubtitleTrack(int trackId) {
         JSONObject response = new JSONObject();
 
-
-            DefaultTrackSelector trackSelector = (DefaultTrackSelector) exoPlayer.getTrackSelector();
-            Tracks currentTracks = exoPlayer.getCurrentTracks();
-            
-            if (currentTracks == null) {
-                try {
-                    response.put("success", true);
-                    response.put("message", "No current tracks found");                    
-                } catch (JSONException e) {
-                    Log.e(TAG, "Error creating response JSON", e);
-                }
-
-                return response;
+        DefaultTrackSelector trackSelector = (DefaultTrackSelector) exoPlayer.getTrackSelector();
+        Tracks currentTracks = exoPlayer.getCurrentTracks();
+        
+        if (currentTracks == null) {
+            try {
+                response.put("success", true);
+                response.put("message", "No current tracks found");                    
+            } catch (JSONException e) {
+                Log.e(TAG, "Error creating response JSON", e);
             }
 
-            for (Tracks.Group group : currentTracks.getGroups()) {
-                if (group.getType() == C.TRACK_TYPE_TEXT) {
-                    for (int i = 0; i < group.length; i++) {
-                        Format format = group.getTrackFormat(i);
-                        int formatId = Integer.parseInt(format.id);
-
-                        try {                            
-                            if (trackId == formatId) {
-                                // Found the target track - create selection override
-                                DefaultTrackSelector.Parameters.Builder parametersBuilder = trackSelector.getParameters()
-                                        .buildUpon()
-                                        .setRendererDisabled(C.TRACK_TYPE_TEXT, false); // Enable text renderer
-                                
-                                // Clear any existing text track overrides
-                                parametersBuilder.clearOverridesOfType(C.TRACK_TYPE_TEXT);
-                                
-                                // Set the new track selection override
-                                parametersBuilder.addOverride(
-                                    new TrackSelectionOverride(group.getMediaTrackGroup(), ImmutableList.of(i))
-                                );
-                                
-                                trackSelector.setParameters(parametersBuilder.build());
-            
+            return response;
+        }
+
+        for (Tracks.Group group : currentTracks.getGroups()) {
+            if (group.getType() == C.TRACK_TYPE_TEXT) {
+                for (int i = 0; i < group.length; i++) {
+                    Format format = group.getTrackFormat(i);
+                    int formatId = Integer.parseInt(format.id);
+
+                    try {                            
+                        if (trackId == formatId) {
+                            // Found the target track - create selection override
+                            DefaultTrackSelector.Parameters.Builder parametersBuilder = trackSelector.getParameters()
+                                    .buildUpon()
+                                    .setRendererDisabled(C.TRACK_TYPE_TEXT, false); // Enable text renderer
+                            
+                            // Clear any existing text track overrides
+                            parametersBuilder.clearOverridesOfType(C.TRACK_TYPE_TEXT);
+                            
+                            // Set the new track selection override
+                            parametersBuilder.addOverride(
+                                new TrackSelectionOverride(group.getMediaTrackGroup(), ImmutableList.of(i))
+                            );
+                            
+                            trackSelector.setParameters(parametersBuilder.build());
             
-                                response.put("success", true);
-                                response.put("message", "Subtitle track set successfully");
-                                // response.put("selectedTrack", format.toString());
-                                return response;
-                            }
-                        } catch (JSONException e) {
-                            try {
-                                response.put("success", false);
-                                response.put("error", "Failed to check subtitle track: " + e.getMessage());
-                                Log.e(TAG, "Error creating response JSON", e);
-                            } catch (JSONException je) {
-                                Log.e(TAG, "Error creating response JSON", je);
-                            }
+                            response.put("success", true);
+                            response.put("message", "Subtitle track set successfully");
+                            return response;
+                        }
+                    } catch (JSONException e) {
+                        try {
+                            response.put("success", false);
+                            response.put("error", "Failed to check subtitle track: " + e.getMessage());
+                            Log.e(TAG, "Error creating response JSON", e);
+                        } catch (JSONException je) {
+                            Log.e(TAG, "Error creating response JSON", je);
                         }
                     }
                 }
             }
+        }
 
-            try {
-                response.put("success", false);
-                response.put("message", "Subtitle track not found " + trackId);
-            } catch (JSONException e) {
-                Log.e(TAG, "Error creating response JSON", e);
-            }
-
+        try {
+            response.put("success", false);
+            response.put("message", "Subtitle track not found " + trackId);
+        } catch (JSONException e) {
+            Log.e(TAG, "Error creating response JSON", e);
+        }
 
         return response;
     }