sjs/media
1
0
Fork 0
mirror of https://github.com/samsonjs/media.git synced 2026-04-27 15:07:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add test that covers clipping all videos in a sequence

Browse source 
PiperOrigin-RevId: 649048322
This commit is contained in:
claincly 2024-07-03 06:10:09 -07:00 committed by Copybara-Service
parent b9d101f090
commit ce8ab84b7c
1 changed files with 51 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/VideoTimestampConsistencyTest.java
View file

@ -24,6 +24,7 @@ import static com.google.common.truth.Truth.assertThat;
import android.app.Instrumentation; import android.app.Instrumentation;
import android.content.Context; import android.content.Context;
import android.view.SurfaceView; import android.view.SurfaceView;
import androidx.media3.common.C;
import androidx.media3.common.Effect; import androidx.media3.common.Effect;
import androidx.media3.common.MediaItem; import androidx.media3.common.MediaItem;
import androidx.media3.effect.GlEffect; import androidx.media3.effect.GlEffect;
@ -126,7 +127,6 @@ public class VideoTimestampConsistencyTest {
@Test @Test
public void twoVideosComposition_clippingTheFirst_timestampsAreConsistent() throws Exception { public void twoVideosComposition_clippingTheFirst_timestampsAreConsistent() throws Exception {
// TODO - b/341279499: Add test that clips the second media.
long clippedStartUs = 500_000L; long clippedStartUs = 500_000L;
EditedMediaItem video1 = EditedMediaItem video1 =
new EditedMediaItem.Builder( new EditedMediaItem.Builder(
@ -158,6 +158,50 @@ public class VideoTimestampConsistencyTest {
ImmutableList.of(video1, video2), expectedTimestamps, /* containsImage= */ false); ImmutableList.of(video1, video2), expectedTimestamps, /* containsImage= */ false);
} }
@Test
public void twoVideosComposition_clippingBoth_timestampsAreConsistent() throws Exception {
long clippedStartUs1 = 500_000L;
EditedMediaItem video1 =
new EditedMediaItem.Builder(
MediaItem.fromUri(MP4_ASSET.uri)
.buildUpon()
.setClippingConfiguration(
new MediaItem.ClippingConfiguration.Builder()
.setStartPositionMs(usToMs(clippedStartUs1))
.build())
.build())
.setDurationUs(MP4_ASSET.videoDurationUs)
.build();
long clippedStartUs2 = 300_000L;
long clippedEndUs2 = 600_000L;
EditedMediaItem video2 =
new EditedMediaItem.Builder(
MediaItem.fromUri(MP4_ASSET.uri)
.buildUpon()
.setClippingConfiguration(
new MediaItem.ClippingConfiguration.Builder()
.setStartPositionMs(usToMs(clippedStartUs2))
.setEndPositionMs(usToMs(clippedEndUs2))
.build())
.build())
.setDurationUs(MP4_ASSET.videoDurationUs)
.build();
ImmutableList<Long> expectedTimestamps =
new ImmutableList.Builder<Long>()
.addAll(getClippedTimestamps(MP4_ASSET_FRAME_TIMESTAMPS_US, clippedStartUs1))
.addAll(
Lists.transform(
getClippedTimestamps(
MP4_ASSET_FRAME_TIMESTAMPS_US, clippedStartUs2, clippedEndUs2),
timestampUs -> ((MP4_ASSET.videoDurationUs - clippedStartUs1) + timestampUs)))
.build();
compareTimestamps(
ImmutableList.of(video1, video2), expectedTimestamps, /* containsImage= */ false);
}
@Test @Test
public void twoVideosComposition_timestampsAreConsistent() throws Exception { public void twoVideosComposition_timestampsAreConsistent() throws Exception {
EditedMediaItem video1 = EditedMediaItem video1 =
@ -446,9 +490,14 @@ public class VideoTimestampConsistencyTest {
} }
private static ImmutableList<Long> getClippedTimestamps(List<Long> timestamps, long clipStartUs) { private static ImmutableList<Long> getClippedTimestamps(List<Long> timestamps, long clipStartUs) {
return getClippedTimestamps(timestamps, clipStartUs, /* clipEndUs= */ C.TIME_UNSET);
}
private static ImmutableList<Long> getClippedTimestamps(
List<Long> timestamps, long clipStartUs, long clipEndUs) {
ImmutableList.Builder<Long> clippedTimestamps = new ImmutableList.Builder<>(); ImmutableList.Builder<Long> clippedTimestamps = new ImmutableList.Builder<>();
for (Long timestamp : timestamps) { for (Long timestamp : timestamps) {
if (timestamp < clipStartUs) { if (timestamp < clipStartUs || (clipEndUs != C.TIME_UNSET && timestamp > clipEndUs)) {
continue; continue;
} }
clippedTimestamps.add(timestamp - clipStartUs); clippedTimestamps.add(timestamp - clipStartUs);