Skip to content

Commit 931562c

Browse files
hmschicbaker
authored andcommitted
Add option to disable debug preview.
This is useful for testing Transformer in the same way as it is used in tests and to see only the real transformation time. PiperOrigin-RevId: 456058466
1 parent 981baae commit 931562c

File tree

4 files changed

+24
-1
lines changed

4 files changed

+24
-1
lines changed

demos/transformer/src/main/java/androidx/media3/demo/transformer/ConfigurationActivity.java

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ public final class ConfigurationActivity extends AppCompatActivity {
5959
public static final String TRIM_START_MS = "trim_start_ms";
6060
public static final String TRIM_END_MS = "trim_end_ms";
6161
public static final String ENABLE_FALLBACK = "enable_fallback";
62+
public static final String ENABLE_DEBUG_PREVIEW = "enable_debug_preview";
6263
public static final String ENABLE_REQUEST_SDR_TONE_MAPPING = "enable_request_sdr_tone_mapping";
6364
public static final String ENABLE_HDR_EDITING = "enable_hdr_editing";
6465
public static final String DEMO_EFFECTS_SELECTIONS = "demo_effects_selections";
@@ -120,6 +121,7 @@ public final class ConfigurationActivity extends AppCompatActivity {
120121
private @MonotonicNonNull Spinner rotateSpinner;
121122
private @MonotonicNonNull CheckBox trimCheckBox;
122123
private @MonotonicNonNull CheckBox enableFallbackCheckBox;
124+
private @MonotonicNonNull CheckBox enableDebugPreviewCheckBox;
123125
private @MonotonicNonNull CheckBox enableRequestSdrToneMappingCheckBox;
124126
private @MonotonicNonNull CheckBox enableHdrEditingCheckBox;
125127
private @MonotonicNonNull Button selectDemoEffectsButton;
@@ -200,6 +202,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
200202
trimEndMs = C.TIME_UNSET;
201203

202204
enableFallbackCheckBox = findViewById(R.id.enable_fallback_checkbox);
205+
enableDebugPreviewCheckBox = findViewById(R.id.enable_debug_preview_checkbox);
203206
enableRequestSdrToneMappingCheckBox = findViewById(R.id.request_sdr_tone_mapping_checkbox);
204207
enableRequestSdrToneMappingCheckBox.setEnabled(isRequestSdrToneMappingSupported());
205208
findViewById(R.id.request_sdr_tone_mapping).setEnabled(isRequestSdrToneMappingSupported());
@@ -237,6 +240,7 @@ protected void onNewIntent(Intent intent) {
237240
"rotateSpinner",
238241
"trimCheckBox",
239242
"enableFallbackCheckBox",
243+
"enableDebugPreviewCheckBox",
240244
"enableRequestSdrToneMappingCheckBox",
241245
"enableHdrEditingCheckBox",
242246
"demoEffectsSelections"
@@ -275,6 +279,7 @@ private void startTransformation(View view) {
275279
bundle.putLong(TRIM_END_MS, trimEndMs);
276280
}
277281
bundle.putBoolean(ENABLE_FALLBACK, enableFallbackCheckBox.isChecked());
282+
bundle.putBoolean(ENABLE_DEBUG_PREVIEW, enableDebugPreviewCheckBox.isChecked());
278283
bundle.putBoolean(
279284
ENABLE_REQUEST_SDR_TONE_MAPPING, enableRequestSdrToneMappingCheckBox.isChecked());
280285
bundle.putBoolean(ENABLE_HDR_EDITING, enableHdrEditingCheckBox.isChecked());
@@ -377,6 +382,7 @@ private void selectDemoEffect(DialogInterface dialog, int which, boolean isCheck
377382
"resolutionHeightSpinner",
378383
"scaleSpinner",
379384
"rotateSpinner",
385+
"enableDebugPreviewCheckBox",
380386
"enableRequestSdrToneMappingCheckBox",
381387
"enableHdrEditingCheckBox",
382388
"selectDemoEffectsButton"
@@ -397,6 +403,7 @@ private void onRemoveAudio(View view) {
397403
"resolutionHeightSpinner",
398404
"scaleSpinner",
399405
"rotateSpinner",
406+
"enableDebugPreviewCheckBox",
400407
"enableRequestSdrToneMappingCheckBox",
401408
"enableHdrEditingCheckBox",
402409
"selectDemoEffectsButton"
@@ -416,6 +423,7 @@ private void onRemoveVideo(View view) {
416423
"resolutionHeightSpinner",
417424
"scaleSpinner",
418425
"rotateSpinner",
426+
"enableDebugPreviewCheckBox",
419427
"enableRequestSdrToneMappingCheckBox",
420428
"enableHdrEditingCheckBox",
421429
"selectDemoEffectsButton"
@@ -426,6 +434,7 @@ private void enableTrackSpecificOptions(boolean isAudioEnabled, boolean isVideoE
426434
resolutionHeightSpinner.setEnabled(isVideoEnabled);
427435
scaleSpinner.setEnabled(isVideoEnabled);
428436
rotateSpinner.setEnabled(isVideoEnabled);
437+
enableDebugPreviewCheckBox.setEnabled(isVideoEnabled);
429438
enableRequestSdrToneMappingCheckBox.setEnabled(
430439
isRequestSdrToneMappingSupported() && isVideoEnabled);
431440
enableHdrEditingCheckBox.setEnabled(isVideoEnabled);

demos/transformer/src/main/java/androidx/media3/demo/transformer/TransformerActivity.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -319,6 +319,10 @@ private Transformer createTransformer(@Nullable Bundle bundle, String filePath)
319319
}
320320
transformerBuilder.setVideoFrameEffects(effects.build());
321321
}
322+
323+
if (bundle.getBoolean(ConfigurationActivity.ENABLE_DEBUG_PREVIEW)) {
324+
transformerBuilder.setDebugViewProvider(new DemoDebugViewProvider());
325+
}
322326
}
323327
return transformerBuilder
324328
.addListener(
@@ -335,7 +339,6 @@ public void onTransformationError(
335339
TransformerActivity.this.onTransformationError(exception);
336340
}
337341
})
338-
.setDebugViewProvider(new DemoDebugViewProvider())
339342
.build();
340343
}
341344

demos/transformer/src/main/res/layout/configuration_activity.xml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,16 @@
179179
android:layout_gravity="right"
180180
android:checked="true"/>
181181
</TableRow>
182+
<TableRow
183+
android:layout_weight="1"
184+
android:gravity="center_vertical" >
185+
<TextView
186+
android:text="@string/enable_debug_preview" />
187+
<CheckBox
188+
android:id="@+id/enable_debug_preview_checkbox"
189+
android:layout_gravity="right"
190+
android:checked="true"/>
191+
</TableRow>
182192
<TableRow
183193
android:layout_weight="1"
184194
android:gravity="center_vertical" >

demos/transformer/src/main/res/values/strings.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
<string name="scale" translatable="false">Scale video</string>
2828
<string name="rotate" translatable="false">Rotate video (degrees)</string>
2929
<string name="enable_fallback" translatable="false">Enable fallback</string>
30+
<string name="enable_debug_preview" translatable="false">Enable debug preview</string>
3031
<string name="trim" translatable="false">Trim</string>
3132
<string name="request_sdr_tone_mapping" translatable="false">Request SDR tone-mapping (API 31+)</string>
3233
<string name="hdr_editing" translatable="false">[Experimental] HDR editing</string>

0 commit comments

Comments
 (0)