diff options
| author | Steve Kondik <steve@cyngn.com> | 2015-11-16 14:35:33 -0800 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2015-11-16 19:27:41 -0800 |
| commit | 842f7df253913a11b6dbc705b83299c437edd4e3 (patch) | |
| tree | 6cb7da0af2b2b7254d8e43c454cb881dfa15f206 /media/libmediaplayerservice/nuplayer/GenericSource.h | |
| parent | 8ab5ff0b3709976cde09362e7444d78d0a981dd3 (diff) | |
| parent | 60282213a1194ee8753ac53b97fc7f7e36373e17 (diff) | |
| download | frameworks_av-842f7df253913a11b6dbc705b83299c437edd4e3.zip frameworks_av-842f7df253913a11b6dbc705b83299c437edd4e3.tar.gz frameworks_av-842f7df253913a11b6dbc705b83299c437edd4e3.tar.bz2 | |
Merge branch 'LA.BF64.1.2.2_rb4.7' of git://codeaurora.org/platform/frameworks/av into cm-13.0
Change-Id: Ia41df61c3ccfeb809572b63a4b1a8ca6bd85dfb2
Diffstat (limited to 'media/libmediaplayerservice/nuplayer/GenericSource.h')
| -rw-r--r-- | media/libmediaplayerservice/nuplayer/GenericSource.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libmediaplayerservice/nuplayer/GenericSource.h b/media/libmediaplayerservice/nuplayer/GenericSource.h index bdcf706..c1d6e3e 100644 --- a/media/libmediaplayerservice/nuplayer/GenericSource.h +++ b/media/libmediaplayerservice/nuplayer/GenericSource.h @@ -137,6 +137,7 @@ protected: int64_t mOffset; int64_t mLength; + Mutex mSourceLock; sp<DataSource> mDataSource; sp<NuCachedSource2> mCachedSource; sp<DataSource> mHttpSource; @@ -154,7 +155,6 @@ protected: int32_t mPrevBufferPercentage; mutable Mutex mReadBufferLock; - mutable Mutex mDisconnectLock; sp<ALooper> mLooper; |