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
12a61833
authored
Feb 22, 2023
by
kimvde
Committed by
Andrew Lewis
Feb 24, 2023
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
Make sure that VideoSamplePipeline is picked for image input
PiperOrigin-RevId: 511449658
parent
cb7a8d2d
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
19 additions
and
4 deletions
library/transformer/src/androidTest/java/com/google/android/exoplayer2/transformer/mh/ExportTest.java
library/transformer/src/main/java/com/google/android/exoplayer2/transformer/TransformerInternal.java
library/transformer/src/androidTest/java/com/google/android/exoplayer2/transformer/mh/ExportTest.java
View file @
12a61833
...
...
@@ -253,4 +253,22 @@ public class ExportTest {
.
build
()
.
run
(
testId
,
editedMediaItem
);
}
@Test
public
void
exportImage
()
throws
Exception
{
// TODO(b/262693274): consider removing this test when Robolectric tests have been added for
// image input.
String
testId
=
TAG
+
"_exportImage"
;
Context
context
=
ApplicationProvider
.
getApplicationContext
();
Transformer
transformer
=
new
Transformer
.
Builder
(
context
).
build
();
String
imageUri
=
"https://storage.googleapis.com/exoplayer-test-media-1/jpg/london.jpg"
;
EditedMediaItem
editedMediaItem
=
new
EditedMediaItem
.
Builder
(
MediaItem
.
fromUri
(
imageUri
))
.
setDurationUs
(
1_000_000
)
.
setFrameRate
(
30
)
.
build
();
new
TransformerAndroidTestRunner
.
Builder
(
context
,
transformer
)
.
build
()
.
run
(
testId
,
editedMediaItem
);
}
}
library/transformer/src/main/java/com/google/android/exoplayer2/transformer/TransformerInternal.java
View file @
12a61833
...
...
@@ -441,9 +441,7 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
encoderFactory
,
muxerWrapper
,
fallbackListener
);
}
if
(
MimeTypes
.
isVideo
(
firstInputFormat
.
sampleMimeType
))
{
}
else
{
// MIME type is video or image.
return
new
VideoSamplePipeline
(
context
,
firstInputFormat
,
...
...
@@ -459,7 +457,6 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
debugViewProvider
);
}
}
return
new
EncodedSamplePipeline
(
firstInputFormat
,
streamStartPositionUs
,
...
...
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