Skip to content

Commit eb43f12

Browse files
shahdDaghashcopybara-github
authored andcommitted
Migrate TransformerMultiSequenceCompositionTest to use trackTypes
PiperOrigin-RevId: 819786820
1 parent bcc3f04 commit eb43f12

File tree

1 file changed

+49
-40
lines changed

1 file changed

+49
-40
lines changed

libraries/transformer/src/androidTest/java/androidx/media3/transformer/TransformerMultiSequenceCompositionTest.java

Lines changed: 49 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -117,16 +117,19 @@ public void export_withTwoSequencesEachWithOneVideoMediaItem_succeeds() throws E
117117
new Contrast(0.1f),
118118
Presentation.createForWidthAndHeight(
119119
EXPORT_WIDTH, EXPORT_HEIGHT, Presentation.LAYOUT_SCALE_TO_FIT)),
120-
/* firstSequenceMediaItems= */ ImmutableList.of(
121-
editedMediaItemByClippingVideo(
122-
MP4_ASSET.uri,
123-
/* effects= */ ImmutableList.of(
124-
new AlphaScale(0.5f),
125-
new ScaleAndRotateTransformation.Builder()
126-
.setRotationDegrees(180)
127-
.build()))),
128-
/* secondSequenceMediaItems= */ ImmutableList.of(
129-
editedMediaItemByClippingVideo(MP4_ASSET.uri, /* effects= */ ImmutableList.of())),
120+
/* firstSequence= */ EditedMediaItemSequence.withVideoFrom(
121+
ImmutableList.of(
122+
editedMediaItemByClippingVideo(
123+
MP4_ASSET.uri,
124+
/* effects= */ ImmutableList.of(
125+
new AlphaScale(0.5f),
126+
new ScaleAndRotateTransformation.Builder()
127+
.setRotationDegrees(180)
128+
.build())))),
129+
/* secondSequence= */ EditedMediaItemSequence.withVideoFrom(
130+
ImmutableList.of(
131+
editedMediaItemByClippingVideo(
132+
MP4_ASSET.uri, /* effects= */ ImmutableList.of()))),
130133
VideoCompositorSettings.DEFAULT);
131134

132135
ExportTestResult result =
@@ -153,16 +156,19 @@ public void export_withTwoSequencesOneWithVideoOneWithImage_succeeds() throws Ex
153156
new Contrast(0.1f),
154157
Presentation.createForWidthAndHeight(
155158
EXPORT_WIDTH, EXPORT_HEIGHT, Presentation.LAYOUT_SCALE_TO_FIT)),
156-
/* firstSequenceMediaItems= */ ImmutableList.of(
157-
editedMediaItemByClippingVideo(
158-
MP4_ASSET.uri,
159-
/* effects= */ ImmutableList.of(
160-
new AlphaScale(0.5f),
161-
new ScaleAndRotateTransformation.Builder()
162-
.setRotationDegrees(180)
163-
.build()))),
164-
/* secondSequenceMediaItems= */ ImmutableList.of(
165-
editedMediaItemOfOneFrameImage(JPG_ASSET.uri, /* effects= */ ImmutableList.of())),
159+
/* firstSequence= */ EditedMediaItemSequence.withVideoFrom(
160+
ImmutableList.of(
161+
editedMediaItemByClippingVideo(
162+
MP4_ASSET.uri,
163+
/* effects= */ ImmutableList.of(
164+
new AlphaScale(0.5f),
165+
new ScaleAndRotateTransformation.Builder()
166+
.setRotationDegrees(180)
167+
.build())))),
168+
/* secondSequence= */ EditedMediaItemSequence.withVideoFrom(
169+
ImmutableList.of(
170+
editedMediaItemOfOneFrameImage(
171+
JPG_ASSET.uri, /* effects= */ ImmutableList.of()))),
166172
VideoCompositorSettings.DEFAULT);
167173

168174
ExportTestResult result =
@@ -211,16 +217,19 @@ public OverlaySettings getOverlaySettings(int inputId, long presentationTimeUs)
211217
new Contrast(0.1f),
212218
Presentation.createForWidthAndHeight(
213219
EXPORT_WIDTH, EXPORT_HEIGHT, Presentation.LAYOUT_SCALE_TO_FIT)),
214-
/* firstSequenceMediaItems= */ ImmutableList.of(
215-
editedMediaItemByClippingVideo(
216-
MP4_ASSET.uri,
217-
/* effects= */ ImmutableList.of(
218-
new AlphaScale(0.5f),
219-
new ScaleAndRotateTransformation.Builder()
220-
.setRotationDegrees(180)
221-
.build()))),
222-
/* secondSequenceMediaItems= */ ImmutableList.of(
223-
editedMediaItemByClippingVideo(MP4_ASSET.uri, /* effects= */ ImmutableList.of())),
220+
/* firstSequence= */ EditedMediaItemSequence.withVideoFrom(
221+
ImmutableList.of(
222+
editedMediaItemByClippingVideo(
223+
MP4_ASSET.uri,
224+
/* effects= */ ImmutableList.of(
225+
new AlphaScale(0.5f),
226+
new ScaleAndRotateTransformation.Builder()
227+
.setRotationDegrees(180)
228+
.build())))),
229+
/* secondSequence= */ EditedMediaItemSequence.withVideoFrom(
230+
ImmutableList.of(
231+
editedMediaItemByClippingVideo(
232+
MP4_ASSET.uri, /* effects= */ ImmutableList.of()))),
224233
pictureInPictureVideoCompositorSettings);
225234

226235
ExportTestResult result =
@@ -249,10 +258,13 @@ public void export_completesWithConsistentFrameCount() throws Exception {
249258
EditedMediaItem editedMediaItem =
250259
new EditedMediaItem.Builder(mediaItem).setEffects(effects).build();
251260
Composition composition =
252-
new Composition.Builder(
253-
new EditedMediaItemSequence.Builder(editedMediaItem).build(),
254-
new EditedMediaItemSequence.Builder(editedMediaItem).build())
255-
.build();
261+
createComposition(
262+
/* compositionEffects= */ ImmutableList.of(),
263+
/* firstSequence= */ EditedMediaItemSequence.withAudioAndVideoFrom(
264+
ImmutableList.of(editedMediaItem)),
265+
/* secondSequence= */ EditedMediaItemSequence.withAudioAndVideoFrom(
266+
ImmutableList.of(editedMediaItem)),
267+
VideoCompositorSettings.DEFAULT);
256268

257269
ExportTestResult result =
258270
new TransformerAndroidTestRunner.Builder(context, buildTransformer())
@@ -303,14 +315,11 @@ private static EditedMediaItem editedMediaItemOfOneFrameImage(String uri, List<E
303315

304316
private static Composition createComposition(
305317
List<Effect> compositionEffects,
306-
List<EditedMediaItem> firstSequenceMediaItems,
307-
List<EditedMediaItem> secondSequenceMediaItems,
318+
EditedMediaItemSequence firstSequence,
319+
EditedMediaItemSequence secondSequence,
308320
VideoCompositorSettings videoCompositorSettings) {
309321

310-
return new Composition.Builder(
311-
ImmutableList.of(
312-
new EditedMediaItemSequence.Builder(firstSequenceMediaItems).build(),
313-
new EditedMediaItemSequence.Builder(secondSequenceMediaItems).build()))
322+
return new Composition.Builder(ImmutableList.of(firstSequence, secondSequence))
314323
.setEffects(
315324
new Effects(
316325
/* audioProcessors= */ ImmutableList.of(), /* videoEffects= */ compositionEffects))

0 commit comments

Comments
 (0)