diff options
| author | James Dong <jdong@google.com> | 2011-05-19 08:49:09 -0700 |
|---|---|---|
| committer | James Dong <jdong@google.com> | 2011-05-19 08:49:09 -0700 |
| commit | e39350924f4e743ec04cc9640526e06990c8cbda (patch) | |
| tree | e487042bd2d1be10ec3a4130233c5e5ef4108686 /media/libstagefright/include/AwesomePlayer.h | |
| parent | cfb0efbe5d517ad94e88c7b65884ae14c790c1ac (diff) | |
| parent | e9ca6fe963ae271f38eb01a5d2246ff4fbb9afdc (diff) | |
| download | frameworks_av-e39350924f4e743ec04cc9640526e06990c8cbda.zip frameworks_av-e39350924f4e743ec04cc9640526e06990c8cbda.tar.gz frameworks_av-e39350924f4e743ec04cc9640526e06990c8cbda.tar.bz2 | |
resolved conflicts for merge of a8939e0d to master
Change-Id: I090479ed09618e1aa3685ca79e16202d9c82f523
Diffstat (limited to 'media/libstagefright/include/AwesomePlayer.h')
| -rw-r--r-- | media/libstagefright/include/AwesomePlayer.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/media/libstagefright/include/AwesomePlayer.h b/media/libstagefright/include/AwesomePlayer.h index 835d2bb..3c9a121 100644 --- a/media/libstagefright/include/AwesomePlayer.h +++ b/media/libstagefright/include/AwesomePlayer.h @@ -45,6 +45,7 @@ class DrmManagerClinet; class DecryptHandle; class TimedTextPlayer; +struct WVMExtractor; struct AwesomeRenderer : public RefBase { AwesomeRenderer() {} @@ -231,6 +232,8 @@ private: int64_t mLastVideoTimeUs; TimedTextPlayer *mTextPlayer; + sp<WVMExtractor> mWVMExtractor; + status_t setDataSource_l( const char *uri, const KeyedVector<String8, String8> *headers = NULL); @@ -286,6 +289,8 @@ private: void shutdownVideoDecoder_l(); void setNativeWindow_l(const sp<ANativeWindow> &native); + bool isStreamingHTTP() const; + AwesomePlayer(const AwesomePlayer &); AwesomePlayer &operator=(const AwesomePlayer &); }; |