From 481b9bd63d9ff96c815a008112d7435388f5c8c6 Mon Sep 17 00:00:00 2001 From: huangdarwin Date: Thu, 17 Mar 2022 16:33:35 +0000 Subject: [PATCH] Transformer: Split javadoc summary fragment and descriptive text. PiperOrigin-RevId: 435368283 --- .../androidx/media3/common/util/GlUtil.java | 3 +- .../transformer/AdvancedFrameProcessor.java | 5 ++- .../transformer/DefaultEncoderFactory.java | 7 +-- .../transformer/TransformationRequest.java | 33 ++++++++------ .../media3/transformer/Transformer.java | 43 ++++++++++++------- 5 files changed, 57 insertions(+), 34 deletions(-) diff --git a/libraries/common/src/main/java/androidx/media3/common/util/GlUtil.java b/libraries/common/src/main/java/androidx/media3/common/util/GlUtil.java index a293a30932..aa071f5dab 100644 --- a/libraries/common/src/main/java/androidx/media3/common/util/GlUtil.java +++ b/libraries/common/src/main/java/androidx/media3/common/util/GlUtil.java @@ -119,7 +119,8 @@ public final class GlUtil { /** * Returns whether creating a GL context with {@value #EXTENSION_PROTECTED_CONTENT} is possible. - * If {@code true}, the device supports a protected output path for DRM content when using GL. + * + *

If {@code true}, the device supports a protected output path for DRM content when using GL. */ public static boolean isProtectedContentExtensionSupported(Context context) { if (Util.SDK_INT < 24) { diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/AdvancedFrameProcessor.java b/libraries/transformer/src/main/java/androidx/media3/transformer/AdvancedFrameProcessor.java index b9edcedc7b..d12505b4bb 100644 --- a/libraries/transformer/src/main/java/androidx/media3/transformer/AdvancedFrameProcessor.java +++ b/libraries/transformer/src/main/java/androidx/media3/transformer/AdvancedFrameProcessor.java @@ -43,8 +43,9 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull; private static final String FRAGMENT_SHADER_PATH = "shaders/fragment_shader_copy_es2.glsl"; /** - * Returns a 4x4, column-major Matrix float array, from an input {@link Matrix}. This is useful - * for converting to the 4x4 column-major format commonly used in OpenGL. + * Returns a 4x4, column-major Matrix float array, from an input {@link Matrix}. + * + *

This is useful for converting to the 4x4 column-major format commonly used in OpenGL. */ private static float[] getGlMatrixArray(Matrix matrix) { float[] matrix3x3Array = new float[9]; diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/DefaultEncoderFactory.java b/libraries/transformer/src/main/java/androidx/media3/transformer/DefaultEncoderFactory.java index b31edd8249..f4f5c2e15d 100644 --- a/libraries/transformer/src/main/java/androidx/media3/transformer/DefaultEncoderFactory.java +++ b/libraries/transformer/src/main/java/androidx/media3/transformer/DefaultEncoderFactory.java @@ -194,9 +194,10 @@ public final class DefaultEncoderFactory implements Codec.EncoderFactory { } /** - * Finds a {@link MediaCodecInfo encoder} that supports the requested format most closely. Returns - * the {@link MediaCodecInfo encoder} and the supported {@link Format} in a {@link Pair}, or - * {@code null} if none is found. + * Finds a {@link MediaCodecInfo encoder} that supports the requested format most closely. + * + *

Returns the {@link MediaCodecInfo encoder} and the supported {@link Format} in a {@link + * Pair}, or {@code null} if none is found. */ @RequiresNonNull("#1.sampleMimeType") @Nullable diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/TransformationRequest.java b/libraries/transformer/src/main/java/androidx/media3/transformer/TransformationRequest.java index 7d5b08604f..97ab61d24e 100644 --- a/libraries/transformer/src/main/java/androidx/media3/transformer/TransformationRequest.java +++ b/libraries/transformer/src/main/java/androidx/media3/transformer/TransformationRequest.java @@ -62,7 +62,9 @@ public final class TransformationRequest { } /** - * Sets the transformation matrix. The default value is to apply no change. + * Sets the transformation matrix. + * + *

The default value is to apply no change. * *

This can be used to perform operations supported by {@link Matrix}, like scaling and * rotating the video. @@ -84,10 +86,11 @@ public final class TransformationRequest { } /** - * Sets whether the input should be flattened for media containing slow motion markers. The - * transformed output is obtained by removing the slow motion metadata and by actually slowing - * down the parts of the video and audio streams defined in this metadata. The default value for - * {@code flattenForSlowMotion} is {@code false}. + * Sets whether the input should be flattened for media containing slow motion markers. + * + *

The transformed output is obtained by removing the slow motion metadata and by actually + * slowing down the parts of the video and audio streams defined in this metadata. The default + * value for {@code flattenForSlowMotion} is {@code false}. * *

Only Samsung Extension Format (SEF) slow motion metadata type is supported. The * transformation has no effect if the input does not contain this metadata type. @@ -114,9 +117,11 @@ public final class TransformationRequest { } /** - * Sets the output resolution using the output height. The default value {@link C#LENGTH_UNSET} - * corresponds to using the same height as the input. Output width of the displayed video will - * scale to preserve the video's aspect ratio after other transformations. + * Sets the output resolution using the output height. + * + *

The default value {@link C#LENGTH_UNSET} corresponds to using the same height as the + * input. Output width of the displayed video will scale to preserve the video's aspect ratio + * after other transformations. * *

For example, a 1920x1440 video can be scaled to 640x480 by calling setResolution(480). * @@ -130,8 +135,10 @@ public final class TransformationRequest { } /** - * Sets the video MIME type of the output. The default value is {@code null} which corresponds - * to using the same MIME type as the input. Supported MIME types are: + * Sets the video MIME type of the output. + * + *

The default value is {@code null} which corresponds to using the same MIME type as the + * input. Supported MIME types are: * *