cordova-plugin-media3 1.1.16 → 1.1.18

package/package.json

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

package/plugin.xml

@@ -29,7 +29,8 @@
         <framework src="androidx.media3:media3-extractor:1.8.0"/>
         <framework src="androidx.media3:media3-decoder:1.8.0"/>
         <!-- <framework src="androidx.media3:media3-session:1.8.0"/> -->
-        <!-- <framework src="org.jellyfin.media3:media3-ffmpeg-decoder:1.8.0+1"/> -->
+        <!-- <framework src="androidx.media3:media3-exoplayer-ffmpeg:1.0.0"/> -->
+        <framework src="org.jellyfin.media3:media3-ffmpeg-decoder:1.8.0+1"/>
         <framework src="com.squareup.picasso:picasso:2.8"/>
 
         <config-file target="res/xml/config.xml" parent="/*">

package/src/android/Payload.java

@@ -125,7 +125,7 @@ public class Payload {
         Map<String, String> map = new HashMap<String, String>();
         map.put("eventType", "SEEK_EVENT");
         map.put("offset", Long.toString(offset));
-        addPlayerState(map, player);
+        // addPlayerState(map, player);
         return new JSONObject(map);
     }
 
@@ -207,30 +207,18 @@ public class Payload {
         return new JSONObject(map);
     }
 
-    private static void addPlayerState(Map<String, String> map, ExoPlayer player) {
+    public static JSONObject timeUpdateEvent(ExoPlayer player) {
+        Map<String, String> map = new HashMap<String, String>();
+        map.put("eventType", "TIMEUPDATE_EVENT");
         if (null != player) {
             try {
-                map.put("duration", Long.toString(player.getDuration()));
                 map.put("position", Long.toString(player.getCurrentPosition()));
-                map.put("playWhenReady", Boolean.toString(player.getPlayWhenReady()));
-                map.put("playbackState", playbackStateToString(player.getPlaybackState()));
-                map.put("bufferPercentage", Integer.toString(player.getBufferedPercentage()));
-                map.put("videoWidth", Integer.toString(player.getVideoSize().width));
-                map.put("videoHeight", Integer.toString(player.getVideoSize().height));
-            }
-            catch(Exception ex) {
-                Log.e(Player.TAG, "Error adding player state", ex);
+            } catch (Exception ex) {
+                // Log.e(Player.TAG, "Error adding player getCurrentPosition", ex);
             }
         }
-    }
-
-    
-    public static JSONObject timeUpdateEvent(ExoPlayer player) {
-        Map<String, String> map = new HashMap<String, String>();
-        map.put("eventType", "TIMEUPDATE_EVENT");
-        map.put("message", "Timer running");
-        // map.put("playbackState", playbackStateToString(playbackState));
-        addPlayerState(map, player);
+        // map.put("message", "Timer running");
+        // addPlayerState(map, player);
         return new JSONObject(map);
     }
 
@@ -255,7 +243,7 @@ public class Payload {
                     map.put("tracks", result.toString());
                 } catch (JSONException e) {
                     // e.printStackTrace();
-                    Log.e(Player.TAG, "Error adding tracks info", e);
+                    // Log.e(Player.TAG, "Error adding tracks info", e);
                 }
 
             } 
@@ -274,7 +262,7 @@ public class Payload {
                             trackObj.put("format", format.sampleMimeType);
                         } catch (JSONException e) {
                             // e.printStackTrace();
-                            Log.e(Player.TAG, "Error adding trackObj info", e);
+                            // Log.e(Player.TAG, "Error adding trackObj info", e);
                         }
         
                         switch (group.getType()) {
@@ -301,7 +289,7 @@ public class Payload {
                     result.put("subtitleTracks", subtitleArray);
                 } catch (JSONException e) {
                     // e.printStackTrace();
-                    Log.e(Player.TAG, "Error adding tracks info", e);
+                    // Log.e(Player.TAG, "Error adding tracks info", e);
                 }
         
                 map.put("tracks", result.toString());            
@@ -309,6 +297,23 @@ public class Payload {
         }
     }
 
