diff options
author | Manikanta Kanamarlapudi <kmanikan@codeaurora.org> | 2015-11-06 19:16:31 +0530 |
---|---|---|
committer | Steve Kondik <steve@cyngn.com> | 2015-11-24 04:02:48 -0800 |
commit | 4f8fc5a1534d452a072eab2e1eebd4ffa744ac4a (patch) | |
tree | 4781cb3ba9984c204d476d4de11b9364d26b8b3b | |
parent | 3a0bcf107182665d5b8628245750f1e210ef0936 (diff) | |
download | frameworks_av-4f8fc5a1534d452a072eab2e1eebd4ffa744ac4a.zip frameworks_av-4f8fc5a1534d452a072eab2e1eebd4ffa744ac4a.tar.gz frameworks_av-4f8fc5a1534d452a072eab2e1eebd4ffa744ac4a.tar.bz2 |
Revert "GenericSource: Synchronize access to dataSource"
This reverts commit a5c3b990807732d1c4a7c1290cba06a605675973.
Change-Id: I1f267cf7ab90b1f5c38e0659df02c8ef518382ed
-rw-r--r-- | media/libmediaplayerservice/nuplayer/GenericSource.cpp | 28 | ||||
-rw-r--r-- | media/libmediaplayerservice/nuplayer/GenericSource.h | 1 |
2 files changed, 6 insertions, 23 deletions
diff --git a/media/libmediaplayerservice/nuplayer/GenericSource.cpp b/media/libmediaplayerservice/nuplayer/GenericSource.cpp index d761bdf..7c99f11 100644 --- a/media/libmediaplayerservice/nuplayer/GenericSource.cpp +++ b/media/libmediaplayerservice/nuplayer/GenericSource.cpp @@ -128,7 +128,6 @@ status_t NuPlayer::GenericSource::setDataSource( status_t NuPlayer::GenericSource::setDataSource(const sp<DataSource>& source) { resetDataSource(); - Mutex::Autolock _l(mSourceLock); mDataSource = source; return OK; } @@ -156,12 +155,7 @@ status_t NuPlayer::GenericSource::initFromDataSource() { return UNKNOWN_ERROR; } } else if (mIsStreaming) { - sp<DataSource> dataSource; - { - Mutex::Autolock _l(mSourceLock); - dataSource = mDataSource; - } - if (!dataSource->sniff(&mimeType, &confidence, &dummy)) { + if (!mDataSource->sniff(&mimeType, &confidence, &dummy)) { return UNKNOWN_ERROR; } isWidevineStreaming = !strcasecmp( @@ -393,7 +387,6 @@ void NuPlayer::GenericSource::onPrepareAsync() { } } - Mutex::Autolock _l(mSourceLock); mDataSource = DataSource::CreateFromURI( mHTTPService, uri, &mUriHeaders, &contentType, static_cast<HTTPBase *>(mHttpSource.get()), @@ -401,7 +394,6 @@ void NuPlayer::GenericSource::onPrepareAsync() { } else { mIsWidevine = false; - Mutex::Autolock _l(mSourceLock); mDataSource = new FileSource(mFd, mOffset, mLength); mFd = -1; } @@ -493,7 +485,6 @@ void NuPlayer::GenericSource::finishPrepareAsync() { void NuPlayer::GenericSource::notifyPreparedAndCleanup(status_t err) { if (err != OK) { { - Mutex::Autolock _l(mSourceLock); mDataSource.clear(); mCachedSource.clear(); mHttpSource.clear(); @@ -550,20 +541,13 @@ void NuPlayer::GenericSource::resume() { } void NuPlayer::GenericSource::disconnect() { - sp<DataSource> dataSource, httpSource; - { - Mutex::Autolock _l(mSourceLock); - dataSource = mDataSource; - httpSource = mHttpSource; - } - - if (dataSource != NULL) { + if (mDataSource != NULL) { // disconnect data source - if (dataSource->flags() & DataSource::kIsCachingDataSource) { - static_cast<NuCachedSource2 *>(dataSource.get())->disconnect(); + if (mDataSource->flags() & DataSource::kIsCachingDataSource) { + static_cast<NuCachedSource2 *>(mDataSource.get())->disconnect(); } - } else if (httpSource != NULL) { - static_cast<HTTPBase *>(httpSource.get())->disconnect(); + } else if (mHttpSource != NULL) { + static_cast<HTTPBase *>(mHttpSource.get())->disconnect(); } } diff --git a/media/libmediaplayerservice/nuplayer/GenericSource.h b/media/libmediaplayerservice/nuplayer/GenericSource.h index c1d6e3e..ebc1fdc 100644 --- a/media/libmediaplayerservice/nuplayer/GenericSource.h +++ b/media/libmediaplayerservice/nuplayer/GenericSource.h @@ -137,7 +137,6 @@ protected: int64_t mOffset; int64_t mLength; - Mutex mSourceLock; sp<DataSource> mDataSource; sp<NuCachedSource2> mCachedSource; sp<DataSource> mHttpSource; |