Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
SDK
/
exoplayer
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
73d4b67e
authored
Feb 03, 2023
by
samrobinson
Committed by
microkatz
Feb 08, 2023
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
Expand createNoSupportedMimeTypeException for HDR ColorInfo case.
PiperOrigin-RevId: 506900817
parent
90de454e
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
18 deletions
library/transformer/src/main/java/com/google/android/exoplayer2/transformer/SamplePipeline.java
library/transformer/src/main/java/com/google/android/exoplayer2/transformer/VideoSamplePipeline.java
library/transformer/src/main/java/com/google/android/exoplayer2/transformer/SamplePipeline.java
View file @
73d4b67e
...
@@ -23,6 +23,7 @@ import com.google.android.exoplayer2.C;
...
@@ -23,6 +23,7 @@ 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.MimeTypes
;
import
com.google.android.exoplayer2.util.MimeTypes
;
import
com.google.android.exoplayer2.video.ColorInfo
;
/**
/**
* Pipeline for processing media data.
* Pipeline for processing media data.
...
@@ -44,14 +45,22 @@ import com.google.android.exoplayer2.util.MimeTypes;
...
@@ -44,14 +45,22 @@ import com.google.android.exoplayer2.util.MimeTypes;
trackType
=
MimeTypes
.
getTrackType
(
firstInputFormat
.
sampleMimeType
);
trackType
=
MimeTypes
.
getTrackType
(
firstInputFormat
.
sampleMimeType
);
}
}
protected
static
TransformationException
createNoSupportedMimeTypeException
(
protected
static
TransformationException
createNoSupportedMimeTypeException
(
Format
format
)
{
Format
requestedEncoderFormat
)
{
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
(
return
TransformationException
.
createForCodec
(
new
IllegalArgumentException
(
"No MIME type is supported by both encoder and muxer."
),
new
IllegalArgumentException
(
errorMessage
),
TransformationException
.
ERROR_CODE_ENCODING_FORMAT_UNSUPPORTED
,
errorCode
,
MimeTypes
.
isVideo
(
requestedEncoderFormat
.
sampleMimeType
)
,
isVideo
,
/* isDecoder= */
false
,
/* isDecoder= */
false
,
requestedEncoderF
ormat
);
f
ormat
);
}
}
@Override
@Override
...
...
library/transformer/src/main/java/com/google/android/exoplayer2/transformer/VideoSamplePipeline.java
View file @
73d4b67e
...
@@ -441,18 +441,7 @@ import org.checkerframework.dataflow.qual.Pure;
...
@@ -441,18 +441,7 @@ import org.checkerframework.dataflow.qual.Pure;
findSupportedMimeTypeForEncoderAndMuxer
(
findSupportedMimeTypeForEncoderAndMuxer
(
requestedOutputMimeType
,
muxerSupportedMimeTypes
,
requestedEncoderFormat
.
colorInfo
);
requestedOutputMimeType
,
muxerSupportedMimeTypes
,
requestedEncoderFormat
.
colorInfo
);
if
(
supportedMimeType
==
null
)
{
if
(
supportedMimeType
==
null
)
{
if
(
ColorInfo
.
isTransferHdr
(
requestedEncoderFormat
.
colorInfo
))
{
throw
createNoSupportedMimeTypeException
(
requestedEncoderFormat
);
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
);
}
}
}
encoder
=
encoder
=
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment