sjs/media
1
0
Fork 0
mirror of https://github.com/samsonjs/media.git synced 2026-04-27 15:07:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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 87926f0ba8
commit 8e14611d60
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
library/transformer/src/main/java/com/google/android/exoplayer2/transformer/DefaultCodec.java
View file

@ -39,7 +39,6 @@ import com.google.android.exoplayer2.util.Log;
import com.google.android.exoplayer2.util.MediaFormatUtil; import com.google.android.exoplayer2.util.MediaFormatUtil;
import com.google.android.exoplayer2.util.MimeTypes; import com.google.android.exoplayer2.util.MimeTypes;
import com.google.android.exoplayer2.util.TraceUtil; import com.google.android.exoplayer2.util.TraceUtil;
import com.google.android.exoplayer2.util.Util;
import com.google.android.exoplayer2.video.ColorInfo; import com.google.android.exoplayer2.video.ColorInfo;
import com.google.common.base.Ascii; import com.google.common.base.Ascii;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
@ -106,7 +105,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
library/transformer/src/main/java/com/google/android/exoplayer2/transformer/EncoderUtil.java
View file

@ -86,7 +86,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
library/transformer/src/main/java/com/google/android/exoplayer2/transformer/Transformer.java
View file

@ -535,8 +535,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,