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

Log instead of throwing for transfer mismatch

Browse source 
PiperOrigin-RevId: 470354448
(cherry picked from commit f1a3a40eb1)
This commit is contained in:
andrewlewis 2022-08-26 23:08:53 +00:00 committed by microkatz
parent 0f271c20b5
commit 179eafb247
1 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -35,6 +35,7 @@ import androidx.annotation.VisibleForTesting;
import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.Format; import com.google.android.exoplayer2.Format;
import com.google.android.exoplayer2.decoder.DecoderInputBuffer; import com.google.android.exoplayer2.decoder.DecoderInputBuffer;
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;
@ -49,6 +50,9 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
/** A default {@link Codec} implementation that uses {@link MediaCodec}. */ /** A default {@link Codec} implementation that uses {@link MediaCodec}. */
public final class DefaultCodec implements Codec { public final class DefaultCodec implements Codec {
private static final String TAG = "DefaultCodec";
// MediaCodec decoders always output 16 bit PCM, unless configured to output PCM float. // MediaCodec decoders always output 16 bit PCM, unless configured to output PCM float.
// https://developer.android.com/reference/android/media/MediaCodec#raw-audio-buffers. // https://developer.android.com/reference/android/media/MediaCodec#raw-audio-buffers.
private static final int MEDIA_CODEC_PCM_ENCODING = C.ENCODING_PCM_16BIT; private static final int MEDIA_CODEC_PCM_ENCODING = C.ENCODING_PCM_16BIT;
@ -323,16 +327,15 @@ public final class DefaultCodec implements Codec {
ColorInfo expectedColorInfo = ColorInfo expectedColorInfo =
isToneMappingEnabled ? ColorInfo.SDR_BT709_LIMITED : configurationFormat.colorInfo; isToneMappingEnabled ? ColorInfo.SDR_BT709_LIMITED : configurationFormat.colorInfo;
if (!areColorTransfersEqual(expectedColorInfo, outputFormat.colorInfo)) { if (!areColorTransfersEqual(expectedColorInfo, outputFormat.colorInfo)) {
// TODO(b/237674316): These exceptions throw when the container ColorInfo doesn't match // TODO(b/237674316): The container ColorInfo's transfer doesn't match the decoder output
// the video ColorInfo. Instead of throwing when seeing unexpected ColorInfos, consider // MediaFormat, or we requested tone-mapping but it hasn't bee applied. We should
// reconfiguring downstream components (ex. FrameProcessor and encoder) when different // reconfigure downstream components for this case instead.
// ColorInfo values are output. Log.w(
throw createTransformationException( TAG,
new IllegalStateException( "Codec output color format does not match configured color format. Expected: "
"Codec output color format does not match configured color format. Expected: " + expectedColorInfo
+ expectedColorInfo + ". Actual: "
+ ". Actual: " + outputFormat.colorInfo);
+ outputFormat.colorInfo));
} }
} }
return false; return false;