diff options
author | Chong Zhang <chz@google.com> | 2014-08-05 20:54:44 -0700 |
---|---|---|
committer | Chong Zhang <chz@google.com> | 2014-08-06 15:23:54 -0700 |
commit | 3de157dd8f9cd45bf9b0406268f5830887105ae1 (patch) | |
tree | 4c3423bb8c2005aac32ab3519ad73978d144b8ad /media/libmediaplayerservice/nuplayer/GenericSource.h | |
parent | 92ce4715315bddd158c7d4028556632f0547e3b9 (diff) | |
download | frameworks_av-3de157dd8f9cd45bf9b0406268f5830887105ae1.zip frameworks_av-3de157dd8f9cd45bf9b0406268f5830887105ae1.tar.gz frameworks_av-3de157dd8f9cd45bf9b0406268f5830887105ae1.tar.bz2 |
some fixes for crash when extractor creation fails
- prefetch data for sniffing
- notify error instead of crashing if extractor is NULL
Bug: 16818302
Change-Id: I56ff4996d99ac2811d19d141f7ff7acdd7c1da17
Diffstat (limited to 'media/libmediaplayerservice/nuplayer/GenericSource.h')
-rw-r--r-- | media/libmediaplayerservice/nuplayer/GenericSource.h | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/media/libmediaplayerservice/nuplayer/GenericSource.h b/media/libmediaplayerservice/nuplayer/GenericSource.h index 3c5f55c..76e628b 100644 --- a/media/libmediaplayerservice/nuplayer/GenericSource.h +++ b/media/libmediaplayerservice/nuplayer/GenericSource.h @@ -34,18 +34,14 @@ struct MediaSource; class MediaBuffer; struct NuPlayer::GenericSource : public NuPlayer::Source { - GenericSource( - const sp<AMessage> ¬ify, + GenericSource(const sp<AMessage> ¬ify, bool uidValid, uid_t uid); + + status_t init( const sp<IMediaHTTPService> &httpService, const char *url, - const KeyedVector<String8, String8> *headers, - bool isWidevine = false, - bool uidValid = false, - uid_t uid = 0); + const KeyedVector<String8, String8> *headers); - GenericSource( - const sp<AMessage> ¬ify, - int fd, int64_t offset, int64_t length); + status_t init(int fd, int64_t offset, int64_t length); virtual void prepareAsync(); @@ -101,7 +97,9 @@ private: bool mUIDValid; uid_t mUID; - void initFromDataSource(const sp<DataSource> &dataSource); + status_t initFromDataSource( + const sp<DataSource> &dataSource, + const char *mime); void fetchTextData( uint32_t what, media_track_type type, |