diff options
author | Chong Zhang <chz@google.com> | 2014-08-06 22:40:37 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-08-06 22:40:37 +0000 |
commit | 25d9b3df27fb96c616447723d7c4dca8770cebfb (patch) | |
tree | 928f7d097df5861b99e20e9fbb776240d29f754e /media/libmediaplayerservice/nuplayer/GenericSource.h | |
parent | 3cb022c42b2c20b4bfbc87ad9327462b85b9d29a (diff) | |
parent | 29e09664c2c5b49d78f2666d38a812502a36e26b (diff) | |
download | frameworks_av-25d9b3df27fb96c616447723d7c4dca8770cebfb.zip frameworks_av-25d9b3df27fb96c616447723d7c4dca8770cebfb.tar.gz frameworks_av-25d9b3df27fb96c616447723d7c4dca8770cebfb.tar.bz2 |
am 29e09664: Merge "some fixes for crash when extractor creation fails" into lmp-dev
* commit '29e09664c2c5b49d78f2666d38a812502a36e26b':
some fixes for crash when extractor creation fails
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, |