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
fb75b65a
authored
Oct 26, 2015
by
Oliver Woodman
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
Fix compile error.
parent
f133524c
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
9 deletions
library/src/main/java/com/google/android/exoplayer/extractor/flv/AudioTagPayloadReader.java
library/src/main/java/com/google/android/exoplayer/extractor/flv/VideoTagPayloadReader.java
library/src/main/java/com/google/android/exoplayer/extractor/flv/AudioTagPayloadReader.java
View file @
fb75b65a
...
...
@@ -15,7 +15,6 @@
*/
package
com
.
google
.
android
.
exoplayer
.
extractor
.
flv
;
import
android.util.Pair
;
import
com.google.android.exoplayer.C
;
import
com.google.android.exoplayer.MediaFormat
;
import
com.google.android.exoplayer.extractor.TrackOutput
;
...
...
@@ -24,6 +23,8 @@ import com.google.android.exoplayer.util.MimeTypes;
import
com.google.android.exoplayer.util.ParsableBitArray
;
import
com.google.android.exoplayer.util.ParsableByteArray
;
import
android.util.Pair
;
import
java.util.Collections
;
/**
...
...
@@ -108,9 +109,10 @@ final class AudioTagPayloadReader extends TagPayloadReader {
Pair
<
Integer
,
Integer
>
audioParams
=
CodecSpecificDataUtil
.
parseAacAudioSpecificConfig
(
audioSpecificConfig
);
MediaFormat
mediaFormat
=
MediaFormat
.
createAudioFormat
(
MimeTypes
.
AUDIO_AAC
,
MediaFormat
.
NO_VALUE
,
MediaFormat
.
NO_VALUE
,
durationUs
,
audioParams
.
second
,
audioParams
.
first
,
Collections
.
singletonList
(
audioSpecificConfig
),
null
);
MediaFormat
mediaFormat
=
MediaFormat
.
createAudioFormat
(
MediaFormat
.
NO_VALUE
,
MimeTypes
.
AUDIO_AAC
,
MediaFormat
.
NO_VALUE
,
MediaFormat
.
NO_VALUE
,
durationUs
,
audioParams
.
second
,
audioParams
.
first
,
Collections
.
singletonList
(
audioSpecificConfig
),
null
);
output
.
format
(
mediaFormat
);
hasOutputFormat
=
true
;
...
...
library/src/main/java/com/google/android/exoplayer/extractor/flv/VideoTagPayloadReader.java
View file @
fb75b65a
...
...
@@ -15,8 +15,6 @@
*/
package
com
.
google
.
android
.
exoplayer
.
extractor
.
flv
;
import
android.util.Log
;
import
com.google.android.exoplayer.C
;
import
com.google.android.exoplayer.MediaFormat
;
import
com.google.android.exoplayer.ParserException
;
...
...
@@ -28,6 +26,8 @@ import com.google.android.exoplayer.util.NalUnitUtil;
import
com.google.android.exoplayer.util.ParsableBitArray
;
import
com.google.android.exoplayer.util.ParsableByteArray
;
import
android.util.Log
;
import
java.util.ArrayList
;
import
java.util.List
;
...
...
@@ -112,9 +112,10 @@ final class VideoTagPayloadReader extends TagPayloadReader {
}
// Construct and output the format.
MediaFormat
mediaFormat
=
MediaFormat
.
createVideoFormat
(
MimeTypes
.
VIDEO_H264
,
MediaFormat
.
NO_VALUE
,
MediaFormat
.
NO_VALUE
,
durationUs
,
avcData
.
width
,
avcData
.
height
,
avcData
.
initializationData
,
MediaFormat
.
NO_VALUE
,
avcData
.
pixelWidthAspectRatio
);
MediaFormat
mediaFormat
=
MediaFormat
.
createVideoFormat
(
MediaFormat
.
NO_VALUE
,
MimeTypes
.
VIDEO_H264
,
MediaFormat
.
NO_VALUE
,
MediaFormat
.
NO_VALUE
,
durationUs
,
avcData
.
width
,
avcData
.
height
,
avcData
.
initializationData
,
MediaFormat
.
NO_VALUE
,
avcData
.
pixelWidthAspectRatio
);
output
.
format
(
mediaFormat
);
hasOutputFormat
=
true
;
}
else
if
(
packetType
==
AVC_PACKET_TYPE_AVC_NALU
)
{
...
...
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