diff options
| author | Andreas Huber <andih@google.com> | 2010-10-01 11:25:57 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-01 11:25:57 -0700 |
| commit | d6d5cfb91469d4f060db7cfccfd883903ce95f16 (patch) | |
| tree | 91c6f3cfe7788905467abe56f0afe4aa02489d81 /media | |
| parent | 277465fb5bfc74716f194f1abc2befb42ed73590 (diff) | |
| parent | 469b80336368bef3742e97c15e9017c1f2d404ae (diff) | |
| download | frameworks_base-d6d5cfb91469d4f060db7cfccfd883903ce95f16.zip frameworks_base-d6d5cfb91469d4f060db7cfccfd883903ce95f16.tar.gz frameworks_base-d6d5cfb91469d4f060db7cfccfd883903ce95f16.tar.bz2 | |
am 469b8033: Merge "Remove development-only code." into gingerbread
Merge commit '469b80336368bef3742e97c15e9017c1f2d404ae' into gingerbread-plus-aosp
* commit '469b80336368bef3742e97c15e9017c1f2d404ae':
Remove development-only code.
Diffstat (limited to 'media')
| -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 0c07866..c955ac3 100644 --- a/media/libstagefright/AwesomePlayer.cpp +++ b/media/libstagefright/AwesomePlayer.cpp @@ -273,21 +273,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(); |