Add checkbox in demo to enable watchdog timer
PiperOrigin-RevId: 490836952
This commit is contained in:
parent
67955e0ce3
commit
7fffe65717
@ -69,6 +69,7 @@ public final class ConfigurationActivity extends AppCompatActivity {
|
|||||||
public static final String TRIM_END_MS = "trim_end_ms";
|
public static final String TRIM_END_MS = "trim_end_ms";
|
||||||
public static final String ENABLE_FALLBACK = "enable_fallback";
|
public static final String ENABLE_FALLBACK = "enable_fallback";
|
||||||
public static final String ENABLE_DEBUG_PREVIEW = "enable_debug_preview";
|
public static final String ENABLE_DEBUG_PREVIEW = "enable_debug_preview";
|
||||||
|
public static final String ABORT_SLOW_TRANSFORMATION = "abort_slow_transformation";
|
||||||
public static final String HDR_MODE = "hdr_mode";
|
public static final String HDR_MODE = "hdr_mode";
|
||||||
public static final String DEMO_EFFECTS_SELECTIONS = "demo_effects_selections";
|
public static final String DEMO_EFFECTS_SELECTIONS = "demo_effects_selections";
|
||||||
public static final String PERIODIC_VIGNETTE_CENTER_X = "periodic_vignette_center_x";
|
public static final String PERIODIC_VIGNETTE_CENTER_X = "periodic_vignette_center_x";
|
||||||
@ -164,6 +165,7 @@ public final class ConfigurationActivity extends AppCompatActivity {
|
|||||||
private @MonotonicNonNull CheckBox trimCheckBox;
|
private @MonotonicNonNull CheckBox trimCheckBox;
|
||||||
private @MonotonicNonNull CheckBox enableFallbackCheckBox;
|
private @MonotonicNonNull CheckBox enableFallbackCheckBox;
|
||||||
private @MonotonicNonNull CheckBox enableDebugPreviewCheckBox;
|
private @MonotonicNonNull CheckBox enableDebugPreviewCheckBox;
|
||||||
|
private @MonotonicNonNull CheckBox abortSlowTransformationCheckBox;
|
||||||
private @MonotonicNonNull Spinner hdrModeSpinner;
|
private @MonotonicNonNull Spinner hdrModeSpinner;
|
||||||
private @MonotonicNonNull Button selectDemoEffectsButton;
|
private @MonotonicNonNull Button selectDemoEffectsButton;
|
||||||
private boolean @MonotonicNonNull [] demoEffectsSelections;
|
private boolean @MonotonicNonNull [] demoEffectsSelections;
|
||||||
@ -257,6 +259,8 @@ public final class ConfigurationActivity extends AppCompatActivity {
|
|||||||
enableFallbackCheckBox = findViewById(R.id.enable_fallback_checkbox);
|
enableFallbackCheckBox = findViewById(R.id.enable_fallback_checkbox);
|
||||||
enableDebugPreviewCheckBox = findViewById(R.id.enable_debug_preview_checkbox);
|
enableDebugPreviewCheckBox = findViewById(R.id.enable_debug_preview_checkbox);
|
||||||
|
|
||||||
|
abortSlowTransformationCheckBox = findViewById(R.id.abort_slow_transformation_checkbox);
|
||||||
|
|
||||||
ArrayAdapter<String> hdrModeAdapter =
|
ArrayAdapter<String> hdrModeAdapter =
|
||||||
new ArrayAdapter<>(/* context= */ this, R.layout.spinner_item);
|
new ArrayAdapter<>(/* context= */ this, R.layout.spinner_item);
|
||||||
hdrModeAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
|
hdrModeAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
|
||||||
@ -319,6 +323,7 @@ public final class ConfigurationActivity extends AppCompatActivity {
|
|||||||
"trimCheckBox",
|
"trimCheckBox",
|
||||||
"enableFallbackCheckBox",
|
"enableFallbackCheckBox",
|
||||||
"enableDebugPreviewCheckBox",
|
"enableDebugPreviewCheckBox",
|
||||||
|
"abortSlowTransformationCheckBox",
|
||||||
"hdrModeSpinner",
|
"hdrModeSpinner",
|
||||||
"demoEffectsSelections"
|
"demoEffectsSelections"
|
||||||
})
|
})
|
||||||
@ -357,6 +362,7 @@ public final class ConfigurationActivity extends AppCompatActivity {
|
|||||||
}
|
}
|
||||||
bundle.putBoolean(ENABLE_FALLBACK, enableFallbackCheckBox.isChecked());
|
bundle.putBoolean(ENABLE_FALLBACK, enableFallbackCheckBox.isChecked());
|
||||||
bundle.putBoolean(ENABLE_DEBUG_PREVIEW, enableDebugPreviewCheckBox.isChecked());
|
bundle.putBoolean(ENABLE_DEBUG_PREVIEW, enableDebugPreviewCheckBox.isChecked());
|
||||||
|
bundle.putBoolean(ABORT_SLOW_TRANSFORMATION, abortSlowTransformationCheckBox.isChecked());
|
||||||
String selectedhdrMode = String.valueOf(hdrModeSpinner.getSelectedItem());
|
String selectedhdrMode = String.valueOf(hdrModeSpinner.getSelectedItem());
|
||||||
bundle.putInt(HDR_MODE, checkNotNull(HDR_MODE_DESCRIPTIONS.get(selectedhdrMode)));
|
bundle.putInt(HDR_MODE, checkNotNull(HDR_MODE_DESCRIPTIONS.get(selectedhdrMode)));
|
||||||
bundle.putBooleanArray(DEMO_EFFECTS_SELECTIONS, demoEffectsSelections);
|
bundle.putBooleanArray(DEMO_EFFECTS_SELECTIONS, demoEffectsSelections);
|
||||||
|
@ -49,6 +49,7 @@ import com.google.android.exoplayer2.effect.RgbFilter;
|
|||||||
import com.google.android.exoplayer2.effect.RgbMatrix;
|
import com.google.android.exoplayer2.effect.RgbMatrix;
|
||||||
import com.google.android.exoplayer2.effect.SingleColorLut;
|
import com.google.android.exoplayer2.effect.SingleColorLut;
|
||||||
import com.google.android.exoplayer2.transformer.DefaultEncoderFactory;
|
import com.google.android.exoplayer2.transformer.DefaultEncoderFactory;
|
||||||
|
import com.google.android.exoplayer2.transformer.DefaultMuxer;
|
||||||
import com.google.android.exoplayer2.transformer.ProgressHolder;
|
import com.google.android.exoplayer2.transformer.ProgressHolder;
|
||||||
import com.google.android.exoplayer2.transformer.TransformationException;
|
import com.google.android.exoplayer2.transformer.TransformationException;
|
||||||
import com.google.android.exoplayer2.transformer.TransformationRequest;
|
import com.google.android.exoplayer2.transformer.TransformationRequest;
|
||||||
@ -285,7 +286,13 @@ public final class TransformerActivity extends AppCompatActivity {
|
|||||||
if (bundle.getBoolean(ConfigurationActivity.ENABLE_DEBUG_PREVIEW)) {
|
if (bundle.getBoolean(ConfigurationActivity.ENABLE_DEBUG_PREVIEW)) {
|
||||||
transformerBuilder.setDebugViewProvider(new DemoDebugViewProvider());
|
transformerBuilder.setDebugViewProvider(new DemoDebugViewProvider());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (!bundle.getBoolean(ConfigurationActivity.ABORT_SLOW_TRANSFORMATION)) {
|
||||||
|
transformerBuilder.setMuxerFactory(
|
||||||
|
new DefaultMuxer.Factory(/* maxDelayBetweenSamplesMs= */ C.TIME_UNSET));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return transformerBuilder
|
return transformerBuilder
|
||||||
.addListener(
|
.addListener(
|
||||||
new Transformer.Listener() {
|
new Transformer.Listener() {
|
||||||
|
@ -197,6 +197,15 @@
|
|||||||
android:layout_gravity="end"
|
android:layout_gravity="end"
|
||||||
android:checked="true"/>
|
android:checked="true"/>
|
||||||
</TableRow>
|
</TableRow>
|
||||||
|
<TableRow
|
||||||
|
android:layout_weight="1">
|
||||||
|
<TextView
|
||||||
|
android:layout_gravity="center_vertical"
|
||||||
|
android:text="@string/abort_slow_transformation" />
|
||||||
|
<CheckBox
|
||||||
|
android:id="@+id/abort_slow_transformation_checkbox"
|
||||||
|
android:layout_gravity="end"/>
|
||||||
|
</TableRow>
|
||||||
<TableRow
|
<TableRow
|
||||||
android:layout_weight="1"
|
android:layout_weight="1"
|
||||||
android:gravity="center_vertical" >
|
android:gravity="center_vertical" >
|
||||||
|
@ -29,6 +29,7 @@
|
|||||||
<string name="rotate" translatable="false">Rotate video (degrees)</string>
|
<string name="rotate" translatable="false">Rotate video (degrees)</string>
|
||||||
<string name="enable_fallback" translatable="false">Enable fallback</string>
|
<string name="enable_fallback" translatable="false">Enable fallback</string>
|
||||||
<string name="enable_debug_preview" translatable="false">Enable debug preview</string>
|
<string name="enable_debug_preview" translatable="false">Enable debug preview</string>
|
||||||
|
<string name="abort_slow_transformation" translatable="false">Abort slow transformation</string>
|
||||||
<string name="trim" translatable="false">Trim</string>
|
<string name="trim" translatable="false">Trim</string>
|
||||||
<string name="hdr_mode" translatable="false">HDR mode</string>
|
<string name="hdr_mode" translatable="false">HDR mode</string>
|
||||||
<string name="select_demo_effects" translatable="false">Add demo effects</string>
|
<string name="select_demo_effects" translatable="false">Add demo effects</string>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user