loliball/media
1
0
Fork 0
mirror of https://github.com/androidx/media.git synced 2025-04-30 06:46:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

VideoFrameProcessorTestRunner add support for portrait video

Browse Source 
Fixes test failures due to differences test util bug that introduced
a crop in external texture sampling

PiperOrigin-RevId: 705061267
This commit is contained in:
dancho 2024-12-11 04:42:01 -08:00 committed by Copybara-Service
parent 8d2f531470
commit f55e0f3a3f
6 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
libraries/test_data/src/test/assets/test-generated-goldens/hdr-goldens/original_hdr10_to_hlg.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.4 MiB

After

Width:  |  Height:  |  Size: 1.8 MiB

BIN
libraries/test_data/src/test/assets/test-generated-goldens/hdr-goldens/text_overlay.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.3 MiB

After

Width:  |  Height:  |  Size: 1.6 MiB

BIN
libraries/test_data/src/test/assets/test-generated-goldens/hdr-goldens/ultrahdr_overlay_pq.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.7 MiB

After

Width:  |  Height:  |  Size: 2.0 MiB

BIN
libraries/test_data/src/test/assets/test-generated-goldens/sample_mp4_first_frame/electrical_colors/original_hdr10.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.7 MiB

After

Width:  |  Height:  |  Size: 1.5 MiB

15
libraries/test_utils/src/main/java/androidx/media3/test/utils/VideoFrameProcessorTestRunner.java
View File

@ -328,6 +328,7 @@ public final class VideoFrameProcessorTestRunner {
this.effects = effects; this.effects = effects;
} }
@SuppressLint("InlinedApi") // Inlined MediaFormat keys.
public void processFirstFrameAndEnd() throws Exception { public void processFirstFrameAndEnd() throws Exception {
DecodeOneFrameUtil.decodeOneAssetFileFrame( DecodeOneFrameUtil.decodeOneAssetFileFrame(
checkNotNull(videoAssetPath), checkNotNull(videoAssetPath),
@ -336,12 +337,22 @@ public final class VideoFrameProcessorTestRunner {
public void onContainerExtracted(MediaFormat mediaFormat) { public void onContainerExtracted(MediaFormat mediaFormat) {
videoFrameProcessorReadyCondition.close(); videoFrameProcessorReadyCondition.close();
@Nullable ColorInfo colorInfo = MediaFormatUtil.getColorInfo(mediaFormat); @Nullable ColorInfo colorInfo = MediaFormatUtil.getColorInfo(mediaFormat);
int rotationDegrees =
MediaFormatUtil.getInteger(
mediaFormat, MediaFormat.KEY_ROTATION, /* defaultValue= */ 0);
int width = mediaFormat.getInteger(MediaFormat.KEY_WIDTH);
int height = mediaFormat.getInteger(MediaFormat.KEY_HEIGHT);
if (rotationDegrees % 180 == 90) {
int tmp = width;
width = height;
height = tmp;
}
videoFrameProcessor.registerInputStream( videoFrameProcessor.registerInputStream(
INPUT_TYPE_SURFACE, INPUT_TYPE_SURFACE,
new Format.Builder() new Format.Builder()
.setColorInfo(colorInfo == null ? ColorInfo.SDR_BT709_LIMITED : colorInfo) .setColorInfo(colorInfo == null ? ColorInfo.SDR_BT709_LIMITED : colorInfo)
.setWidth(mediaFormat.getInteger(MediaFormat.KEY_WIDTH)) .setWidth(width)
.setHeight(mediaFormat.getInteger(MediaFormat.KEY_HEIGHT)) .setHeight(height)
.setPixelWidthHeightRatio(pixelWidthHeightRatio) .setPixelWidthHeightRatio(pixelWidthHeightRatio)
.build(), .build(),
effects, effects,

4
libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/DefaultVideoFrameProcessorTextureOutputPixelTest.java
View File

@ -389,9 +389,7 @@ public final class DefaultVideoFrameProcessorTextureOutputPixelTest {
videoFrameProcessorTestRunner.processFirstFrameAndEnd(); videoFrameProcessorTestRunner.processFirstFrameAndEnd();
Bitmap actualBitmap = videoFrameProcessorTestRunner.getOutputBitmap(); Bitmap actualBitmap = videoFrameProcessorTestRunner.getOutputBitmap();
// TODO: b/376016540 - use HDR_PSNR_THRESHOLD when HDR videos are processed with high floating assertBitmapsAreSimilar(expectedBitmap, actualBitmap, HDR_PSNR_THRESHOLD);
// point precision.
assertBitmapsAreSimilar(expectedBitmap, actualBitmap, /* psnrThresholdDb= */ 42.5);
} }
@Test @Test