From d59cfb736a86f3dd7cf93b50a06fdce022bcb6b6 Mon Sep 17 00:00:00 2001 From: claincly Date: Fri, 7 Jan 2022 17:23:00 +0000 Subject: [PATCH] Replace static method with a static field. PiperOrigin-RevId: 420307694 --- .../transformer/DefaultCodecFactory.java | 33 +++++++++---------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/DefaultCodecFactory.java b/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/DefaultCodecFactory.java index c6ace32a6b..22603002c4 100644 --- a/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/DefaultCodecFactory.java +++ b/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/DefaultCodecFactory.java @@ -36,6 +36,18 @@ import java.io.IOException; /* package */ final class DefaultCodecFactory implements Codec.DecoderFactory, Codec.EncoderFactory { + private static final MediaCodecInfo PLACEHOLDER_MEDIA_CODEC_INFO = + MediaCodecInfo.newInstance( + /* name= */ "name-placeholder", + /* mimeType= */ "mime-type-placeholder", + /* codecMimeType= */ "mime-type-placeholder", + /* capabilities= */ null, + /* hardwareAccelerated= */ false, + /* softwareOnly= */ false, + /* vendor= */ false, + /* forceDisableAdaptive= */ false, + /* forceSecure= */ false); + @Override public Codec createForAudioDecoding(Format format) throws TransformationException { MediaFormat mediaFormat = @@ -51,7 +63,7 @@ import java.io.IOException; new MediaCodecFactory() .createAdapter( MediaCodecAdapter.Configuration.createForAudioDecoding( - createPlaceholderMediaCodecInfo(), mediaFormat, format, /* crypto= */ null)); + PLACEHOLDER_MEDIA_CODEC_INFO, mediaFormat, format, /* crypto= */ null)); } catch (Exception e) { throw createTransformationException(e, format, /* isVideo= */ false, /* isDecoder= */ true); } @@ -81,7 +93,7 @@ import java.io.IOException; new MediaCodecFactory() .createAdapter( MediaCodecAdapter.Configuration.createForVideoDecoding( - createPlaceholderMediaCodecInfo(), + PLACEHOLDER_MEDIA_CODEC_INFO, mediaFormat, format, surface, @@ -105,7 +117,7 @@ import java.io.IOException; new MediaCodecFactory() .createAdapter( MediaCodecAdapter.Configuration.createForAudioEncoding( - createPlaceholderMediaCodecInfo(), mediaFormat, format)); + PLACEHOLDER_MEDIA_CODEC_INFO, mediaFormat, format)); } catch (Exception e) { throw createTransformationException(e, format, /* isVideo= */ false, /* isDecoder= */ false); } @@ -135,7 +147,7 @@ import java.io.IOException; new MediaCodecFactory() .createAdapter( MediaCodecAdapter.Configuration.createForVideoEncoding( - createPlaceholderMediaCodecInfo(), mediaFormat, format)); + PLACEHOLDER_MEDIA_CODEC_INFO, mediaFormat, format)); } catch (Exception e) { throw createTransformationException(e, format, /* isVideo= */ true, /* isDecoder= */ false); } @@ -155,19 +167,6 @@ import java.io.IOException; } } - private static MediaCodecInfo createPlaceholderMediaCodecInfo() { - return MediaCodecInfo.newInstance( - /* name= */ "name-placeholder", - /* mimeType= */ "mime-type-placeholder", - /* codecMimeType= */ "mime-type-placeholder", - /* capabilities= */ null, - /* hardwareAccelerated= */ false, - /* softwareOnly= */ false, - /* vendor= */ false, - /* forceDisableAdaptive= */ false, - /* forceSecure= */ false); - } - private static TransformationException createTransformationException( Exception cause, Format format, boolean isVideo, boolean isDecoder) { String componentName = (isVideo ? "Video" : "Audio") + (isDecoder ? "Decoder" : "Encoder");