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

Expand createNoSupportedMimeTypeException for HDR ColorInfo case.

Browse source 
PiperOrigin-RevId: 506900817
This commit is contained in:
samrobinson 2023-02-03 15:46:41 +00:00 committed by microkatz
parent 90de454e1e
commit 73d4b67e46
2 changed files with 16 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
library/transformer/src/main/java/com/google/android/exoplayer2/transformer/SamplePipeline.java
View file

@ -23,6 +23,7 @@ import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.Format;
import com.google.android.exoplayer2.decoder.DecoderInputBuffer;
import com.google.android.exoplayer2.util.MimeTypes;
import com.google.android.exoplayer2.video.ColorInfo;
/**
* Pipeline for processing media data.
@ -44,14 +45,22 @@ import com.google.android.exoplayer2.util.MimeTypes;
trackType = MimeTypes.getTrackType(firstInputFormat.sampleMimeType);
}
protected static TransformationException createNoSupportedMimeTypeException(
Format requestedEncoderFormat) {
protected static TransformationException createNoSupportedMimeTypeException(Format format) {
String errorMessage = "No MIME type is supported by both encoder and muxer.";
int errorCode = TransformationException.ERROR_CODE_ENCODING_FORMAT_UNSUPPORTED;
boolean isVideo = MimeTypes.isVideo(format.sampleMimeType);
if (isVideo && ColorInfo.isTransferHdr(format.colorInfo)) {
errorMessage += " Requested HDR colorInfo: " + format.colorInfo;
errorCode = TransformationException.ERROR_CODE_HDR_ENCODING_UNSUPPORTED;
}
return TransformationException.createForCodec(
new IllegalArgumentException("No MIME type is supported by both encoder and muxer."),
TransformationException.ERROR_CODE_ENCODING_FORMAT_UNSUPPORTED,
MimeTypes.isVideo(requestedEncoderFormat.sampleMimeType),
new IllegalArgumentException(errorMessage),
errorCode,
isVideo,
/* isDecoder= */ false,
requestedEncoderFormat);
format);
}
@Override

13
library/transformer/src/main/java/com/google/android/exoplayer2/transformer/VideoSamplePipeline.java
View file

@ -441,18 +441,7 @@ import org.checkerframework.dataflow.qual.Pure;
findSupportedMimeTypeForEncoderAndMuxer(
requestedOutputMimeType, muxerSupportedMimeTypes, requestedEncoderFormat.colorInfo);
if (supportedMimeType == null) {
if (ColorInfo.isTransferHdr(requestedEncoderFormat.colorInfo)) {
throw TransformationException.createForCodec(
new IllegalStateException(
"No MIME type supported by both encoder and muxer for requested HDR colorInfo: "
+ requestedEncoderFormat.colorInfo),
TransformationException.ERROR_CODE_HDR_ENCODING_UNSUPPORTED,
/* isVideo= */ true,
/* isDecoder= */ false,
requestedEncoderFormat);
} else {
throw createNoSupportedMimeTypeException(requestedEncoderFormat);
}
throw createNoSupportedMimeTypeException(requestedEncoderFormat);
}
encoder =