diff options
author | Andreas Huber <andih@google.com> | 2010-10-01 10:51:41 -0700 |
---|---|---|
committer | Andreas Huber <andih@google.com> | 2010-10-01 10:51:41 -0700 |
commit | 6a63a939601645404fd98f58c19cc38ca818d99e (patch) | |
tree | 55a39e29f7b618aabd33ef77c03c8b48c7a1e351 /media/libstagefright/AwesomePlayer.cpp | |
parent | 44d9848d6656777a18019223e0d35f2fcc67719a (diff) | |
download | frameworks_av-6a63a939601645404fd98f58c19cc38ca818d99e.zip frameworks_av-6a63a939601645404fd98f58c19cc38ca818d99e.tar.gz frameworks_av-6a63a939601645404fd98f58c19cc38ca818d99e.tar.bz2 |
Squashed commit of the following:
commit 46744c7697f29aec71aed8de3c95ce035c284d97
Author: Andreas Huber <andih@google.com>
Date: Thu Sep 30 16:44:57 2010 -0700
better separation of access units
Change-Id: I5a9e2138aed341f0bcf22cfe368a15ca5ea5a73c
commit d34952ac0feb1ae722ff65824d7353335502219b
Author: Andreas Huber <andih@google.com>
Date: Thu Sep 30 15:35:01 2010 -0700
Support for ES packets that do not start on PES packet boundaries.
Change-Id: I2cf012833948eddfb20b16a1901206cf22ce71e4
related-to-bug: 2368598
Change-Id: Ib9329bd6bb7149b5a6e2483788a96b1b158952fc
Diffstat (limited to 'media/libstagefright/AwesomePlayer.cpp')
-rw-r--r-- | media/libstagefright/AwesomePlayer.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/media/libstagefright/AwesomePlayer.cpp b/media/libstagefright/AwesomePlayer.cpp index 12022bd..0c07866 100644 --- a/media/libstagefright/AwesomePlayer.cpp +++ b/media/libstagefright/AwesomePlayer.cpp @@ -274,6 +274,7 @@ status_t AwesomePlayer::setDataSource_l( status_t AwesomePlayer::setDataSource( int fd, int64_t offset, int64_t length) { #if 0 + // return setDataSource("httplive://ipad.akamai.com/Video_Content/usat/tt_062209_iphone/440k/prog_index.m3u8"); // return setDataSource("httplive://qthttp.apple.com.edgesuite.net/1009qpeijrfn/sl.m3u8"); return setDataSource("httplive://qthttp.apple.com.edgesuite.net/1009qpeijrfn/0440.m3u8"); // return setDataSource("httplive://qthttp.apple.com.edgesuite.net/1009qpeijrfn/0640.m3u8"); |