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
ed856b2a
authored
Jun 25, 2015
by
Oliver Woodman
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
Test
parent
5e65b408
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
7 deletions
demo/src/main/java/com/google/android/exoplayer/demo/Samples.java
library/src/main/java/com/google/android/exoplayer/extractor/ts/MpaReader.java
demo/src/main/java/com/google/android/exoplayer/demo/Samples.java
View file @
ed856b2a
...
...
@@ -43,11 +43,8 @@ import java.util.Locale;
}
public
static
final
Sample
[]
YOUTUBE_DASH_MP4
=
new
Sample
[]
{
new
Sample
(
"Google Glass"
,
"http://www.youtube.com/api/manifest/dash/id/bf5bb2419360daf1/source/youtube?"
+
"as=fmp4_audio_clear,fmp4_sd_hd_clear&sparams=ip,ipbits,expire,source,id,as&ip=0.0.0.0&"
+
"ipbits=0&expire=19000000000&signature=51AF5F39AB0CEC3E5497CD9C900EBFEAECCCB5C7."
+
"8506521BFC350652163895D4C26DEE124209AA9E&key=ik0"
,
PlayerActivity
.
TYPE_DASH
),
new
Sample
(
"XXXXXXXXX"
,
"http://178.33.229.111/live/mp4:Videolina/playlist.m3u8"
,
PlayerActivity
.
TYPE_HLS
),
new
Sample
(
"Google Play"
,
"http://www.youtube.com/api/manifest/dash/id/3aa39fa2cc27967f/source/youtube?"
+
"as=fmp4_audio_clear,fmp4_sd_hd_clear&sparams=ip,ipbits,expire,source,id,as&ip=0.0.0.0&"
...
...
library/src/main/java/com/google/android/exoplayer/extractor/ts/MpaReader.java
View file @
ed856b2a
...
...
@@ -171,7 +171,7 @@ import java.util.Collections;
break
;
case
STATE_READING_HEADER:
int
targetLength
=
hasCrc
?
HEADER_SIZE
+
CRC_SIZE
:
HEADER_SIZE
;
if
(
continueRead
(
data
,
mpaScratch
.
getData
()
,
targetLength
))
{
if
(
continueRead
(
data
,
mpaScratch
.
data
,
targetLength
))
{
parseHeader
();
bytesRead
=
targetLength
;
state
=
STATE_READING_SAMPLE
;
...
...
@@ -287,7 +287,16 @@ import java.util.Collections;
mpaScratch
.
setPosition
(
0
);
ParsableByteArray
header
=
new
ParsableByteArray
(
mpaScratch
.
getData
()
,
headerLength
);
ParsableByteArray
header
=
new
ParsableByteArray
(
mpaScratch
.
data
,
headerLength
);
output
.
sampleData
(
header
,
headerLength
);
}
/* (non-Javadoc)
* @see com.google.android.exoplayer.extractor.ts.ElementaryStreamReader#seek()
*/
@Override
public
void
seek
()
{
// TODO(olly): Auto-generated method stub
}
}
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