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
e2adb567
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
9fdc6478
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
17 deletions
libraries/transformer/src/main/java/androidx/media3/transformer/SamplePipeline.java
libraries/transformer/src/main/java/androidx/media3/transformer/VideoSamplePipeline.java
libraries/transformer/src/main/java/androidx/media3/transformer/SamplePipeline.java
View file @
e2adb567
...
@@ -20,6 +20,7 @@ import static androidx.media3.common.util.Assertions.checkStateNotNull;
...
@@ -20,6 +20,7 @@ import static androidx.media3.common.util.Assertions.checkStateNotNull;
import
androidx.annotation.Nullable
;
import
androidx.annotation.Nullable
;
import
androidx.media3.common.C
;
import
androidx.media3.common.C
;
import
androidx.media3.common.ColorInfo
;
import
androidx.media3.common.Format
;
import
androidx.media3.common.Format
;
import
androidx.media3.common.MimeTypes
;
import
androidx.media3.common.MimeTypes
;
import
androidx.media3.decoder.DecoderInputBuffer
;
import
androidx.media3.decoder.DecoderInputBuffer
;
...
@@ -44,14 +45,22 @@ import androidx.media3.decoder.DecoderInputBuffer;
...
@@ -44,14 +45,22 @@ import androidx.media3.decoder.DecoderInputBuffer;
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
...
...
libraries/transformer/src/main/java/androidx/media3/transformer/VideoSamplePipeline.java
View file @
e2adb567
...
@@ -441,19 +441,8 @@ import org.checkerframework.dataflow.qual.Pure;
...
@@ -441,19 +441,8 @@ 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
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
=
encoder
=
encoderFactory
.
createForVideoEncoding
(
encoderFactory
.
createForVideoEncoding
(
...
...
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