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
bc3125c5
authored
Oct 26, 2015
by
Rik Heijdens
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
Fixed MediaFormatTests
parent
282a3fe8
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
8 deletions
library/src/androidTest/java/com/google/android/exoplayer/MediaFormatTest.java
library/src/androidTest/java/com/google/android/exoplayer/MediaFormatTest.java
View file @
bc3125c5
...
@@ -15,11 +15,11 @@
...
@@ -15,11 +15,11 @@
*/
*/
package
com
.
google
.
android
.
exoplayer
;
package
com
.
google
.
android
.
exoplayer
;
import
com.google.android.exoplayer.util.Util
;
import
android.annotation.SuppressLint
;
import
android.annotation.SuppressLint
;
import
android.annotation.TargetApi
;
import
android.annotation.TargetApi
;
import
com.google.android.exoplayer.util.Util
;
import
junit.framework.TestCase
;
import
junit.framework.TestCase
;
import
java.nio.ByteBuffer
;
import
java.nio.ByteBuffer
;
...
@@ -45,20 +45,20 @@ public final class MediaFormatTest extends TestCase {
...
@@ -45,20 +45,20 @@ public final class MediaFormatTest extends TestCase {
initData
.
add
(
initData2
);
initData
.
add
(
initData2
);
testConversionToFrameworkFormatV16
(
MediaFormat
.
createVideoFormat
(
testConversionToFrameworkFormatV16
(
MediaFormat
.
createVideoFormat
(
null
,
MediaFormat
.
NO_VALUE
,
"video/xyz"
,
5000
,
102400
,
1000L
,
1280
,
720
,
initData
));
null
,
"video/xyz"
,
5000
,
102400
,
1000L
,
1280
,
720
,
initData
));
testConversionToFrameworkFormatV16
(
MediaFormat
.
createVideoFormat
(
testConversionToFrameworkFormatV16
(
MediaFormat
.
createVideoFormat
(
null
,
MediaFormat
.
NO_VALUE
,
"video/xyz"
,
5000
,
MediaFormat
.
NO_VALUE
,
C
.
UNKNOWN_TIME_US
,
1280
,
720
,
null
,
"video/xyz"
,
5000
,
MediaFormat
.
NO_VALUE
,
C
.
UNKNOWN_TIME_US
,
1280
,
720
,
null
));
null
));
testConversionToFrameworkFormatV16
(
MediaFormat
.
createAudioFormat
(
testConversionToFrameworkFormatV16
(
MediaFormat
.
createAudioFormat
(
null
,
MediaFormat
.
NO_VALUE
,
"audio/xyz"
,
500
,
128
,
1000L
,
5
,
44100
,
initData
,
null
));
null
,
"audio/xyz"
,
500
,
128
,
1000L
,
5
,
44100
,
initData
,
null
));
testConversionToFrameworkFormatV16
(
MediaFormat
.
createAudioFormat
(
testConversionToFrameworkFormatV16
(
MediaFormat
.
createAudioFormat
(
null
,
MediaFormat
.
NO_VALUE
,
"audio/xyz"
,
500
,
MediaFormat
.
NO_VALUE
,
C
.
UNKNOWN_TIME_US
,
5
,
44100
,
null
,
"audio/xyz"
,
500
,
MediaFormat
.
NO_VALUE
,
C
.
UNKNOWN_TIME_US
,
5
,
44100
,
null
,
null
));
null
,
null
));
testConversionToFrameworkFormatV16
(
testConversionToFrameworkFormatV16
(
MediaFormat
.
createTextFormat
(
null
,
MediaFormat
.
NO_VALUE
,
"text/xyz"
,
MediaFormat
.
NO_VALUE
,
1000L
,
MediaFormat
.
createTextFormat
(
null
,
"text/xyz"
,
MediaFormat
.
NO_VALUE
,
1000L
,
"eng"
));
"eng"
));
testConversionToFrameworkFormatV16
(
testConversionToFrameworkFormatV16
(
MediaFormat
.
createTextFormat
(
null
,
MediaFormat
.
NO_VALUE
,
"text/xyz"
,
MediaFormat
.
NO_VALUE
,
MediaFormat
.
createTextFormat
(
null
,
"text/xyz"
,
MediaFormat
.
NO_VALUE
,
C
.
UNKNOWN_TIME_US
,
null
));
C
.
UNKNOWN_TIME_US
,
null
));
}
}
...
...
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