loliball/media3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Migrate usages of MediaItem.ClippingProperties to ClippingConfiguration

Browse Source 
PiperOrigin-RevId: 399471555
This commit is contained in:
ibaker 2021-09-28 18:26:25 +01:00 committed by bachinger
parent 8db6ea4649
commit f39dba0c5b
4 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
demos/main/src/main/java/com/google/android/exoplayer2/demo/IntentUtil.java
View File

@ -94,8 +94,8 @@ public class IntentUtil {
intent.putExtra(TITLE_EXTRA, mediaItem.mediaMetadata.title); intent.putExtra(TITLE_EXTRA, mediaItem.mediaMetadata.title);
} }
addPlaybackPropertiesToIntent(localConfiguration, intent, /* extrasKeySuffix= */ ""); addPlaybackPropertiesToIntent(localConfiguration, intent, /* extrasKeySuffix= */ "");
addClippingPropertiesToIntent( addClippingConfigurationToIntent(
mediaItem.clippingProperties, intent, /* extrasKeySuffix= */ ""); mediaItem.clippingConfiguration, intent, /* extrasKeySuffix= */ "");
} else { } else {
intent.setAction(ACTION_VIEW_LIST); intent.setAction(ACTION_VIEW_LIST);
for (int i = 0; i < mediaItems.size(); i++) { for (int i = 0; i < mediaItems.size(); i++) {
@ -104,8 +104,8 @@ public class IntentUtil {
checkNotNull(mediaItem.localConfiguration); checkNotNull(mediaItem.localConfiguration);
intent.putExtra(URI_EXTRA + ("_" + i), localConfiguration.uri.toString()); intent.putExtra(URI_EXTRA + ("_" + i), localConfiguration.uri.toString());
addPlaybackPropertiesToIntent(localConfiguration, intent, /* extrasKeySuffix= */ "_" + i); addPlaybackPropertiesToIntent(localConfiguration, intent, /* extrasKeySuffix= */ "_" + i);
addClippingPropertiesToIntent( addClippingConfigurationToIntent(
mediaItem.clippingProperties, intent, /* extrasKeySuffix= */ "_" + i); mediaItem.clippingConfiguration, intent, /* extrasKeySuffix= */ "_" + i);
if (mediaItem.mediaMetadata.title != null) { if (mediaItem.mediaMetadata.title != null) {
intent.putExtra(TITLE_EXTRA + ("_" + i), mediaItem.mediaMetadata.title); intent.putExtra(TITLE_EXTRA + ("_" + i), mediaItem.mediaMetadata.title);
} }
@ -236,15 +236,17 @@ public class IntentUtil {
} }
} }
private static void addClippingPropertiesToIntent( private static void addClippingConfigurationToIntent(
MediaItem.ClippingProperties clippingProperties, Intent intent, String extrasKeySuffix) { MediaItem.ClippingConfiguration clippingConfiguration,
if (clippingProperties.startPositionMs != 0) { Intent intent,
String extrasKeySuffix) {
if (clippingConfiguration.startPositionMs != 0) {
intent.putExtra( intent.putExtra(
CLIP_START_POSITION_MS_EXTRA + extrasKeySuffix, clippingProperties.startPositionMs); CLIP_START_POSITION_MS_EXTRA + extrasKeySuffix, clippingConfiguration.startPositionMs);
} }
if (clippingProperties.endPositionMs != C.TIME_END_OF_SOURCE) { if (clippingConfiguration.endPositionMs != C.TIME_END_OF_SOURCE) {
intent.putExtra( intent.putExtra(
CLIP_END_POSITION_MS_EXTRA + extrasKeySuffix, clippingProperties.endPositionMs); CLIP_END_POSITION_MS_EXTRA + extrasKeySuffix, clippingConfiguration.endPositionMs);
} }
} }
} }

4
extensions/media2/src/main/java/com/google/android/exoplayer2/ext/media2/DefaultMediaItemConverter.java
View File

@ -105,8 +105,8 @@ public class DefaultMediaItemConverter implements MediaItemConverter {
} }
androidx.media2.common.MediaMetadata metadata = getMetadata(exoPlayerMediaItem); androidx.media2.common.MediaMetadata metadata = getMetadata(exoPlayerMediaItem);
long startPositionMs = exoPlayerMediaItem.clippingProperties.startPositionMs; long startPositionMs = exoPlayerMediaItem.clippingConfiguration.startPositionMs;
long endPositionMs = exoPlayerMediaItem.clippingProperties.endPositionMs; long endPositionMs = exoPlayerMediaItem.clippingConfiguration.endPositionMs;
if (endPositionMs == C.TIME_END_OF_SOURCE) { if (endPositionMs == C.TIME_END_OF_SOURCE) {
endPositionMs = androidx.media2.common.MediaItem.POSITION_UNKNOWN; endPositionMs = androidx.media2.common.MediaItem.POSITION_UNKNOWN;
} }

4
library/core/src/androidTest/java/com/google/android/exoplayer2/ClippedPlaybackTest.java
View File

@ -33,8 +33,8 @@ import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
/** /**
* Instrumentation tests for playback of clipped items using {@link MediaItem#clippingProperties} or * Instrumentation tests for playback of clipped items using {@link MediaItem#clippingConfiguration}
* {@link ClippingMediaSource} directly. * or {@link ClippingMediaSource} directly.
*/ */
@RunWith(AndroidJUnit4.class) @RunWith(AndroidJUnit4.class)
public final class ClippedPlaybackTest { public final class ClippedPlaybackTest {

16
library/core/src/main/java/com/google/android/exoplayer2/source/DefaultMediaSourceFactory.java
View File

@ -419,18 +419,18 @@ public final class DefaultMediaSourceFactory implements MediaSourceFactory {
// internal methods // internal methods
private static MediaSource maybeClipMediaSource(MediaItem mediaItem, MediaSource mediaSource) { private static MediaSource maybeClipMediaSource(MediaItem mediaItem, MediaSource mediaSource) {
if (mediaItem.clippingProperties.startPositionMs == 0 if (mediaItem.clippingConfiguration.startPositionMs == 0
&& mediaItem.clippingProperties.endPositionMs == C.TIME_END_OF_SOURCE && mediaItem.clippingConfiguration.endPositionMs == C.TIME_END_OF_SOURCE
&& !mediaItem.clippingProperties.relativeToDefaultPosition) { && !mediaItem.clippingConfiguration.relativeToDefaultPosition) {
return mediaSource; return mediaSource;
} }
return new ClippingMediaSource( return new ClippingMediaSource(
mediaSource, mediaSource,
C.msToUs(mediaItem.clippingProperties.startPositionMs), C.msToUs(mediaItem.clippingConfiguration.startPositionMs),
C.msToUs(mediaItem.clippingProperties.endPositionMs), C.msToUs(mediaItem.clippingConfiguration.endPositionMs),
/* enableInitialDiscontinuity= */ !mediaItem.clippingProperties.startsAtKeyFrame, /* enableInitialDiscontinuity= */ !mediaItem.clippingConfiguration.startsAtKeyFrame,
/* allowDynamicClippingUpdates= */ mediaItem.clippingProperties.relativeToLiveWindow, /* allowDynamicClippingUpdates= */ mediaItem.clippingConfiguration.relativeToLiveWindow,
mediaItem.clippingProperties.relativeToDefaultPosition); mediaItem.clippingConfiguration.relativeToDefaultPosition);
} }
private MediaSource maybeWrapWithAdsMediaSource(MediaItem mediaItem, MediaSource mediaSource) { private MediaSource maybeWrapWithAdsMediaSource(MediaItem mediaItem, MediaSource mediaSource) {