diff options
| author | Andreas Huber <andih@google.com> | 2010-10-01 11:29:26 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-01 11:29:26 -0700 |
| commit | fa1dc774ac8b929666519c57560bf2ce6d422e0f (patch) | |
| tree | 5aba32f0d2adf92579ff50e9fa1ee891d6bef8a0 /media/libstagefright/AwesomePlayer.cpp | |
| parent | 969247b7ab387743035dece47356678c8aec2ac4 (diff) | |
| parent | c0c726a34f2a35623e0451315d86bead0dcc8f2e (diff) | |
| download | frameworks_av-fa1dc774ac8b929666519c57560bf2ce6d422e0f.zip frameworks_av-fa1dc774ac8b929666519c57560bf2ce6d422e0f.tar.gz frameworks_av-fa1dc774ac8b929666519c57560bf2ce6d422e0f.tar.bz2 | |
am d6d5cfb9: am 469b8033: Merge "Remove development-only code." into gingerbread
Merge commit 'd6d5cfb91469d4f060db7cfccfd883903ce95f16'
* commit 'd6d5cfb91469d4f060db7cfccfd883903ce95f16':
Remove development-only code.
Diffstat (limited to 'media/libstagefright/AwesomePlayer.cpp')
| -rw-r--r-- | media/libstagefright/AwesomePlayer.cpp | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/media/libstagefright/AwesomePlayer.cpp b/media/libstagefright/AwesomePlayer.cpp index 1e73afe..8e50d39 100644 --- a/media/libstagefright/AwesomePlayer.cpp +++ b/media/libstagefright/AwesomePlayer.cpp @@ -276,21 +276,6 @@ 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"); - // return setDataSource("httplive://qthttp.apple.com.edgesuite.net/1009qpeijrfn/1240_vod.m3u8"); - // return setDataSource("httplive://iphoned5.akamai.com.edgesuite.net/mhbarron/nasatv/nasatv_96.m3u8"); - // return setDataSource("httplive://iphoned5.akamai.com.edgesuite.net/mhbarron/nasatv/nasatv_1500.m3u8"); - // return setDataSource("httplive://iphone.video.hsn.com/iPhone_high.m3u8"); - // return setDataSource("httplive://iphoned5.akamai.com.edgesuite.net/mhbarron/iphonewebcast/webcast090209_all/webcast090209_all.m3u8"); - // return setDataSource("httplive://qthttp.akamai.com.edgesuite.net/iphone_demo/Video_Content/usat/tt_062209_iphone/hi/prog_index.m3u8"); - // return setDataSource("httplive://qthttp.akamai.com.edgesuite.net/iphone_demo/Video_Content/usat/tt_googmaps/hi/prog_index.m3u8"); - // return setDataSource("httplive://qthttp.akamai.com.edgesuite.net/iphone_demo/Video_Content/mtv/ni_spo_25a_rt74137_clip_syn/hi/prog_index.m3u8"); -#endif - Mutex::Autolock autoLock(mLock); reset_l(); |