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
e90ad9c4
authored
Jul 29, 2015
by
Oliver Woodman
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
Make Aes128DataSource private to the HLS package.
Issue: #662
parent
1f0e6a5c
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
5 deletions
library/src/main/java/com/google/android/exoplayer/upstream/Aes128DataSource.java → library/src/main/java/com/google/android/exoplayer/hls/Aes128DataSource.java
library/src/main/java/com/google/android/exoplayer/hls/TsChunk.java
library/src/main/java/com/google/android/exoplayer/
upstream
/Aes128DataSource.java
→
library/src/main/java/com/google/android/exoplayer/
hls
/Aes128DataSource.java
View file @
e90ad9c4
...
@@ -13,9 +13,12 @@
...
@@ -13,9 +13,12 @@
* See the License for the specific language governing permissions and
* See the License for the specific language governing permissions and
* limitations under the License.
* limitations under the License.
*/
*/
package
com
.
google
.
android
.
exoplayer
.
upstream
;
package
com
.
google
.
android
.
exoplayer
.
hls
;
import
com.google.android.exoplayer.C
;
import
com.google.android.exoplayer.C
;
import
com.google.android.exoplayer.upstream.DataSource
;
import
com.google.android.exoplayer.upstream.DataSourceInputStream
;
import
com.google.android.exoplayer.upstream.DataSpec
;
import
com.google.android.exoplayer.util.Assertions
;
import
com.google.android.exoplayer.util.Assertions
;
import
java.io.IOException
;
import
java.io.IOException
;
...
@@ -32,10 +35,14 @@ import javax.crypto.spec.IvParameterSpec;
...
@@ -32,10 +35,14 @@ import javax.crypto.spec.IvParameterSpec;
import
javax.crypto.spec.SecretKeySpec
;
import
javax.crypto.spec.SecretKeySpec
;
/**
/**
* A {@link DataSource} that decrypts the data read from an upstream source, encrypted with AES-128
* A {@link DataSource} that decrypts data read from an upstream source, encrypted with AES-128 with
* with a 128-bit key and PKCS7 padding.
* a 128-bit key and PKCS7 padding.
* <p>
* Note that this {@link DataSource} does not support being opened from arbitrary offsets. It is
* designed specifically for reading whole files as defined in an HLS media playlist. For this
* reason the implementation is private to the HLS package.
*/
*/
public
class
Aes128DataSource
implements
DataSource
{
/* package */
class
Aes128DataSource
implements
DataSource
{
private
final
DataSource
upstream
;
private
final
DataSource
upstream
;
private
final
byte
[]
encryptionKey
;
private
final
byte
[]
encryptionKey
;
...
...
library/src/main/java/com/google/android/exoplayer/hls/TsChunk.java
View file @
e90ad9c4
...
@@ -20,7 +20,6 @@ import com.google.android.exoplayer.chunk.MediaChunk;
...
@@ -20,7 +20,6 @@ import com.google.android.exoplayer.chunk.MediaChunk;
import
com.google.android.exoplayer.extractor.DefaultExtractorInput
;
import
com.google.android.exoplayer.extractor.DefaultExtractorInput
;
import
com.google.android.exoplayer.extractor.Extractor
;
import
com.google.android.exoplayer.extractor.Extractor
;
import
com.google.android.exoplayer.extractor.ExtractorInput
;
import
com.google.android.exoplayer.extractor.ExtractorInput
;
import
com.google.android.exoplayer.upstream.Aes128DataSource
;
import
com.google.android.exoplayer.upstream.DataSource
;
import
com.google.android.exoplayer.upstream.DataSource
;
import
com.google.android.exoplayer.upstream.DataSpec
;
import
com.google.android.exoplayer.upstream.DataSpec
;
import
com.google.android.exoplayer.util.Util
;
import
com.google.android.exoplayer.util.Util
;
...
...
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