Skip to content

Commit 336d4b3

Browse files
Add JavaDoc to some undocumented methods and move them
PiperOrigin-RevId: 527870443
1 parent 349eca7 commit 336d4b3

File tree

1 file changed

+29
-19
lines changed

1 file changed

+29
-19
lines changed

libraries/session/src/main/java/androidx/media3/session/MediaUtils.java

Lines changed: 29 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1427,13 +1427,7 @@ public static Pair<PlayerInfo, BundlingExclusions> mergePlayerInfo(
14271427
return new Pair<>(mergedPlayerInfo, mergedBundlingExclusions);
14281428
}
14291429

1430-
private static byte[] convertToByteArray(Bitmap bitmap) throws IOException {
1431-
try (ByteArrayOutputStream stream = new ByteArrayOutputStream()) {
1432-
bitmap.compress(Bitmap.CompressFormat.PNG, /* ignored */ 0, stream);
1433-
return stream.toByteArray();
1434-
}
1435-
}
1436-
1430+
/** Generates an array of {@code n} indices. */
14371431
public static int[] generateUnshuffledIndices(int n) {
14381432
int[] indices = new int[n];
14391433
for (int i = 0; i < n; i++) {
@@ -1442,6 +1436,10 @@ public static int[] generateUnshuffledIndices(int n) {
14421436
return indices;
14431437
}
14441438

1439+
/**
1440+
* Calculates the buffered percentage of the given buffered position and the duration in
1441+
* milliseconds.
1442+
*/
14451443
public static int calculateBufferedPercentage(long bufferedPositionMs, long durationMs) {
14461444
return bufferedPositionMs == C.TIME_UNSET || durationMs == C.TIME_UNSET
14471445
? 0
@@ -1450,26 +1448,38 @@ public static int calculateBufferedPercentage(long bufferedPositionMs, long dura
14501448
: Util.constrainValue((int) ((bufferedPositionMs * 100) / durationMs), 0, 100);
14511449
}
14521450

1451+
/**
1452+
* Sets media items with start index and position for the given {@link Player} by honoring the
1453+
* available commands.
1454+
*
1455+
* @param player The player to set the media items.
1456+
* @param mediaItemsWithStartPosition The media items, the index and the position to set.
1457+
*/
14531458
public static void setMediaItemsWithStartIndexAndPosition(
1454-
PlayerWrapper player, MediaSession.MediaItemsWithStartPosition mediaItemsWithStartPosition) {
1459+
Player player, MediaSession.MediaItemsWithStartPosition mediaItemsWithStartPosition) {
14551460
if (mediaItemsWithStartPosition.startIndex == C.INDEX_UNSET) {
14561461
if (player.isCommandAvailable(COMMAND_CHANGE_MEDIA_ITEMS)) {
14571462
player.setMediaItems(mediaItemsWithStartPosition.mediaItems, /* resetPosition= */ true);
14581463
} else if (!mediaItemsWithStartPosition.mediaItems.isEmpty()) {
14591464
player.setMediaItem(
14601465
mediaItemsWithStartPosition.mediaItems.get(0), /* resetPosition= */ true);
14611466
}
1462-
} else {
1463-
if (player.isCommandAvailable(COMMAND_CHANGE_MEDIA_ITEMS)) {
1464-
player.setMediaItems(
1465-
mediaItemsWithStartPosition.mediaItems,
1466-
mediaItemsWithStartPosition.startIndex,
1467-
mediaItemsWithStartPosition.startPositionMs);
1468-
} else if (!mediaItemsWithStartPosition.mediaItems.isEmpty()) {
1469-
player.setMediaItem(
1470-
mediaItemsWithStartPosition.mediaItems.get(0),
1471-
mediaItemsWithStartPosition.startPositionMs);
1472-
}
1467+
} else if (player.isCommandAvailable(COMMAND_CHANGE_MEDIA_ITEMS)) {
1468+
player.setMediaItems(
1469+
mediaItemsWithStartPosition.mediaItems,
1470+
mediaItemsWithStartPosition.startIndex,
1471+
mediaItemsWithStartPosition.startPositionMs);
1472+
} else if (!mediaItemsWithStartPosition.mediaItems.isEmpty()) {
1473+
player.setMediaItem(
1474+
mediaItemsWithStartPosition.mediaItems.get(0),
1475+
mediaItemsWithStartPosition.startPositionMs);
1476+
}
1477+
}
1478+
1479+
private static byte[] convertToByteArray(Bitmap bitmap) throws IOException {
1480+
try (ByteArrayOutputStream stream = new ByteArrayOutputStream()) {
1481+
bitmap.compress(Bitmap.CompressFormat.PNG, /* ignored */ 0, stream);
1482+
return stream.toByteArray();
14731483
}
14741484
}
14751485

0 commit comments

Comments
 (0)