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
aa647745
authored
Oct 12, 2015
by
Oliver Woodman
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
No-op re-orderings.
parent
0b1c8897
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
7 deletions
library/src/main/java/com/google/android/exoplayer/MediaCodecUtil.java
library/src/main/java/com/google/android/exoplayer/extractor/webm/WebmExtractor.java
library/src/main/java/com/google/android/exoplayer/util/MimeTypes.java
library/src/main/java/com/google/android/exoplayer/MediaCodecUtil.java
View file @
aa647745
...
...
@@ -98,7 +98,6 @@ public final class MediaCodecUtil {
* @param mimeType The mime type.
* @param secure Whether the decoder is required to support secure decryption. Always pass false
* unless secure decryption really is required.
*
* @return The name of the best decoder and its capabilities for the given mimeType, or null if
* no decoder exists.
*/
...
...
library/src/main/java/com/google/android/exoplayer/extractor/webm/WebmExtractor.java
View file @
aa647745
...
...
@@ -75,10 +75,10 @@ public final class WebmExtractor implements Extractor {
private
static
final
String
CODEC_ID_AAC
=
"A_AAC"
;
private
static
final
String
CODEC_ID_MP3
=
"A_MPEG/L3"
;
private
static
final
String
CODEC_ID_AC3
=
"A_AC3"
;
private
static
final
String
CODEC_ID_TRUEHD
=
"A_TRUEHD"
;
private
static
final
String
CODEC_ID_DTS
=
"A_DTS"
;
private
static
final
String
CODEC_ID_DTS_EXPRESS
=
"A_DTS/EXPRESS"
;
private
static
final
String
CODEC_ID_DTS_LOSSLESS
=
"A_DTS/LOSSLESS"
;
private
static
final
String
CODEC_ID_TRUEHD
=
"A_TRUEHD"
;
private
static
final
String
CODEC_ID_SUBRIP
=
"S_TEXT/UTF8"
;
private
static
final
int
VORBIS_MAX_INPUT_SIZE
=
8192
;
...
...
@@ -1045,10 +1045,10 @@ public final class WebmExtractor implements Extractor {
||
CODEC_ID_AAC
.
equals
(
codecId
)
||
CODEC_ID_MP3
.
equals
(
codecId
)
||
CODEC_ID_AC3
.
equals
(
codecId
)
||
CODEC_ID_TRUEHD
.
equals
(
codecId
)
||
CODEC_ID_DTS
.
equals
(
codecId
)
||
CODEC_ID_DTS_EXPRESS
.
equals
(
codecId
)
||
CODEC_ID_DTS_LOSSLESS
.
equals
(
codecId
)
||
CODEC_ID_TRUEHD
.
equals
(
codecId
)
||
CODEC_ID_SUBRIP
.
equals
(
codecId
);
}
...
...
@@ -1210,6 +1210,9 @@ public final class WebmExtractor implements Extractor {
case
CODEC_ID_AC3:
mimeType
=
MimeTypes
.
AUDIO_AC3
;
break
;
case
CODEC_ID_TRUEHD:
mimeType
=
MimeTypes
.
AUDIO_TRUEHD
;
break
;
case
CODEC_ID_DTS:
case
CODEC_ID_DTS_EXPRESS:
mimeType
=
MimeTypes
.
AUDIO_DTS
;
...
...
@@ -1217,9 +1220,6 @@ public final class WebmExtractor implements Extractor {
case
CODEC_ID_DTS_LOSSLESS:
mimeType
=
MimeTypes
.
AUDIO_DTS_HD
;
break
;
case
CODEC_ID_TRUEHD:
mimeType
=
MimeTypes
.
AUDIO_TRUEHD
;
break
;
case
CODEC_ID_SUBRIP:
mimeType
=
MimeTypes
.
APPLICATION_SUBRIP
;
break
;
...
...
library/src/main/java/com/google/android/exoplayer/util/MimeTypes.java
View file @
aa647745
...
...
@@ -46,11 +46,11 @@ public final class MimeTypes {
public
static
final
String
AUDIO_RAW
=
BASE_TYPE_AUDIO
+
"/raw"
;
public
static
final
String
AUDIO_AC3
=
BASE_TYPE_AUDIO
+
"/ac3"
;
public
static
final
String
AUDIO_EC3
=
BASE_TYPE_AUDIO
+
"/eac3"
;
public
static
final
String
AUDIO_TRUEHD
=
BASE_TYPE_AUDIO
+
"/true-hd"
;
public
static
final
String
AUDIO_DTS
=
BASE_TYPE_AUDIO
+
"/vnd.dts"
;
public
static
final
String
AUDIO_DTS_HD
=
BASE_TYPE_AUDIO
+
"/vnd.dts.hd"
;
public
static
final
String
AUDIO_VORBIS
=
BASE_TYPE_AUDIO
+
"/vorbis"
;
public
static
final
String
AUDIO_OPUS
=
BASE_TYPE_AUDIO
+
"/opus"
;
public
static
final
String
AUDIO_TRUEHD
=
BASE_TYPE_AUDIO
+
"/true-hd"
;
public
static
final
String
TEXT_VTT
=
BASE_TYPE_TEXT
+
"/vtt"
;
...
...
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