From f83d2b1392a1843338590ce6775b67bb52ac3362 Mon Sep 17 00:00:00 2001 From: kimvde Date: Wed, 25 Sep 2024 01:58:37 -0700 Subject: [PATCH] Stop calling setDurationUs when image duration already set The EditedMediaItem's duration is set to the MediaItem's image duration by default. PiperOrigin-RevId: 678597324 --- .../media3/transformer/CompositionPlaybackTest.java | 3 --- .../androidx/media3/transformer/CompositionPlayerTest.java | 5 ----- .../transformer/mh/VideoTimestampConsistencyTest.java | 6 ------ 3 files changed, 14 deletions(-) diff --git a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/CompositionPlaybackTest.java b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/CompositionPlaybackTest.java index e7099c906e..753a0a9653 100644 --- a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/CompositionPlaybackTest.java +++ b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/CompositionPlaybackTest.java @@ -111,7 +111,6 @@ public class CompositionPlaybackTest { Effect videoEffect = (GlEffect) (context, useHdr) -> inputTimestampRecordingShaderProgram; EditedMediaItem editedMediaItem = new EditedMediaItem.Builder(IMAGE_MEDIA_ITEM) - .setDurationUs(IMAGE_DURATION_US) .setEffects( new Effects( /* audioProcessors= */ ImmutableList.of(), @@ -159,7 +158,6 @@ public class CompositionPlaybackTest { .build(); EditedMediaItem imageEditedMediaItem = new EditedMediaItem.Builder(IMAGE_MEDIA_ITEM) - .setDurationUs(IMAGE_DURATION_US) .setEffects( new Effects( /* audioProcessors= */ ImmutableList.of(), @@ -200,7 +198,6 @@ public class CompositionPlaybackTest { Effect videoEffect = (GlEffect) (context, useHdr) -> inputTimestampRecordingShaderProgram; EditedMediaItem imageEditedMediaItem = new EditedMediaItem.Builder(IMAGE_MEDIA_ITEM) - .setDurationUs(IMAGE_DURATION_US) .setEffects( new Effects( /* audioProcessors= */ ImmutableList.of(), diff --git a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/CompositionPlayerTest.java b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/CompositionPlayerTest.java index 71cb2f9553..d03b64021a 100644 --- a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/CompositionPlayerTest.java +++ b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/CompositionPlayerTest.java @@ -243,7 +243,6 @@ public class CompositionPlayerTest { .setUri(JPG_SINGLE_PIXEL_ASSET.uri) .setImageDurationMs(1_000) .build()) - .setDurationUs(1_000_000) .build()) .build()) .build()); @@ -287,7 +286,6 @@ public class CompositionPlayerTest { MimeTypes.APPLICATION_EXTERNALLY_LOADED_IMAGE) .setImageDurationMs(1_000) .build()) - .setDurationUs(1_000_000) .build()) .build()) .build()); @@ -306,7 +304,6 @@ public class CompositionPlayerTest { .setUri(JPG_SINGLE_PIXEL_ASSET.uri) .setImageDurationMs(500) .build()) - .setDurationUs(500_000) .build(); instrumentation.runOnMainSync( @@ -335,7 +332,6 @@ public class CompositionPlayerTest { .setUri(JPG_SINGLE_PIXEL_ASSET.uri) .setImageDurationMs(500) .build()) - .setDurationUs(500_000) .build(); EditedMediaItem video = @@ -373,7 +369,6 @@ public class CompositionPlayerTest { .setUri(JPG_SINGLE_PIXEL_ASSET.uri) .setImageDurationMs(500) .build()) - .setDurationUs(500_000) .build(); instrumentation.runOnMainSync( diff --git a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/VideoTimestampConsistencyTest.java b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/VideoTimestampConsistencyTest.java index 3f37b55e84..cfbc0eb4c1 100644 --- a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/VideoTimestampConsistencyTest.java +++ b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/VideoTimestampConsistencyTest.java @@ -106,7 +106,6 @@ public class VideoTimestampConsistencyTest { .setUri(JPG_SINGLE_PIXEL_ASSET.uri) .setImageDurationMs(usToMs(imageDurationUs)) .build()) - .setDurationUs(imageDurationUs) .setFrameRate(30) .build(); @@ -237,7 +236,6 @@ public class VideoTimestampConsistencyTest { .setUri(JPG_SINGLE_PIXEL_ASSET.uri) .setImageDurationMs(usToMs(imageDurationUs)) .build()) - .setDurationUs(imageDurationUs) .setFrameRate(30) .build(); EditedMediaItem image2 = @@ -246,7 +244,6 @@ public class VideoTimestampConsistencyTest { .setUri(JPG_SINGLE_PIXEL_ASSET.uri) .setImageDurationMs(usToMs(imageDurationUs)) .build()) - .setDurationUs(imageDurationUs) .setFrameRate(30) .build(); @@ -274,7 +271,6 @@ public class VideoTimestampConsistencyTest { .setUri(JPG_SINGLE_PIXEL_ASSET.uri) .setImageDurationMs(usToMs(imageDurationUs)) .build()) - .setDurationUs(imageDurationUs) .setFrameRate(30) .build(); EditedMediaItem video = @@ -308,7 +304,6 @@ public class VideoTimestampConsistencyTest { .setUri(JPG_SINGLE_PIXEL_ASSET.uri) .setImageDurationMs(usToMs(imageDurationUs)) .build()) - .setDurationUs(imageDurationUs) .setFrameRate(30) .build(); @@ -347,7 +342,6 @@ public class VideoTimestampConsistencyTest { .setUri(JPG_SINGLE_PIXEL_ASSET.uri) .setImageDurationMs(usToMs(imageDurationUs)) .build()) - .setDurationUs(imageDurationUs) .setFrameRate(30) .build();