+    private static void addPlayerState(Map<String, String> map, ExoPlayer player) {
+        if (null != player) {
+            try {
+                map.put("duration", Long.toString(player.getDuration()));
+                map.put("position", Long.toString(player.getCurrentPosition()));
+                map.put("playWhenReady", Boolean.toString(player.getPlayWhenReady()));
+                map.put("playbackState", playbackStateToString(player.getPlaybackState()));
+                map.put("bufferPercentage", Integer.toString(player.getBufferedPercentage()));
+                map.put("videoWidth", Integer.toString(player.getVideoSize().width));
+                map.put("videoHeight", Integer.toString(player.getVideoSize().height));
+            }
+            catch(Exception ex) {
+                // Log.e(Player.TAG, "Error adding player state", ex);
+            }
+        }
+    }
+
     // public static JSONObject audioTrackeEvent(ExoPlayer player) {
     //     Map<String, String> map = new HashMap<String, String>();
     //     Tracks currentTracks = player.getCurrentTracks();

package/src/android/Player.java

@@ -90,8 +90,8 @@ public class Player {
     private androidx.media3.common.Player.Listener playerEventListener = new androidx.media3.common.Player.Listener() {
         @Override
         public void onIsLoadingChanged(boolean isLoading) {
-            JSONObject payload = Payload.loadingEvent(Player.this.exoPlayer, isLoading);
-            new CallbackResponse(Player.this.callbackContext).send(PluginResult.Status.OK, payload, true);
+            // JSONObject payload = Payload.loadingEvent(Player.this.exoPlayer, isLoading);
+            // new CallbackResponse(Player.this.callbackContext).send(PluginResult.Status.OK, payload, true);
         }
 
         @Override
@@ -880,6 +880,57 @@ public class Player {
         return response;
     }
 
+    public JSONObject setAspectRatio(String aspectRatio) {
+        JSONObject response = new JSONObject();
+    
+        try {
+            if (exoView == null) {
+                response.put("success", false);
+                response.put("message", "Player view not initialized");
+                return response;
+            }
+    
+            // Convert string to appropriate resize mode
+            int resizeMode = getResizeModeFromString(aspectRatio);
+            
+            // Set the resize mode on the player view
+            exoView.setResizeMode(resizeMode);
+            
+            response.put("success", true);
+            response.put("message", "Aspect ratio set to: " + resizeMode);
+            // response.put("resizeMode", resizeMode);
+            
+        } catch (JSONException e) {
+            try {
+                response.put("success", false);
+                response.put("error", "Failed to set aspect ratio: " + e.getMessage());
+            } catch (JSONException je) {
+                Log.e(TAG, "Error creating response JSON", je);
+            }
+        }
+        
+        return response;
+    }
+
+    private int getResizeModeFromString(String aspectRatio) {
+        switch (aspectRatio.toUpperCase()) {
+            case "FIT":
+            case "FIT_SCREEN":
+                return AspectRatioFrameLayout.RESIZE_MODE_FIT;
+            case "FILL":
+            case "FILL_SCREEN":
+                return AspectRatioFrameLayout.RESIZE_MODE_FILL;
+            case "FIXED_WIDTH":
+                return AspectRatioFrameLayout.RESIZE_MODE_FIXED_WIDTH;
+            case "FIXED_HEIGHT":
+                return AspectRatioFrameLayout.RESIZE_MODE_FIXED_HEIGHT;
+            case "ZOOM":
+                return AspectRatioFrameLayout.RESIZE_MODE_ZOOM;
+            default:
+                Log.w(TAG, "Unknown aspect ratio: " + aspectRatio + ", defaulting to FIT");
+                return AspectRatioFrameLayout.RESIZE_MODE_FIT;
+        }
+    }
     private int getColor(String color) {
         switch (color) {
             case "transparent":

package/www/exoplayer.js

@@ -79,8 +79,11 @@ module.exports = {
     setSubtitleStyle: function (subtitle_color, subtitle_background, edgeColor, edgeType, successCallback, errorCallback) {
         cordova.exec(successCallback, errorCallback, "ExoPlayer", "setSubtitleStyle", [subtitle_color, subtitle_background, edgeColor, edgeType]);
     },
-    isTV: function (successCallback, errorCallback) {
-        cordova.exec(successCallback, errorCallback, "ExoPlayer", "isTV", []);
+    // isTV: function (successCallback, errorCallback) {
+    //     cordova.exec(successCallback, errorCallback, "ExoPlayer", "isTV", []);
+    // },
+    setAspectRatio: function (aspectRatio, successCallback, errorCallback) {
+        cordova.exec(successCallback, errorCallback, "ExoPlayer", "setAspectRatio", [aspectRatio]);
     },
     getDuration: function (successCallback, errorCallback) {
         cordova.exec(successCallback, errorCallback, "ExoPlayer", "getDuration", []);