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
eea1ce3e
authored
Feb 22, 2019
by
aquilescanta
Committed by
Oliver Woodman
Mar 06, 2019
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
Fix channel count propagation on HLS traditional preparation
PiperOrigin-RevId: 235189983
parent
3e03e71c
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
0 deletions
library/core/src/main/java/com/google/android/exoplayer2/Format.java
library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsSampleStreamWrapper.java
library/core/src/main/java/com/google/android/exoplayer2/Format.java
View file @
eea1ce3e
...
...
@@ -1047,6 +1047,7 @@ public final class Format implements Parcelable {
int
bitrate
,
int
width
,
int
height
,
int
channelCount
,
@C
.
SelectionFlags
int
selectionFlags
,
@Nullable
String
language
)
{
return
new
Format
(
...
...
library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsSampleStreamWrapper.java
View file @
eea1ce3e
...
...
@@ -1094,6 +1094,10 @@ import java.util.List;
return
sampleFormat
;
}
int
bitrate
=
propagateBitrate
?
playlistFormat
.
bitrate
:
Format
.
NO_VALUE
;
int
channelCount
=
playlistFormat
.
channelCount
!=
Format
.
NO_VALUE
?
playlistFormat
.
channelCount
:
sampleFormat
.
channelCount
;
int
sampleTrackType
=
MimeTypes
.
getTrackType
(
sampleFormat
.
sampleMimeType
);
String
codecs
=
Util
.
getCodecsOfType
(
playlistFormat
.
codecs
,
sampleTrackType
);
String
mimeType
=
MimeTypes
.
getMediaMimeType
(
codecs
);
...
...
@@ -1108,6 +1112,7 @@ import java.util.List;
bitrate
,
playlistFormat
.
width
,
playlistFormat
.
height
,
channelCount
,
playlistFormat
.
selectionFlags
,
playlistFormat
.
language
);
}
...
...
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