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
321005e4
authored
Feb 13, 2015
by
Oliver Woodman
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
Use 'bitrate' not 'bit-rate' consistently.
parent
d1360ad7
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
library/src/main/java/com/google/android/exoplayer/mp4/CommonMp4AtomParsers.java
library/src/main/java/com/google/android/exoplayer/mp4/CommonMp4AtomParsers.java
View file @
321005e4
...
...
@@ -37,8 +37,8 @@ public final class CommonMp4AtomParsers {
/** Channel counts for AC-3 audio, indexed by acmod. (See ETSI TS 102 366.) */
private
static
final
int
[]
AC3_CHANNEL_COUNTS
=
new
int
[]
{
2
,
1
,
2
,
3
,
3
,
4
,
4
,
5
};
/** Nominal bit
-
rates for AC-3 audio in kbps, indexed by bit_rate_code. (See ETSI TS 102 366.) */
private
static
final
int
[]
AC3_BIT
_
RATES
=
new
int
[]
{
32
,
40
,
48
,
56
,
64
,
80
,
96
,
112
,
128
,
160
,
/** Nominal bitrates for AC-3 audio in kbps, indexed by bit_rate_code. (See ETSI TS 102 366.) */
private
static
final
int
[]
AC3_BITRATES
=
new
int
[]
{
32
,
40
,
48
,
56
,
64
,
80
,
96
,
112
,
128
,
160
,
192
,
224
,
256
,
320
,
384
,
448
,
512
,
576
,
640
};
/**
...
...
@@ -639,8 +639,8 @@ public final class CommonMp4AtomParsers {
channelCount
++;
}
// Map bit_rate_code onto a bit
-
rate in kbit/s.
int
bitrate
=
AC3_BIT
_
RATES
[((
nextByte
&
0x03
)
<<
3
)
+
(
parent
.
readUnsignedByte
()
>>
5
)];
// Map bit_rate_code onto a bitrate in kbit/s.
int
bitrate
=
AC3_BITRATES
[((
nextByte
&
0x03
)
<<
3
)
+
(
parent
.
readUnsignedByte
()
>>
5
)];
return
new
Ac3Format
(
channelCount
,
sampleRate
,
bitrate
);
}
...
...
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