resolved conflicts for 76b704e3 to lmp-mr1-dev (67f36a8e) · Commits · e / os / android_frameworks_av

media/libmediaplayerservice/nuplayer/GenericSource.cpp

+23 −8

Original line number	Diff line number	Diff line
		@@ -468,9 +468,17 @@ void NuPlayer::GenericSource::notifyPreparedAndCleanup(status_t err) {
		mMetaDataSize = -1ll;
		mContentType = "";
		mSniffedMIME = "";
		{
		sp<DataSource> dataSource = mDataSource;
		sp<NuCachedSource2> cachedSource = mCachedSource;
		sp<DataSource> httpSource = mHttpSource;
		{
		Mutex::Autolock _l(mDisconnectLock);
		mDataSource.clear();
		mCachedSource.clear();
		mHttpSource.clear();
		}
		}
		mBitrate = -1;

		cancelPollBuffering();
		@@ -593,13 +601,20 @@ void NuPlayer::GenericSource::resume() {
		}

		void NuPlayer::GenericSource::disconnect() {
		if (mDataSource != NULL) {
		sp<DataSource> dataSource, httpSource;
		{
		Mutex::Autolock _l(mDisconnectLock);
		dataSource = mDataSource;
		httpSource = mHttpSource;
		}

		if (dataSource != NULL) {
		// disconnect data source
		if (mDataSource->flags() & DataSource::kIsCachingDataSource) {
		static_cast<NuCachedSource2 *>(mDataSource.get())->disconnect();
		if (dataSource->flags() & DataSource::kIsCachingDataSource) {
		static_cast<NuCachedSource2 *>(dataSource.get())->disconnect();
		}
		} else if (mHttpSource != NULL) {
		static_cast<HTTPBase *>(mHttpSource.get())->disconnect();
		} else if (httpSource != NULL) {
		static_cast<HTTPBase *>(httpSource.get())->disconnect();
		}
		}

+1 −0

Original line number	Diff line number	Diff line
		@@ -149,6 +149,7 @@ private:
		bool mBuffering;
		bool mPrepareBuffering;
		mutable Mutex mReadBufferLock;
		mutable Mutex mDisconnectLock;

		sp<ALooper> mLooper;