diff --git a/libraries/common/src/main/java/androidx/media3/common/FileTypes.java b/libraries/common/src/main/java/androidx/media3/common/FileTypes.java index c5ec04927b..b4cd6c7497 100644 --- a/libraries/common/src/main/java/androidx/media3/common/FileTypes.java +++ b/libraries/common/src/main/java/androidx/media3/common/FileTypes.java @@ -134,7 +134,7 @@ public final class FileTypes { /** * Returns the {@link Type} corresponding to the MIME type provided. * - *

Returns {@link #UNKNOWN} if the mime type is {@code null}. + *

Returns {@link #UNKNOWN} if the MIME type is {@code null}. */ public static @FileTypes.Type int inferFileTypeFromMimeType(@Nullable String mimeType) { if (mimeType == null) { diff --git a/libraries/common/src/main/java/androidx/media3/common/Format.java b/libraries/common/src/main/java/androidx/media3/common/Format.java index 875a6d2078..b9b935c239 100644 --- a/libraries/common/src/main/java/androidx/media3/common/Format.java +++ b/libraries/common/src/main/java/androidx/media3/common/Format.java @@ -748,12 +748,12 @@ public final class Format implements Bundleable { // Container specific. - /** The mime type of the container, or null if unknown or not applicable. */ + /** The MIME type of the container, or null if unknown or not applicable. */ @Nullable public final String containerMimeType; // Sample specific. - /** The sample mime type, or null if unknown or not applicable. */ + /** The sample MIME type, or null if unknown or not applicable. */ @Nullable public final String sampleMimeType; /** * The maximum size of a buffer of data (typically one sample), or {@link #NO_VALUE} if unknown or diff --git a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/RendererCapabilities.java b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/RendererCapabilities.java index 95e2250ecd..ddac15318d 100644 --- a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/RendererCapabilities.java +++ b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/RendererCapabilities.java @@ -184,7 +184,7 @@ public interface RendererCapabilities { * C#FORMAT_UNSUPPORTED_DRM}, {@link C#FORMAT_UNSUPPORTED_SUBTYPE} and {@link * C#FORMAT_UNSUPPORTED_TYPE}. *

  • {@link AdaptiveSupport}: The level of support for adapting from the format to another - * format of the same mime type. One of {@link #ADAPTIVE_SEAMLESS}, {@link + * format of the same MIME type. One of {@link #ADAPTIVE_SEAMLESS}, {@link * #ADAPTIVE_NOT_SEAMLESS} and {@link #ADAPTIVE_NOT_SUPPORTED}. Only set if the level of * support for the format itself is {@link C#FORMAT_HANDLED} or {@link * C#FORMAT_EXCEEDS_CAPABILITIES}. diff --git a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/analytics/MediaMetricsListener.java b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/analytics/MediaMetricsListener.java index 8de2207344..de9a137a97 100644 --- a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/analytics/MediaMetricsListener.java +++ b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/analytics/MediaMetricsListener.java @@ -530,7 +530,7 @@ public final class MediaMetricsListener builder.setTrackState(TrackChangeEvent.TRACK_STATE_ON); builder.setTrackChangeReason(getTrackChangeReason(trackSelectionReason)); if (format.containerMimeType != null) { - // TODO(b/181121074): Progressive container mime type is not filled in by MediaSource. + // TODO(b/181121074): Progressive container MIME type is not filled in by MediaSource. builder.setContainerMimeType(format.containerMimeType); } if (format.sampleMimeType != null) { diff --git a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/mediacodec/MediaCodecInfo.java b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/mediacodec/MediaCodecInfo.java index d36f9eb07b..8bc7d67ff4 100644 --- a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/mediacodec/MediaCodecInfo.java +++ b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/mediacodec/MediaCodecInfo.java @@ -58,7 +58,7 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; import java.util.List; -/** Information about a {@link MediaCodec} for a given mime type. */ +/** Information about a {@link MediaCodec} for a given MIME type. */ @SuppressWarnings("InlinedApi") @UnstableApi public final class MediaCodecInfo { @@ -151,10 +151,10 @@ public final class MediaCodecInfo { * Creates an instance. * * @param name The name of the {@link MediaCodec}. - * @param mimeType A mime type supported by the {@link MediaCodec}. + * @param mimeType A MIME type supported by the {@link MediaCodec}. * @param codecMimeType The MIME type that the codec uses for media of type {@code #mimeType}. * Equal to {@code mimeType} unless the codec is known to use a non-standard MIME type alias. - * @param capabilities The capabilities of the {@link MediaCodec} for the specified mime type, or + * @param capabilities The capabilities of the {@link MediaCodec} for the specified MIME type, or * {@code null} if not known. * @param hardwareAccelerated Whether the {@link MediaCodec} is hardware accelerated. * @param softwareOnly Whether the {@link MediaCodec} is software only. diff --git a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/mediacodec/MediaCodecRenderer.java b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/mediacodec/MediaCodecRenderer.java index 315053ed96..59320e1d87 100644 --- a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/mediacodec/MediaCodecRenderer.java +++ b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/mediacodec/MediaCodecRenderer.java @@ -98,7 +98,7 @@ public abstract class MediaCodecRenderer extends BaseRenderer { private static final int NO_SUITABLE_DECODER_ERROR = CUSTOM_ERROR_CODE_BASE + 1; private static final int DECODER_QUERY_ERROR = CUSTOM_ERROR_CODE_BASE + 2; - /** The mime type for which a decoder was being initialized. */ + /** The MIME type for which a decoder was being initialized. */ public final String mimeType; /** Whether it was required that the decoder support a secure output path. */ diff --git a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/mediacodec/MediaCodecUtil.java b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/mediacodec/MediaCodecUtil.java index 17b67e3a77..a71622509c 100644 --- a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/mediacodec/MediaCodecUtil.java +++ b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/mediacodec/MediaCodecUtil.java @@ -90,12 +90,12 @@ public final class MediaCodecUtil { private MediaCodecUtil() {} /** - * Optional call to warm the codec cache for a given mime type. + * Optional call to warm the codec cache for a given MIME type. * *

    Calling this method may speed up subsequent calls to {@link #getDecoderInfo(String, boolean, * boolean)} and {@link #getDecoderInfos(String, boolean, boolean)}. * - * @param mimeType The mime type. + * @param mimeType The MIME type. * @param secure Whether the decoder is required to support secure decryption. Always pass false * unless secure decryption really is required. * @param tunneling Whether the decoder is required to support tunneling. Always pass false unless @@ -128,7 +128,7 @@ public final class MediaCodecUtil { } /** - * Returns information about the preferred decoder for a given mime type. + * Returns information about the preferred decoder for a given MIME type. * * @param mimeType The MIME type. * @param secure Whether the decoder is required to support secure decryption. Always pass false @@ -146,7 +146,7 @@ public final class MediaCodecUtil { } /** - * Returns all {@link MediaCodecInfo}s for the given mime type, in the order given by {@link + * Returns all {@link MediaCodecInfo}s for the given MIME type, in the order given by {@link * MediaCodecList}. * * @param mimeType The MIME type. @@ -154,7 +154,7 @@ public final class MediaCodecUtil { * unless secure decryption really is required. * @param tunneling Whether the decoder is required to support tunneling. Always pass false unless * tunneling really is required. - * @return An unmodifiable list of all {@link MediaCodecInfo}s for the given mime type, in the + * @return An unmodifiable list of all {@link MediaCodecInfo}s for the given MIME type, in the * order given by {@link MediaCodecList}. * @throws DecoderQueryException If there was an error querying the available decoders. */ diff --git a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/mediaparser/OutputConsumerAdapterV30.java b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/mediaparser/OutputConsumerAdapterV30.java index fdb0f7696f..8d84f9fc08 100644 --- a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/mediaparser/OutputConsumerAdapterV30.java +++ b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/mediaparser/OutputConsumerAdapterV30.java @@ -219,7 +219,7 @@ public final class OutputConsumerAdapterV30 implements MediaParser.OutputConsume } /** - * Defines the container mime type to propagate through {@link TrackOutput#format}. + * Defines the container MIME type to propagate through {@link TrackOutput#format}. * * @param parserName The name of the selected parser. */ diff --git a/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/trackselection/DefaultTrackSelectorTest.java b/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/trackselection/DefaultTrackSelectorTest.java index 17154f7982..12b0a1a851 100644 --- a/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/trackselection/DefaultTrackSelectorTest.java +++ b/libraries/exoplayer/src/test/java/androidx/media3/exoplayer/trackselection/DefaultTrackSelectorTest.java @@ -1626,7 +1626,7 @@ public final class DefaultTrackSelectorTest { Format aacAudioFormat = formatBuilder.setSampleMimeType(MimeTypes.AUDIO_AAC).build(); Format opusAudioFormat = formatBuilder.setSampleMimeType(MimeTypes.AUDIO_OPUS).build(); - // Should not adapt between mixed mime types by default, so we expect a fixed selection + // Should not adapt between mixed MIME types by default, so we expect a fixed selection // containing the first stream. TrackGroupArray trackGroups = singleTrackGroup(aacAudioFormat, opusAudioFormat); TrackSelectorResult result = @@ -1643,7 +1643,7 @@ public final class DefaultTrackSelectorTest { assertThat(result.length).isEqualTo(1); assertFixedSelection(result.selections[0], trackGroups, opusAudioFormat); - // If we explicitly enable mixed mime type adaptiveness, expect an adaptive selection. + // If we explicitly enable mixed MIME type adaptiveness, expect an adaptive selection. trackSelector.setParameters( defaultParameters.buildUpon().setAllowAudioMixedMimeTypeAdaptiveness(true)); result = @@ -1975,7 +1975,7 @@ public final class DefaultTrackSelectorTest { Format h264VideoFormat = formatBuilder.setSampleMimeType(MimeTypes.VIDEO_H264).build(); Format h265VideoFormat = formatBuilder.setSampleMimeType(MimeTypes.VIDEO_H265).build(); - // Should not adapt between mixed mime types by default, so we expect a fixed selection + // Should not adapt between mixed MIME types by default, so we expect a fixed selection // containing the first stream. TrackGroupArray trackGroups = singleTrackGroup(h264VideoFormat, h265VideoFormat); TrackSelectorResult result = @@ -1992,7 +1992,7 @@ public final class DefaultTrackSelectorTest { assertThat(result.length).isEqualTo(1); assertFixedSelection(result.selections[0], trackGroups, h265VideoFormat); - // If we explicitly enable mixed mime type adaptiveness, expect an adaptive selection. + // If we explicitly enable mixed MIME type adaptiveness, expect an adaptive selection. trackSelector.setParameters( defaultParameters.buildUpon().setAllowVideoMixedMimeTypeAdaptiveness(true)); result = diff --git a/libraries/exoplayer_hls/src/main/java/androidx/media3/exoplayer/hls/HlsSampleStreamWrapper.java b/libraries/exoplayer_hls/src/main/java/androidx/media3/exoplayer/hls/HlsSampleStreamWrapper.java index e7ae3f0bff..43e1853030 100644 --- a/libraries/exoplayer_hls/src/main/java/androidx/media3/exoplayer/hls/HlsSampleStreamWrapper.java +++ b/libraries/exoplayer_hls/src/main/java/androidx/media3/exoplayer/hls/HlsSampleStreamWrapper.java @@ -1550,7 +1550,7 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull; sampleMimeType = MimeTypes.getMediaMimeType(codecs); } else { // The variant assigns more than one codec string to this track. We choose whichever codec - // string matches the sample mime type. This can happen when different languages are encoded + // string matches the sample MIME type. This can happen when different languages are encoded // using different codecs. codecs = MimeTypes.getCodecsCorrespondingToMimeType( diff --git a/libraries/exoplayer_hls/src/main/java/androidx/media3/exoplayer/hls/SampleQueueMappingException.java b/libraries/exoplayer_hls/src/main/java/androidx/media3/exoplayer/hls/SampleQueueMappingException.java index c19939f65c..c5aee55536 100644 --- a/libraries/exoplayer_hls/src/main/java/androidx/media3/exoplayer/hls/SampleQueueMappingException.java +++ b/libraries/exoplayer_hls/src/main/java/androidx/media3/exoplayer/hls/SampleQueueMappingException.java @@ -26,9 +26,9 @@ import java.io.IOException; public final class SampleQueueMappingException extends IOException { /** - * @param mimeType The mime type of the track group whose mapping failed. + * @param mimeType The MIME type of the track group whose mapping failed. */ public SampleQueueMappingException(@Nullable String mimeType) { - super("Unable to bind a sample queue to TrackGroup with mime type " + mimeType + "."); + super("Unable to bind a sample queue to TrackGroup with MIME type " + mimeType + "."); } } diff --git a/libraries/extractor/src/main/java/androidx/media3/extractor/Ac3Util.java b/libraries/extractor/src/main/java/androidx/media3/extractor/Ac3Util.java index 9fe613aac2..439e76df4b 100644 --- a/libraries/extractor/src/main/java/androidx/media3/extractor/Ac3Util.java +++ b/libraries/extractor/src/main/java/androidx/media3/extractor/Ac3Util.java @@ -63,7 +63,7 @@ public final class Ac3Util { public static final int STREAM_TYPE_TYPE2 = 2; /** - * The sample mime type of the bitstream. One of {@link MimeTypes#AUDIO_AC3} and {@link + * The sample MIME type of the bitstream. One of {@link MimeTypes#AUDIO_AC3} and {@link * MimeTypes#AUDIO_E_AC3}. */ @Nullable public final String mimeType; @@ -450,7 +450,7 @@ public final class Ac3Util { int fscod = data.readBits(2); if (fscod == 3) { // fscod '11' indicates that the decoder should not attempt to decode audio. We invalidate - // the mime type to prevent association with a renderer. + // the MIME type to prevent association with a renderer. mimeType = null; } int frmsizecod = data.readBits(6); diff --git a/libraries/extractor/src/main/java/androidx/media3/extractor/MpegAudioUtil.java b/libraries/extractor/src/main/java/androidx/media3/extractor/MpegAudioUtil.java index a1310aa4b8..8c362cee49 100644 --- a/libraries/extractor/src/main/java/androidx/media3/extractor/MpegAudioUtil.java +++ b/libraries/extractor/src/main/java/androidx/media3/extractor/MpegAudioUtil.java @@ -29,7 +29,7 @@ public final class MpegAudioUtil { /** MPEG audio header version. */ public int version; - /** The mime type. */ + /** The MIME type. */ @Nullable public String mimeType; /** Size of the frame associated with this header, in bytes. */ public int frameSize; diff --git a/libraries/extractor/src/main/java/androidx/media3/extractor/metadata/flac/PictureFrame.java b/libraries/extractor/src/main/java/androidx/media3/extractor/metadata/flac/PictureFrame.java index 15ba4322a2..4dd72f135a 100644 --- a/libraries/extractor/src/main/java/androidx/media3/extractor/metadata/flac/PictureFrame.java +++ b/libraries/extractor/src/main/java/androidx/media3/extractor/metadata/flac/PictureFrame.java @@ -33,7 +33,7 @@ public final class PictureFrame implements Metadata.Entry { /** The type of the picture. */ public final int pictureType; - /** The mime type of the picture. */ + /** The MIME type of the picture. */ public final String mimeType; /** A description of the picture. */ public final String description; diff --git a/libraries/extractor/src/main/java/androidx/media3/extractor/mkv/MatroskaExtractor.java b/libraries/extractor/src/main/java/androidx/media3/extractor/mkv/MatroskaExtractor.java index 1de02e5444..7dc3f48b82 100644 --- a/libraries/extractor/src/main/java/androidx/media3/extractor/mkv/MatroskaExtractor.java +++ b/libraries/extractor/src/main/java/androidx/media3/extractor/mkv/MatroskaExtractor.java @@ -2410,8 +2410,8 @@ public class MatroskaExtractor implements Extractor { /** * Builds initialization data for a {@link Format} from FourCC codec private data. * - * @return The codec mime type and initialization data. If the compression type is not supported - * then the mime type is set to {@link MimeTypes#VIDEO_UNKNOWN} and the initialization data + * @return The codec MIME type and initialization data. If the compression type is not supported + * then the MIME type is set to {@link MimeTypes#VIDEO_UNKNOWN} and the initialization data * is {@code null}. * @throws ParserException If the initialization data could not be built. */ diff --git a/libraries/extractor/src/main/java/androidx/media3/extractor/ts/SeiReader.java b/libraries/extractor/src/main/java/androidx/media3/extractor/ts/SeiReader.java index 582b772060..e70a0e2e93 100644 --- a/libraries/extractor/src/main/java/androidx/media3/extractor/ts/SeiReader.java +++ b/libraries/extractor/src/main/java/androidx/media3/extractor/ts/SeiReader.java @@ -52,7 +52,7 @@ public final class SeiReader { Assertions.checkArgument( MimeTypes.APPLICATION_CEA608.equals(channelMimeType) || MimeTypes.APPLICATION_CEA708.equals(channelMimeType), - "Invalid closed caption mime type provided: " + channelMimeType); + "Invalid closed caption MIME type provided: " + channelMimeType); String formatId = channelFormat.id != null ? channelFormat.id : idGenerator.getFormatId(); output.format( new Format.Builder() diff --git a/libraries/extractor/src/main/java/androidx/media3/extractor/ts/UserDataReader.java b/libraries/extractor/src/main/java/androidx/media3/extractor/ts/UserDataReader.java index daaf1991d3..ea44946265 100644 --- a/libraries/extractor/src/main/java/androidx/media3/extractor/ts/UserDataReader.java +++ b/libraries/extractor/src/main/java/androidx/media3/extractor/ts/UserDataReader.java @@ -49,7 +49,7 @@ import java.util.List; Assertions.checkArgument( MimeTypes.APPLICATION_CEA608.equals(channelMimeType) || MimeTypes.APPLICATION_CEA708.equals(channelMimeType), - "Invalid closed caption mime type provided: " + channelMimeType); + "Invalid closed caption MIME type provided: " + channelMimeType); output.format( new Format.Builder() .setId(idGenerator.getFormatId()) diff --git a/libraries/test_utils/src/main/java/androidx/media3/test/utils/MediaPeriodAsserts.java b/libraries/test_utils/src/main/java/androidx/media3/test/utils/MediaPeriodAsserts.java index c794f731d8..452a855754 100644 --- a/libraries/test_utils/src/main/java/androidx/media3/test/utils/MediaPeriodAsserts.java +++ b/libraries/test_utils/src/main/java/androidx/media3/test/utils/MediaPeriodAsserts.java @@ -88,7 +88,7 @@ public final class MediaPeriodAsserts { * @param mediaPeriodFactory A factory to create a {@link MediaPeriod} based on a manifest. * @param manifest The manifest which is to be tested. * @param periodIndex The index of period in the manifest. - * @param ignoredMimeType Optional mime type whose existence in the filtered track groups is not + * @param ignoredMimeType Optional MIME type whose existence in the filtered track groups is not * asserted. */ public static > diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/SamplePipeline.java b/libraries/transformer/src/main/java/androidx/media3/transformer/SamplePipeline.java index 50680fc044..8734d587f3 100644 --- a/libraries/transformer/src/main/java/androidx/media3/transformer/SamplePipeline.java +++ b/libraries/transformer/src/main/java/androidx/media3/transformer/SamplePipeline.java @@ -137,10 +137,10 @@ import java.util.List; *

    The {@linkplain Format requestedFormat} determines what support is checked. * *