forked from google/ExoPlayer
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
HDR: Implement ForceInterpretHdrVideoAsSdr
Also, document that we tone map when no HDR features are explicitly set PiperOrigin-RevId: 487310971
- Loading branch information
Showing
12 changed files
with
226 additions
and
24 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
80 changes: 80 additions & 0 deletions
80
...java/com/google/android/exoplayer2/transformer/mh/SetForceInterpretHdrVideoAsSdrTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,80 @@ | ||
| /* | ||
| * Copyright 2022 The Android Open Source Project | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package com.google.android.exoplayer2.transformer.mh; | ||
|
|
||
| import static com.google.android.exoplayer2.transformer.AndroidTestUtil.MP4_ASSET_1080P_4_SECOND_HDR10; | ||
| import static com.google.android.exoplayer2.transformer.AndroidTestUtil.MP4_ASSET_1080P_4_SECOND_HDR10_FORMAT; | ||
| import static com.google.android.exoplayer2.transformer.mh.analysis.FileUtil.assertFileHasColorTransfer; | ||
|
|
||
| import android.content.Context; | ||
| import android.net.Uri; | ||
| import androidx.test.core.app.ApplicationProvider; | ||
| import androidx.test.ext.junit.runners.AndroidJUnit4; | ||
| import com.google.android.exoplayer2.C; | ||
| import com.google.android.exoplayer2.MediaItem; | ||
| import com.google.android.exoplayer2.transformer.AndroidTestUtil; | ||
| import com.google.android.exoplayer2.transformer.TransformationException; | ||
| import com.google.android.exoplayer2.transformer.TransformationRequest; | ||
| import com.google.android.exoplayer2.transformer.TransformationTestResult; | ||
| import com.google.android.exoplayer2.transformer.Transformer; | ||
| import com.google.android.exoplayer2.transformer.TransformerAndroidTestRunner; | ||
| import com.google.android.exoplayer2.util.Log; | ||
| import org.junit.Test; | ||
| import org.junit.runner.RunWith; | ||
|
|
||
| /** | ||
| * {@link Transformer} instrumentation test for {@linkplain | ||
| * TransformationRequest#forceInterpretHdrVideoAsSdr forcing HDR contents to be interpreted as SDR}. | ||
| */ | ||
| @RunWith(AndroidJUnit4.class) | ||
| public class SetForceInterpretHdrVideoAsSdrTest { | ||
| public static final String TAG = "SetForceInterpretHdrVideoAsSdrTest"; | ||
|
|
||
| @Test | ||
| public void forceInterpretHdrVideoAsSdrTest_hdr10File_transformsOrThrows() throws Exception { | ||
| String testId = "forceInterpretHdrVideoAsSdrTest_hdr10File_transformsOrThrows"; | ||
| Context context = ApplicationProvider.getApplicationContext(); | ||
|
|
||
| if (AndroidTestUtil.skipAndLogIfInsufficientCodecSupport( | ||
| context, | ||
| testId, | ||
| /* decodingFormat= */ MP4_ASSET_1080P_4_SECOND_HDR10_FORMAT, | ||
| /* encodingFormat= */ null)) { | ||
| return; | ||
| } | ||
|
|
||
| Transformer transformer = | ||
| new Transformer.Builder(context) | ||
| .setTransformationRequest( | ||
| new TransformationRequest.Builder() | ||
| .experimental_setForceInterpretHdrVideoAsSdr(true) | ||
| .build()) | ||
| .build(); | ||
| try { | ||
| TransformationTestResult transformationTestResult = | ||
| new TransformerAndroidTestRunner.Builder(context, transformer) | ||
| .build() | ||
| .run(testId, MediaItem.fromUri(Uri.parse(MP4_ASSET_1080P_4_SECOND_HDR10))); | ||
| assertFileHasColorTransfer(transformationTestResult.filePath, C.COLOR_TRANSFER_SDR); | ||
| Log.i(TAG, "Transformed."); | ||
| } catch (TransformationException exception) { | ||
| if (exception.errorCode != TransformationException.ERROR_CODE_DECODING_FORMAT_UNSUPPORTED | ||
| && exception.errorCode != TransformationException.ERROR_CODE_HDR_DECODING_UNSUPPORTED) { | ||
| throw exception; | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.