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
46d97bdd
authored
Sep 20, 2021
by
kimvde
Committed by
Christos Tsilopoulos
Sep 20, 2021
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
Fix DTS_X audio mime type
Issue: #9429 #minor-release PiperOrigin-RevId: 397717740
parent
8a910fd0
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
4 deletions
RELEASENOTES.md
library/common/src/main/java/com/google/android/exoplayer2/util/MimeTypes.java
library/common/src/test/java/com/google/android/exoplayer2/util/MimeTypesTest.java
library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp4/AtomParsers.java
RELEASENOTES.md
View file @
46d97bdd
...
...
@@ -26,6 +26,9 @@
(
[
#8906
](
https://github.com/google/ExoPlayer/issues/8906
)
).
*
Move
`Player.addListener(EventListener)`
and
`Player.removeListener(EventListener)`
out of
`Player`
into subclasses.
*
Rename
`MimeTypes.AUDIO_DTS_UHD`
to
`MimeTypes.AUDIO_DTS_X`
and add
required profile to its value
(
[
#9429
](
https://github.com/google/ExoPlayer/issues/9429
)
).
*
Extractors:
*
Support TS packets without PTS flag
(
[
#9294
](
https://github.com/google/ExoPlayer/issues/9294
)
).
...
...
library/common/src/main/java/com/google/android/exoplayer2/util/MimeTypes.java
View file @
46d97bdd
...
...
@@ -78,7 +78,7 @@ public final class MimeTypes {
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_DTS_EXPRESS
=
BASE_TYPE_AUDIO
+
"/vnd.dts.hd;profile=lbr"
;
public
static
final
String
AUDIO_DTS_
UHD
=
BASE_TYPE_AUDIO
+
"/vnd.dts.uhd
"
;
public
static
final
String
AUDIO_DTS_
X
=
BASE_TYPE_AUDIO
+
"/vnd.dts.uhd;profile=p2
"
;
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_AMR
=
BASE_TYPE_AUDIO
+
"/amr"
;
...
...
@@ -410,7 +410,7 @@ public final class MimeTypes {
}
else
if
(
codec
.
startsWith
(
"dtsh"
)
||
codec
.
startsWith
(
"dtsl"
))
{
return
MimeTypes
.
AUDIO_DTS_HD
;
}
else
if
(
codec
.
startsWith
(
"dtsx"
))
{
return
MimeTypes
.
AUDIO_DTS_
UHD
;
return
MimeTypes
.
AUDIO_DTS_
X
;
}
else
if
(
codec
.
startsWith
(
"opus"
))
{
return
MimeTypes
.
AUDIO_OPUS
;
}
else
if
(
codec
.
startsWith
(
"vorbis"
))
{
...
...
library/common/src/test/java/com/google/android/exoplayer2/util/MimeTypesTest.java
View file @
46d97bdd
...
...
@@ -140,7 +140,7 @@ public final class MimeTypesTest {
assertThat
(
MimeTypes
.
getMediaMimeType
(
"dtse"
)).
isEqualTo
(
MimeTypes
.
AUDIO_DTS_EXPRESS
);
assertThat
(
MimeTypes
.
getMediaMimeType
(
"dtsh"
)).
isEqualTo
(
MimeTypes
.
AUDIO_DTS_HD
);
assertThat
(
MimeTypes
.
getMediaMimeType
(
"dtsl"
)).
isEqualTo
(
MimeTypes
.
AUDIO_DTS_HD
);
assertThat
(
MimeTypes
.
getMediaMimeType
(
"dtsx"
)).
isEqualTo
(
MimeTypes
.
AUDIO_DTS_
UHD
);
assertThat
(
MimeTypes
.
getMediaMimeType
(
"dtsx"
)).
isEqualTo
(
MimeTypes
.
AUDIO_DTS_
X
);
assertThat
(
MimeTypes
.
getMediaMimeType
(
"opus"
)).
isEqualTo
(
MimeTypes
.
AUDIO_OPUS
);
assertThat
(
MimeTypes
.
getMediaMimeType
(
"vorbis"
)).
isEqualTo
(
MimeTypes
.
AUDIO_VORBIS
);
assertThat
(
MimeTypes
.
getMediaMimeType
(
"mp4a"
)).
isEqualTo
(
MimeTypes
.
AUDIO_AAC
);
...
...
library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp4/AtomParsers.java
View file @
46d97bdd
...
...
@@ -1374,7 +1374,7 @@ import org.checkerframework.checker.nullness.compatqual.NullableType;
}
else
if
(
atomType
==
Atom
.
TYPE_dtse
)
{
mimeType
=
MimeTypes
.
AUDIO_DTS_EXPRESS
;
}
else
if
(
atomType
==
Atom
.
TYPE_dtsx
)
{
mimeType
=
MimeTypes
.
AUDIO_DTS_
UHD
;
mimeType
=
MimeTypes
.
AUDIO_DTS_
X
;
}
else
if
(
atomType
==
Atom
.
TYPE_samr
)
{
mimeType
=
MimeTypes
.
AUDIO_AMR_NB
;
}
else
if
(
atomType
==
Atom
.
TYPE_sawb
)
{
...
...
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