loliball/media
1
0
Fork 0
mirror of https://github.com/androidx/media.git synced 2025-04-30 06:46:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Stop calling setDurationUs when image duration already set

Browse Source 
The EditedMediaItem's duration is set to the MediaItem's image duration
by default.

PiperOrigin-RevId: 678597324
This commit is contained in:
kimvde 2024-09-25 01:58:37 -07:00 committed by Copybara-Service
parent fc07ce056a
commit f83d2b1392
3 changed files with 0 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libraries/transformer/src/androidTest/java/androidx/media3/transformer/CompositionPlaybackTest.java
View File

@ -111,7 +111,6 @@ public class CompositionPlaybackTest {
Effect videoEffect = (GlEffect) (context, useHdr) -> inputTimestampRecordingShaderProgram; Effect videoEffect = (GlEffect) (context, useHdr) -> inputTimestampRecordingShaderProgram;
EditedMediaItem editedMediaItem = EditedMediaItem editedMediaItem =
new EditedMediaItem.Builder(IMAGE_MEDIA_ITEM) new EditedMediaItem.Builder(IMAGE_MEDIA_ITEM)
.setDurationUs(IMAGE_DURATION_US)
.setEffects( .setEffects(
new Effects( new Effects(
/* audioProcessors= */ ImmutableList.of(), /* audioProcessors= */ ImmutableList.of(),
@ -159,7 +158,6 @@ public class CompositionPlaybackTest {
.build(); .build();
EditedMediaItem imageEditedMediaItem = EditedMediaItem imageEditedMediaItem =
new EditedMediaItem.Builder(IMAGE_MEDIA_ITEM) new EditedMediaItem.Builder(IMAGE_MEDIA_ITEM)
.setDurationUs(IMAGE_DURATION_US)
.setEffects( .setEffects(
new Effects( new Effects(
/* audioProcessors= */ ImmutableList.of(), /* audioProcessors= */ ImmutableList.of(),
@ -200,7 +198,6 @@ public class CompositionPlaybackTest {
Effect videoEffect = (GlEffect) (context, useHdr) -> inputTimestampRecordingShaderProgram; Effect videoEffect = (GlEffect) (context, useHdr) -> inputTimestampRecordingShaderProgram;
EditedMediaItem imageEditedMediaItem = EditedMediaItem imageEditedMediaItem =
new EditedMediaItem.Builder(IMAGE_MEDIA_ITEM) new EditedMediaItem.Builder(IMAGE_MEDIA_ITEM)
.setDurationUs(IMAGE_DURATION_US)
.setEffects( .setEffects(
new Effects( new Effects(
/* audioProcessors= */ ImmutableList.of(), /* audioProcessors= */ ImmutableList.of(),

5
libraries/transformer/src/androidTest/java/androidx/media3/transformer/CompositionPlayerTest.java
View File

@ -243,7 +243,6 @@ public class CompositionPlayerTest {
.setUri(JPG_SINGLE_PIXEL_ASSET.uri) .setUri(JPG_SINGLE_PIXEL_ASSET.uri)
.setImageDurationMs(1_000) .setImageDurationMs(1_000)
.build()) .build())
.setDurationUs(1_000_000)
.build()) .build())
.build()) .build())
.build()); .build());
@ -287,7 +286,6 @@ public class CompositionPlayerTest {
MimeTypes.APPLICATION_EXTERNALLY_LOADED_IMAGE) MimeTypes.APPLICATION_EXTERNALLY_LOADED_IMAGE)
.setImageDurationMs(1_000) .setImageDurationMs(1_000)
.build()) .build())
.setDurationUs(1_000_000)
.build()) .build())
.build()) .build())
.build()); .build());
@ -306,7 +304,6 @@ public class CompositionPlayerTest {
.setUri(JPG_SINGLE_PIXEL_ASSET.uri) .setUri(JPG_SINGLE_PIXEL_ASSET.uri)
.setImageDurationMs(500) .setImageDurationMs(500)
.build()) .build())
.setDurationUs(500_000)
.build(); .build();
instrumentation.runOnMainSync( instrumentation.runOnMainSync(
@ -335,7 +332,6 @@ public class CompositionPlayerTest {
.setUri(JPG_SINGLE_PIXEL_ASSET.uri) .setUri(JPG_SINGLE_PIXEL_ASSET.uri)
.setImageDurationMs(500) .setImageDurationMs(500)
.build()) .build())
.setDurationUs(500_000)
.build(); .build();
EditedMediaItem video = EditedMediaItem video =
@ -373,7 +369,6 @@ public class CompositionPlayerTest {
.setUri(JPG_SINGLE_PIXEL_ASSET.uri) .setUri(JPG_SINGLE_PIXEL_ASSET.uri)
.setImageDurationMs(500) .setImageDurationMs(500)
.build()) .build())
.setDurationUs(500_000)
.build(); .build();
instrumentation.runOnMainSync( instrumentation.runOnMainSync(

6
libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/VideoTimestampConsistencyTest.java
View File

@ -106,7 +106,6 @@ public class VideoTimestampConsistencyTest {
.setUri(JPG_SINGLE_PIXEL_ASSET.uri) .setUri(JPG_SINGLE_PIXEL_ASSET.uri)
.setImageDurationMs(usToMs(imageDurationUs)) .setImageDurationMs(usToMs(imageDurationUs))
.build()) .build())
.setDurationUs(imageDurationUs)
.setFrameRate(30) .setFrameRate(30)
.build(); .build();
@ -237,7 +236,6 @@ public class VideoTimestampConsistencyTest {
.setUri(JPG_SINGLE_PIXEL_ASSET.uri) .setUri(JPG_SINGLE_PIXEL_ASSET.uri)
.setImageDurationMs(usToMs(imageDurationUs)) .setImageDurationMs(usToMs(imageDurationUs))
.build()) .build())
.setDurationUs(imageDurationUs)
.setFrameRate(30) .setFrameRate(30)
.build(); .build();
EditedMediaItem image2 = EditedMediaItem image2 =
@ -246,7 +244,6 @@ public class VideoTimestampConsistencyTest {
.setUri(JPG_SINGLE_PIXEL_ASSET.uri) .setUri(JPG_SINGLE_PIXEL_ASSET.uri)
.setImageDurationMs(usToMs(imageDurationUs)) .setImageDurationMs(usToMs(imageDurationUs))
.build()) .build())
.setDurationUs(imageDurationUs)
.setFrameRate(30) .setFrameRate(30)
.build(); .build();
@ -274,7 +271,6 @@ public class VideoTimestampConsistencyTest {
.setUri(JPG_SINGLE_PIXEL_ASSET.uri) .setUri(JPG_SINGLE_PIXEL_ASSET.uri)
.setImageDurationMs(usToMs(imageDurationUs)) .setImageDurationMs(usToMs(imageDurationUs))
.build()) .build())
.setDurationUs(imageDurationUs)
.setFrameRate(30) .setFrameRate(30)
.build(); .build();
EditedMediaItem video = EditedMediaItem video =
@ -308,7 +304,6 @@ public class VideoTimestampConsistencyTest {
.setUri(JPG_SINGLE_PIXEL_ASSET.uri) .setUri(JPG_SINGLE_PIXEL_ASSET.uri)
.setImageDurationMs(usToMs(imageDurationUs)) .setImageDurationMs(usToMs(imageDurationUs))
.build()) .build())
.setDurationUs(imageDurationUs)
.setFrameRate(30) .setFrameRate(30)
.build(); .build();
@ -347,7 +342,6 @@ public class VideoTimestampConsistencyTest {
.setUri(JPG_SINGLE_PIXEL_ASSET.uri) .setUri(JPG_SINGLE_PIXEL_ASSET.uri)
.setImageDurationMs(usToMs(imageDurationUs)) .setImageDurationMs(usToMs(imageDurationUs))
.build()) .build())
.setDurationUs(imageDurationUs)
.setFrameRate(30) .setFrameRate(30)
.build(); .build();