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

Minor javadoc and scoping cleanup.

Browse Source 
No functional changes.

PiperOrigin-RevId: 472245797
This commit is contained in:
huangdarwin 2022-09-05 11:06:21 +00:00 committed by Marc Baechinger
parent 73f86682e9
commit fa1f09fc51
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libraries/transformer/src/main/java/androidx/media3/transformer/DefaultCodec.java
View File

@ -40,7 +40,6 @@ import androidx.media3.common.util.Log;
import androidx.media3.common.util.MediaFormatUtil; import androidx.media3.common.util.MediaFormatUtil;
import androidx.media3.common.util.TraceUtil; import androidx.media3.common.util.TraceUtil;
import androidx.media3.common.util.UnstableApi; import androidx.media3.common.util.UnstableApi;
import androidx.media3.common.util.Util;
import androidx.media3.decoder.DecoderInputBuffer; import androidx.media3.decoder.DecoderInputBuffer;
import com.google.common.base.Ascii; import com.google.common.base.Ascii;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
@ -108,7 +107,7 @@ public final class DefaultCodec implements Codec {
@Nullable Surface inputSurface = null; @Nullable Surface inputSurface = null;
try { try {
boolean requestedHdrToneMapping = boolean requestedHdrToneMapping =
Util.SDK_INT >= 29 && Api29.isSdrToneMappingEnabled(configurationMediaFormat); SDK_INT >= 29 && Api29.isSdrToneMappingEnabled(configurationMediaFormat);
mediaCodec = MediaCodec.createByCodecName(mediaCodecName); mediaCodec = MediaCodec.createByCodecName(mediaCodecName);
configureCodec(mediaCodec, configurationMediaFormat, isDecoder, outputSurface); configureCodec(mediaCodec, configurationMediaFormat, isDecoder, outputSurface);
if (SDK_INT >= 29 && requestedHdrToneMapping) { if (SDK_INT >= 29 && requestedHdrToneMapping) {

2
libraries/transformer/src/main/java/androidx/media3/transformer/EncoderUtil.java
View File

@ -88,7 +88,7 @@ public final class EncoderUtil {
for (int i = 0; i < mediaCodecInfos.size(); i++) { for (int i = 0; i < mediaCodecInfos.size(); i++) {
MediaCodecInfo mediaCodecInfo = mediaCodecInfos.get(i); MediaCodecInfo mediaCodecInfo = mediaCodecInfos.get(i);
if (mediaCodecInfo.isAlias() if (mediaCodecInfo.isAlias()
|| !EncoderUtil.isFeatureSupported( || !isFeatureSupported(
mediaCodecInfo, mimeType, MediaCodecInfo.CodecCapabilities.FEATURE_HdrEditing)) { mediaCodecInfo, mimeType, MediaCodecInfo.CodecCapabilities.FEATURE_HdrEditing)) {
continue; continue;
} }

5
libraries/transformer/src/main/java/androidx/media3/transformer/Transformer.java
View File

@ -537,8 +537,9 @@ public final class Transformer {
* @param originalTransformationRequest The unsupported {@link TransformationRequest} used when * @param originalTransformationRequest The unsupported {@link TransformationRequest} used when
* building {@link Transformer}. * building {@link Transformer}.
* @param fallbackTransformationRequest The alternative {@link TransformationRequest}, with * @param fallbackTransformationRequest The alternative {@link TransformationRequest}, with
* supported {@link TransformationRequest#outputHeight} and {@link * supported {@link TransformationRequest#audioMimeType}, {@link
* TransformationRequest#videoMimeType} values set. * TransformationRequest#videoMimeType}, {@link TransformationRequest#outputHeight}, and
* {@link TransformationRequest#enableRequestSdrToneMapping} values set.
*/ */
default void onFallbackApplied( default void onFallbackApplied(
MediaItem inputMediaItem, MediaItem inputMediaItem,