Skip to content

SDK / exoplayer

Go to a project
Commit 53978104 by huangdarwin Committed by Ian Baker
Options

HDR: For HDR videos, enableHdrEditing by default. 

Previously, tone-mapping was the default.

PiperOrigin-RevId: 488362209
parent afb7926a
Inline Side-by-side
Showing with 23 additions and 101 deletions
demos/transformer/src/main/java/com/google/android/exoplayer2/transformerdemo/ConfigurationActivity.java
...@@ -69,7 +69,6 @@ public final class ConfigurationActivity extends AppCompatActivity { ...@@ -69,7 +69,6 @@ public final class ConfigurationActivity extends AppCompatActivity {
public static final String ENABLE_DEBUG_PREVIEW = "enable_debug_preview"; public static final String ENABLE_DEBUG_PREVIEW = "enable_debug_preview";
public static final String ENABLE_REQUEST_SDR_TONE_MAPPING = "enable_request_sdr_tone_mapping"; public static final String ENABLE_REQUEST_SDR_TONE_MAPPING = "enable_request_sdr_tone_mapping";
public static final String FORCE_INTERPRET_HDR_VIDEO_AS_SDR = "force_interpret_hdr_video_as_sdr"; public static final String FORCE_INTERPRET_HDR_VIDEO_AS_SDR = "force_interpret_hdr_video_as_sdr";
public static final String ENABLE_HDR_EDITING = "enable_hdr_editing";
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";
public static final String PERIODIC_VIGNETTE_CENTER_Y = "periodic_vignette_center_y"; public static final String PERIODIC_VIGNETTE_CENTER_Y = "periodic_vignette_center_y";
...@@ -157,7 +156,6 @@ public final class ConfigurationActivity extends AppCompatActivity { ...@@ -157,7 +156,6 @@ public final class ConfigurationActivity extends AppCompatActivity {
private @MonotonicNonNull CheckBox enableDebugPreviewCheckBox; private @MonotonicNonNull CheckBox enableDebugPreviewCheckBox;
private @MonotonicNonNull CheckBox enableRequestSdrToneMappingCheckBox; private @MonotonicNonNull CheckBox enableRequestSdrToneMappingCheckBox;
private @MonotonicNonNull CheckBox forceInterpretHdrVideoAsSdrCheckBox; private @MonotonicNonNull CheckBox forceInterpretHdrVideoAsSdrCheckBox;
private @MonotonicNonNull CheckBox enableHdrEditingCheckBox;
private @MonotonicNonNull Button selectDemoEffectsButton; private @MonotonicNonNull Button selectDemoEffectsButton;
private boolean @MonotonicNonNull [] demoEffectsSelections; private boolean @MonotonicNonNull [] demoEffectsSelections;
private @Nullable Uri localFileUri; private @Nullable Uri localFileUri;
...@@ -254,7 +252,6 @@ public final class ConfigurationActivity extends AppCompatActivity { ...@@ -254,7 +252,6 @@ public final class ConfigurationActivity extends AppCompatActivity {
findViewById(R.id.request_sdr_tone_mapping).setEnabled(isRequestSdrToneMappingSupported()); findViewById(R.id.request_sdr_tone_mapping).setEnabled(isRequestSdrToneMappingSupported());
forceInterpretHdrVideoAsSdrCheckBox = forceInterpretHdrVideoAsSdrCheckBox =
findViewById(R.id.force_interpret_hdr_video_as_sdr_checkbox); findViewById(R.id.force_interpret_hdr_video_as_sdr_checkbox);
enableHdrEditingCheckBox = findViewById(R.id.hdr_editing_checkbox);
demoEffectsSelections = new boolean[DEMO_EFFECTS.length]; demoEffectsSelections = new boolean[DEMO_EFFECTS.length];
selectDemoEffectsButton = findViewById(R.id.select_demo_effects_button); selectDemoEffectsButton = findViewById(R.id.select_demo_effects_button);
...@@ -313,7 +310,6 @@ public final class ConfigurationActivity extends AppCompatActivity { ...@@ -313,7 +310,6 @@ public final class ConfigurationActivity extends AppCompatActivity {
"enableDebugPreviewCheckBox", "enableDebugPreviewCheckBox",
"enableRequestSdrToneMappingCheckBox", "enableRequestSdrToneMappingCheckBox",
"forceInterpretHdrVideoAsSdrCheckBox", "forceInterpretHdrVideoAsSdrCheckBox",
"enableHdrEditingCheckBox",
"demoEffectsSelections" "demoEffectsSelections"
}) })
private void startTransformation(View view) { private void startTransformation(View view) {
...@@ -355,7 +351,6 @@ public final class ConfigurationActivity extends AppCompatActivity { ...@@ -355,7 +351,6 @@ public final class ConfigurationActivity extends AppCompatActivity {
ENABLE_REQUEST_SDR_TONE_MAPPING, enableRequestSdrToneMappingCheckBox.isChecked()); ENABLE_REQUEST_SDR_TONE_MAPPING, enableRequestSdrToneMappingCheckBox.isChecked());
bundle.putBoolean( bundle.putBoolean(
FORCE_INTERPRET_HDR_VIDEO_AS_SDR, forceInterpretHdrVideoAsSdrCheckBox.isChecked()); FORCE_INTERPRET_HDR_VIDEO_AS_SDR, forceInterpretHdrVideoAsSdrCheckBox.isChecked());
bundle.putBoolean(ENABLE_HDR_EDITING, enableHdrEditingCheckBox.isChecked());
bundle.putBooleanArray(DEMO_EFFECTS_SELECTIONS, demoEffectsSelections); bundle.putBooleanArray(DEMO_EFFECTS_SELECTIONS, demoEffectsSelections);
bundle.putInt(COLOR_FILTER_SELECTION, colorFilterSelection); bundle.putInt(COLOR_FILTER_SELECTION, colorFilterSelection);
bundle.putFloat(CONTRAST_VALUE, contrastValue); bundle.putFloat(CONTRAST_VALUE, contrastValue);
...@@ -595,7 +590,6 @@ public final class ConfigurationActivity extends AppCompatActivity { ...@@ -595,7 +590,6 @@ public final class ConfigurationActivity extends AppCompatActivity {
"enableDebugPreviewCheckBox", "enableDebugPreviewCheckBox",
"enableRequestSdrToneMappingCheckBox", "enableRequestSdrToneMappingCheckBox",
"forceInterpretHdrVideoAsSdrCheckBox", "forceInterpretHdrVideoAsSdrCheckBox",
"enableHdrEditingCheckBox",
"selectDemoEffectsButton" "selectDemoEffectsButton"
}) })
private void onRemoveAudio(View view) { private void onRemoveAudio(View view) {
...@@ -617,7 +611,6 @@ public final class ConfigurationActivity extends AppCompatActivity { ...@@ -617,7 +611,6 @@ public final class ConfigurationActivity extends AppCompatActivity {
"enableDebugPreviewCheckBox", "enableDebugPreviewCheckBox",
"enableRequestSdrToneMappingCheckBox", "enableRequestSdrToneMappingCheckBox",
"forceInterpretHdrVideoAsSdrCheckBox", "forceInterpretHdrVideoAsSdrCheckBox",
"enableHdrEditingCheckBox",
"selectDemoEffectsButton" "selectDemoEffectsButton"
}) })
private void onRemoveVideo(View view) { private void onRemoveVideo(View view) {
...@@ -638,7 +631,6 @@ public final class ConfigurationActivity extends AppCompatActivity { ...@@ -638,7 +631,6 @@ public final class ConfigurationActivity extends AppCompatActivity {
"enableDebugPreviewCheckBox", "enableDebugPreviewCheckBox",
"enableRequestSdrToneMappingCheckBox", "enableRequestSdrToneMappingCheckBox",
"forceInterpretHdrVideoAsSdrCheckBox", "forceInterpretHdrVideoAsSdrCheckBox",
"enableHdrEditingCheckBox",
"selectDemoEffectsButton" "selectDemoEffectsButton"
}) })
private void enableTrackSpecificOptions(boolean isAudioEnabled, boolean isVideoEnabled) { private void enableTrackSpecificOptions(boolean isAudioEnabled, boolean isVideoEnabled) {
...@@ -651,7 +643,6 @@ public final class ConfigurationActivity extends AppCompatActivity { ...@@ -651,7 +643,6 @@ public final class ConfigurationActivity extends AppCompatActivity {
enableRequestSdrToneMappingCheckBox.setEnabled( enableRequestSdrToneMappingCheckBox.setEnabled(
isRequestSdrToneMappingSupported() && isVideoEnabled); isRequestSdrToneMappingSupported() && isVideoEnabled);
forceInterpretHdrVideoAsSdrCheckBox.setEnabled(isVideoEnabled); forceInterpretHdrVideoAsSdrCheckBox.setEnabled(isVideoEnabled);
enableHdrEditingCheckBox.setEnabled(isVideoEnabled);
selectDemoEffectsButton.setEnabled(isVideoEnabled); selectDemoEffectsButton.setEnabled(isVideoEnabled);
findViewById(R.id.audio_mime_text_view).setEnabled(isAudioEnabled); findViewById(R.id.audio_mime_text_view).setEnabled(isAudioEnabled);
...@@ -662,7 +653,6 @@ public final class ConfigurationActivity extends AppCompatActivity { ...@@ -662,7 +653,6 @@ public final class ConfigurationActivity extends AppCompatActivity {
findViewById(R.id.request_sdr_tone_mapping) findViewById(R.id.request_sdr_tone_mapping)
.setEnabled(isRequestSdrToneMappingSupported() && isVideoEnabled); .setEnabled(isRequestSdrToneMappingSupported() && isVideoEnabled);
findViewById(R.id.force_interpret_hdr_video_as_sdr).setEnabled(isVideoEnabled); findViewById(R.id.force_interpret_hdr_video_as_sdr).setEnabled(isVideoEnabled);
findViewById(R.id.hdr_editing).setEnabled(isVideoEnabled);
} }
private static boolean isRequestSdrToneMappingSupported() { private static boolean isRequestSdrToneMappingSupported() {
......
demos/transformer/src/main/java/com/google/android/exoplayer2/transformerdemo/TransformerActivity.java
...@@ -274,8 +274,6 @@ public final class TransformerActivity extends AppCompatActivity { ...@@ -274,8 +274,6 @@ public final class TransformerActivity extends AppCompatActivity {
bundle.getBoolean(ConfigurationActivity.ENABLE_REQUEST_SDR_TONE_MAPPING)); bundle.getBoolean(ConfigurationActivity.ENABLE_REQUEST_SDR_TONE_MAPPING));
requestBuilder.experimental_setForceInterpretHdrVideoAsSdr( requestBuilder.experimental_setForceInterpretHdrVideoAsSdr(
bundle.getBoolean(ConfigurationActivity.FORCE_INTERPRET_HDR_VIDEO_AS_SDR)); bundle.getBoolean(ConfigurationActivity.FORCE_INTERPRET_HDR_VIDEO_AS_SDR));
requestBuilder.experimental_setEnableHdrEditing(
bundle.getBoolean(ConfigurationActivity.ENABLE_HDR_EDITING));
transformerBuilder transformerBuilder
.setTransformationRequest(requestBuilder.build()) .setTransformationRequest(requestBuilder.build())
.setRemoveAudio(bundle.getBoolean(ConfigurationActivity.SHOULD_REMOVE_AUDIO)) .setRemoveAudio(bundle.getBoolean(ConfigurationActivity.SHOULD_REMOVE_AUDIO))
......
demos/transformer/src/main/res/layout/configuration_activity.xml
...@@ -211,16 +211,6 @@ ...@@ -211,16 +211,6 @@
android:layout_weight="1"> android:layout_weight="1">
<TextView <TextView
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:id="@+id/hdr_editing"
android:text="@string/hdr_editing" />
<CheckBox
android:id="@+id/hdr_editing_checkbox"
android:layout_gravity="end" />
</TableRow>
<TableRow
android:layout_weight="1">
<TextView
android:layout_gravity="center_vertical"
android:id="@+id/force_interpret_hdr_video_as_sdr" android:id="@+id/force_interpret_hdr_video_as_sdr"
android:text="@string/force_interpret_hdr_video_as_sdr" /> android:text="@string/force_interpret_hdr_video_as_sdr" />
<CheckBox <CheckBox
......
demos/transformer/src/main/res/values/strings.xml
...@@ -32,7 +32,6 @@ ...@@ -32,7 +32,6 @@
<string name="trim" translatable="false">Trim</string> <string name="trim" translatable="false">Trim</string>
<string name="request_sdr_tone_mapping" translatable="false">Request SDR tone-mapping (API 31+)</string> <string name="request_sdr_tone_mapping" translatable="false">Request SDR tone-mapping (API 31+)</string>
<string name="force_interpret_hdr_video_as_sdr" translatable="false">[Experimental] Force interpret HDR video as SDR (API 29+)</string> <string name="force_interpret_hdr_video_as_sdr" translatable="false">[Experimental] Force interpret HDR video as SDR (API 29+)</string>
<string name="hdr_editing" translatable="false">[Experimental] HDR editing (API 31+)</string>
<string name="select_demo_effects" translatable="false">Add demo effects</string> <string name="select_demo_effects" translatable="false">Add demo effects</string>
<string name="periodic_vignette_options" translatable="false">Periodic vignette options</string> <string name="periodic_vignette_options" translatable="false">Periodic vignette options</string>
<string name="no_media_pipe_error" translatable="false">Failed to load MediaPipe processor. Check the README for instructions.</string> <string name="no_media_pipe_error" translatable="false">Failed to load MediaPipe processor. Check the README for instructions.</string>
......
library/transformer/src/androidTest/java/com/google/android/exoplayer2/transformer/mh/SetHdrEditingTest.java
...@@ -43,10 +43,7 @@ import java.util.concurrent.atomic.AtomicBoolean; ...@@ -43,10 +43,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
/** /** {@link Transformer} instrumentation test for applying an HDR frame edit. */
* {@link Transformer} instrumentation test for applying an {@linkplain
* TransformationRequest.Builder#experimental_setEnableHdrEditing HDR frame edit}.
*/
@RunWith(AndroidJUnit4.class) @RunWith(AndroidJUnit4.class)
public class SetHdrEditingTest { public class SetHdrEditingTest {
public static final String TAG = "SetHdrEditingTest"; public static final String TAG = "SetHdrEditingTest";
...@@ -68,11 +65,7 @@ public class SetHdrEditingTest { ...@@ -68,11 +65,7 @@ public class SetHdrEditingTest {
String testId = "transform_noRequestedTranscode_hdr10File_transformsOrThrows"; String testId = "transform_noRequestedTranscode_hdr10File_transformsOrThrows";
Context context = ApplicationProvider.getApplicationContext(); Context context = ApplicationProvider.getApplicationContext();
Transformer transformer = Transformer transformer = new Transformer.Builder(context).build();
new Transformer.Builder(context)
.setTransformationRequest(
new TransformationRequest.Builder().experimental_setEnableHdrEditing(true).build())
.build();
try { try {
TransformationTestResult transformationTestResult = TransformationTestResult transformationTestResult =
...@@ -95,11 +88,7 @@ public class SetHdrEditingTest { ...@@ -95,11 +88,7 @@ public class SetHdrEditingTest {
String testId = "transform_noRequestedTranscode_hlg10File_transformsOrThrows"; String testId = "transform_noRequestedTranscode_hlg10File_transformsOrThrows";
Context context = ApplicationProvider.getApplicationContext(); Context context = ApplicationProvider.getApplicationContext();
Transformer transformer = Transformer transformer = new Transformer.Builder(context).build();
new Transformer.Builder(context)
.setTransformationRequest(
new TransformationRequest.Builder().experimental_setEnableHdrEditing(true).build())
.build();
try { try {
TransformationTestResult transformationTestResult = TransformationTestResult transformationTestResult =
...@@ -130,10 +119,7 @@ public class SetHdrEditingTest { ...@@ -130,10 +119,7 @@ public class SetHdrEditingTest {
Transformer transformer = Transformer transformer =
new Transformer.Builder(context) new Transformer.Builder(context)
.setTransformationRequest( .setTransformationRequest(
new TransformationRequest.Builder() new TransformationRequest.Builder().setRotationDegrees(180).build())
.experimental_setEnableHdrEditing(true)
.setRotationDegrees(180)
.build())
.build(); .build();
TransformationTestResult transformationTestResult = TransformationTestResult transformationTestResult =
...@@ -156,10 +142,7 @@ public class SetHdrEditingTest { ...@@ -156,10 +142,7 @@ public class SetHdrEditingTest {
Transformer transformer = Transformer transformer =
new Transformer.Builder(context) new Transformer.Builder(context)
.setTransformationRequest( .setTransformationRequest(
new TransformationRequest.Builder() new TransformationRequest.Builder().setRotationDegrees(180).build())
.experimental_setEnableHdrEditing(true)
.setRotationDegrees(180)
.build())
.build(); .build();
TransformationTestResult transformationTestResult = TransformationTestResult transformationTestResult =
...@@ -184,10 +167,7 @@ public class SetHdrEditingTest { ...@@ -184,10 +167,7 @@ public class SetHdrEditingTest {
Transformer transformer = Transformer transformer =
new Transformer.Builder(context) new Transformer.Builder(context)
.setTransformationRequest( .setTransformationRequest(
new TransformationRequest.Builder() new TransformationRequest.Builder().setRotationDegrees(180).build())
.experimental_setEnableHdrEditing(true)
.setRotationDegrees(180)
.build())
.addListener( .addListener(
new Transformer.Listener() { new Transformer.Listener() {
@Override @Override
...@@ -238,10 +218,7 @@ public class SetHdrEditingTest { ...@@ -238,10 +218,7 @@ public class SetHdrEditingTest {
Transformer transformer = Transformer transformer =
new Transformer.Builder(context) new Transformer.Builder(context)
.setTransformationRequest( .setTransformationRequest(
new TransformationRequest.Builder() new TransformationRequest.Builder().setRotationDegrees(180).build())
.experimental_setEnableHdrEditing(true)
.setRotationDegrees(180)
.build())
.addListener( .addListener(
new Transformer.Listener() { new Transformer.Listener() {
@Override @Override
...@@ -289,11 +266,7 @@ public class SetHdrEditingTest { ...@@ -289,11 +266,7 @@ public class SetHdrEditingTest {
return; return;
} }
Transformer transformer = Transformer transformer = new Transformer.Builder(context).build();
new Transformer.Builder(context)
.setTransformationRequest(
new TransformationRequest.Builder().experimental_setEnableHdrEditing(true).build())
.build();
new TransformerAndroidTestRunner.Builder(context, transformer) new TransformerAndroidTestRunner.Builder(context, transformer)
.build() .build()
.run( .run(
......
library/transformer/src/main/java/com/google/android/exoplayer2/transformer/FallbackListener.java
...@@ -95,10 +95,6 @@ import com.google.android.exoplayer2.util.Util; ...@@ -95,10 +95,6 @@ import com.google.android.exoplayer2.util.Util;
if (transformationRequest.outputHeight != originalTransformationRequest.outputHeight) { if (transformationRequest.outputHeight != originalTransformationRequest.outputHeight) {
fallbackRequestBuilder.setResolution(transformationRequest.outputHeight); fallbackRequestBuilder.setResolution(transformationRequest.outputHeight);
} }
if (transformationRequest.enableHdrEditing != originalTransformationRequest.enableHdrEditing) {
fallbackRequestBuilder.experimental_setEnableHdrEditing(
transformationRequest.enableHdrEditing);
}
if (transformationRequest.enableRequestSdrToneMapping if (transformationRequest.enableRequestSdrToneMapping
!= originalTransformationRequest.enableRequestSdrToneMapping) { != originalTransformationRequest.enableRequestSdrToneMapping) {
fallbackRequestBuilder.setEnableRequestSdrToneMapping( fallbackRequestBuilder.setEnableRequestSdrToneMapping(
......
library/transformer/src/main/java/com/google/android/exoplayer2/transformer/TransformationRequest.java
...@@ -53,6 +53,7 @@ public final class TransformationRequest { ...@@ -53,6 +53,7 @@ public final class TransformationRequest {
scaleX = 1; scaleX = 1;
scaleY = 1; scaleY = 1;
outputHeight = C.LENGTH_UNSET; outputHeight = C.LENGTH_UNSET;
enableHdrEditing = true;
} }
private Builder(TransformationRequest transformationRequest) { private Builder(TransformationRequest transformationRequest) {
...@@ -218,13 +219,14 @@ public final class TransformationRequest { ...@@ -218,13 +219,14 @@ public final class TransformationRequest {
* supported, high dynamic range (HDR) input will be tone-mapped into an SDR opto-electrical * supported, high dynamic range (HDR) input will be tone-mapped into an SDR opto-electrical
* transfer function before processing. * transfer function before processing.
* *
* <p>The default value is {@code true}, which corresponds to tone-mapping output if possible. * <p>The default value is {@code false}, which corresponds to editing and outputting HDR video
* if possible, and falling back to tone-mapping if not.
* *
* <p>The setting has no effect if the input is already in SDR, or if tone-mapping is not * <p>The setting has no effect if the input is already in SDR, or if tone-mapping is not
* supported. Currently tone-mapping is only guaranteed to be supported from Android T onwards. * supported. Currently tone-mapping is only guaranteed to be supported from Android T onwards.
* *
* <p>Setting this as {@code true} will set {@linkplain #experimental_setEnableHdrEditing} and * <p>Setting this as {@code true} will set {@linkplain #enableHdrEditing} and {@linkplain
* {@linkplain #forceInterpretHdrVideoAsSdr} to {@code false}. * #forceInterpretHdrVideoAsSdr} to {@code false}.
* *
* @param enableRequestSdrToneMapping Whether to request tone-mapping down to SDR. * @param enableRequestSdrToneMapping Whether to request tone-mapping down to SDR.
* @return This builder. * @return This builder.
...@@ -233,8 +235,8 @@ public final class TransformationRequest { ...@@ -233,8 +235,8 @@ public final class TransformationRequest {
public Builder setEnableRequestSdrToneMapping(boolean enableRequestSdrToneMapping) { public Builder setEnableRequestSdrToneMapping(boolean enableRequestSdrToneMapping) {
this.enableRequestSdrToneMapping = enableRequestSdrToneMapping; this.enableRequestSdrToneMapping = enableRequestSdrToneMapping;
if (enableRequestSdrToneMapping) { if (enableRequestSdrToneMapping) {
forceInterpretHdrVideoAsSdr = false;
enableHdrEditing = false; enableHdrEditing = false;
forceInterpretHdrVideoAsSdr = false;
} }
return this; return this;
} }
...@@ -242,8 +244,8 @@ public final class TransformationRequest { ...@@ -242,8 +244,8 @@ public final class TransformationRequest {
/** /**
* Sets whether to interpret HDR video as SDR, resulting in washed out video. * Sets whether to interpret HDR video as SDR, resulting in washed out video.
* *
* <p>The default value is {@code false}, with {@link #setEnableRequestSdrToneMapping} being * <p>The default value is {@code false}, which corresponds to editing and outputting HDR video
* applied. * if possible, and falling back to tone-mapping if not.
* *
* <p>Use of this flag may result in {@code * <p>Use of this flag may result in {@code
* TransformationException.ERROR_CODE_HDR_DECODING_UNSUPPORTED} or {@code * TransformationException.ERROR_CODE_HDR_DECODING_UNSUPPORTED} or {@code
...@@ -257,8 +259,8 @@ public final class TransformationRequest { ...@@ -257,8 +259,8 @@ public final class TransformationRequest {
* *
* <p>The setting has no effect if the input is already in SDR. * <p>The setting has no effect if the input is already in SDR.
* *
* <p>Setting this as {@code true} will set {@linkplain #experimental_setEnableHdrEditing} and * <p>Setting this as {@code true} will set {@linkplain #enableHdrEditing} and {@linkplain
* {@linkplain #forceInterpretHdrVideoAsSdr} to {@code false}. * #forceInterpretHdrVideoAsSdr} to {@code false}.
* *
* @param forceInterpretHdrVideoAsSdr Whether to interpret HDR contents as SDR. * @param forceInterpretHdrVideoAsSdr Whether to interpret HDR contents as SDR.
* @return This builder. * @return This builder.
...@@ -276,32 +278,12 @@ public final class TransformationRequest { ...@@ -276,32 +278,12 @@ public final class TransformationRequest {
} }
/** /**
* Sets whether to allow processing high dynamic range (HDR) input video streams as HDR. * @deprecated This method is now a no-op. (@code experimental_setEnableHdrEditing(true)} is now
* * the default behavior.
* <p>The default value is {@code false}, with {@link #setEnableRequestSdrToneMapping} being
* applied.
*
* <p>This method is experimental, and will be renamed or removed in a future release. The HDR
* editing feature is under development and is intended for developing/testing HDR support.
*
* <p>Setting this as {@code true} will set {@linkplain #experimental_setEnableHdrEditing} and
* {@linkplain #forceInterpretHdrVideoAsSdr} to {@code false}.
*
* <p>With this flag enabled, HDR streams will correctly edit in HDR, convert via tone-mapping
* to SDR, or throw an error, based on the device's HDR support. SDR streams will be interpreted
* the same way regardless of this flag's state.
*
* @param enableHdrEditing Whether to attempt to process any input video stream as a high
* dynamic range (HDR) signal.
* @return This builder.
*/ */
@Deprecated
@CanIgnoreReturnValue @CanIgnoreReturnValue
public Builder experimental_setEnableHdrEditing(boolean enableHdrEditing) { public Builder experimental_setEnableHdrEditing(boolean enableHdrEditing) {
this.enableHdrEditing = enableHdrEditing;
if (enableHdrEditing) {
enableRequestSdrToneMapping = false;
forceInterpretHdrVideoAsSdr = false;
}
return this; return this;
} }
...@@ -373,11 +355,7 @@ public final class TransformationRequest { ...@@ -373,11 +355,7 @@ public final class TransformationRequest {
/** Whether to force interpreting HDR video as SDR. */ /** Whether to force interpreting HDR video as SDR. */
public final boolean forceInterpretHdrVideoAsSdr; public final boolean forceInterpretHdrVideoAsSdr;
/** /** Whether to attempt to process any input video stream as a high dynamic range (HDR) signal. */
* Whether to attempt to process any input video stream as a high dynamic range (HDR) signal.
*
* @see Builder#experimental_setEnableHdrEditing(boolean)
*/
public final boolean enableHdrEditing; public final boolean enableHdrEditing;
private TransformationRequest( private TransformationRequest(
......
library/transformer/src/main/java/com/google/android/exoplayer2/transformer/VideoTranscodingSamplePipeline.java
...@@ -303,9 +303,7 @@ import org.checkerframework.dataflow.qual.Pure; ...@@ -303,9 +303,7 @@ import org.checkerframework.dataflow.qual.Pure;
TransformationRequest.Builder transformationRequestBuilder = transformationRequest.buildUpon(); TransformationRequest.Builder transformationRequestBuilder = transformationRequest.buildUpon();
if (transformationRequest.enableRequestSdrToneMapping != isToneMappedToSdr) { if (transformationRequest.enableRequestSdrToneMapping != isToneMappedToSdr) {
checkState(isToneMappedToSdr); checkState(isToneMappedToSdr);
transformationRequestBuilder transformationRequestBuilder.setEnableRequestSdrToneMapping(true);
.setEnableRequestSdrToneMapping(true)
.experimental_setEnableHdrEditing(false);
} }
return transformationRequestBuilder return transformationRequestBuilder
.setVideoMimeType(supportedFormat.sampleMimeType) .setVideoMimeType(supportedFormat.sampleMimeType)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment