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

Add 1920 and 1088 as guesses for surface texture crop fix

Browse Source 
Some devices always allocate 1920x1088 pixel buffers,
regardless of video resolution

PiperOrigin-RevId: 653148028
This commit is contained in:
dancho 2024-07-17 02:13:49 -07:00 committed by Copybara-Service
parent 1e43404468
commit e94ee03cd0
1 changed files with 34 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
libraries/effect/src/main/java/androidx/media3/effect/ExternalTextureManager.java
View File

@ -59,6 +59,10 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
private static final int[] TRANSFORMATION_MATRIX_EXPECTED_ZERO_INDICES = { private static final int[] TRANSFORMATION_MATRIX_EXPECTED_ZERO_INDICES = {
2, 3, 6, 7, 8, 9, 11, 14 2, 3, 6, 7, 8, 9, 11, 14
}; };
// Some devices always allocate 1920x1088 buffers, regardless of video resolution.
// When working around the implicit SurfaceTexture crop, add 1920 and 1088 to the set of
// candidate buffer sizes.
private static final int[] ADDITIONAL_CANDIDATE_BUFFER_SIZE_GUESSES = {1920, 1088};
// In the worst case, we should be able to differentiate between numbers of the form // In the worst case, we should be able to differentiate between numbers of the form
// A / B and (A + 1) / (B + 1) where A and B are around video resolution. // A / B and (A + 1) / (B + 1) where A and B are around video resolution.
// For 8K, width = 7680. // For 8K, width = 7680.
@ -552,23 +556,43 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
*/ */
private static float guessScaleWithoutSurfaceTextureTrim( private static float guessScaleWithoutSurfaceTextureTrim(
float surfaceTextureScale, int visibleLength) { float surfaceTextureScale, int visibleLength) {
float bestGuess = 1; int bestCandidateBufferSize = visibleLength;
float scaleWithoutTrim = 1;
for (int align = 2; align <= 256; align *= 2) { for (int align = 2; align <= 256; align *= 2) {
int candidateBufferSize = ((visibleLength + align - 1) / align) * align; int candidateBufferSize = ((visibleLength + align - 1) / align) * align;
for (int trimmedPixels = 0; trimmedPixels <= 2; trimmedPixels++) { if (scoreForCandidateBufferSize(candidateBufferSize, surfaceTextureScale, visibleLength)
float guess = ((float) visibleLength - trimmedPixels) / candidateBufferSize; < scoreForCandidateBufferSize(
if (abs(guess - surfaceTextureScale) < abs(bestGuess - surfaceTextureScale)) { bestCandidateBufferSize, surfaceTextureScale, visibleLength)) {
bestGuess = guess; bestCandidateBufferSize = candidateBufferSize;
scaleWithoutTrim = (float) visibleLength / candidateBufferSize;
}
} }
} }
if (abs(bestGuess - surfaceTextureScale) > EPSILON) { for (int candidateBufferSize : ADDITIONAL_CANDIDATE_BUFFER_SIZE_GUESSES) {
if (candidateBufferSize < visibleLength) {
continue;
}
if (scoreForCandidateBufferSize(candidateBufferSize, surfaceTextureScale, visibleLength)
< scoreForCandidateBufferSize(
bestCandidateBufferSize, surfaceTextureScale, visibleLength)) {
bestCandidateBufferSize = candidateBufferSize;
}
}
if (scoreForCandidateBufferSize(bestCandidateBufferSize, surfaceTextureScale, visibleLength)
> EPSILON) {
// Best guess is too far off. Accept that we'll scale. // Best guess is too far off. Accept that we'll scale.
return surfaceTextureScale; return surfaceTextureScale;
} }
return scaleWithoutTrim; return (float) visibleLength / bestCandidateBufferSize;
}
private static float scoreForCandidateBufferSize(
int candidateBufferSize, float surfaceTextureScale, int visibleLength) {
float bestScore = 1;
for (int trimmedPixels = 0; trimmedPixels <= 2; trimmedPixels++) {
float guess = ((float) visibleLength - trimmedPixels) / candidateBufferSize;
if (abs(guess - surfaceTextureScale) < bestScore) {
bestScore = abs(guess - surfaceTextureScale);
}
}
return bestScore;
} }
} }