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
a8d1de51
authored
May 05, 2020
by
aquilescanta
Committed by
Oliver Woodman
May 05, 2020
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
Fix TrackOutput documentation for encryption data format
PiperOrigin-RevId: 309899166
parent
fff3f99f
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
library/extractor/src/main/java/com/google/android/exoplayer2/extractor/TrackOutput.java
library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4Extractor.java
library/extractor/src/main/java/com/google/android/exoplayer2/extractor/TrackOutput.java
View file @
a8d1de51
...
...
@@ -120,11 +120,11 @@ public interface TrackOutput {
* encryption data also contains:
* <ul>
* <li>(2 bytes) {@code subsample_encryption_data_length}.
* <li>({@code subsample_encryption_data_length} bytes) Subsample encryption data
* (repeated {@code subsample_encryption_data_length
/ 6
} times:
* <li>({@code subsample_encryption_data_length
* 6
} bytes) Subsample encryption data
* (repeated {@code subsample_encryption_data_length} times:
* <ul>
* <li>(
3
bytes) Size of a clear section in sample.
* <li>(
3
bytes) Size of an encryption section in sample.
* <li>(
2
bytes) Size of a clear section in sample.
* <li>(
4
bytes) Size of an encryption section in sample.
* </ul>
* </ul>
* </ul>
...
...
library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4Extractor.java
View file @
a8d1de51
...
...
@@ -1630,7 +1630,7 @@ public class FragmentedMp4Extractor implements Extractor {
// clearDataSize = clearHeaderSize (unsigned short)
scratch
.
data
[
2
]
=
(
byte
)
((
clearHeaderSize
>>
8
)
&
0xFF
);
scratch
.
data
[
3
]
=
(
byte
)
(
clearHeaderSize
&
0xFF
);
// encryptedDataSize = sampleSize (unsigned
shor
t)
// encryptedDataSize = sampleSize (unsigned
in
t)
scratch
.
data
[
4
]
=
(
byte
)
((
sampleSize
>>
24
)
&
0xFF
);
scratch
.
data
[
5
]
=
(
byte
)
((
sampleSize
>>
16
)
&
0xFF
);
scratch
.
data
[
6
]
=
(
byte
)
((
sampleSize
>>
8
)
&
0xFF
);
...
...
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