Snap for 5595753 from f9b3d532eb7422446d7efbd54b15fa87ea60d68a to qt-release (7565c535) · Commits · e / os / android_frameworks_av

media/bufferpool/1.0/BufferPoolClient.cpp

+4 −0

Original line number	Diff line number	Diff line
		@@ -528,6 +528,10 @@ void BufferPoolClient::Impl::trySyncFromRemote() {
		(void) outStatus;
		(void) outBuffer;
		});
		if(!transResult.isOk()) {
		ALOGD("sync from client %lld failed: bufferpool process died.",
		(long long)mConnectionId);
		}
		}
		mRemoteSyncLock.unlock();
		}

+7 −1

Original line number	Diff line number	Diff line
		@@ -261,14 +261,20 @@ void Accessor::Impl::handleInvalidateAck() {
		mBufferPool.mInvalidation.onHandleAck(&observers, &invalidationId);
		}
		// Do not hold lock for send invalidations
		size_t deadClients = 0;
		for (auto it = observers.begin(); it != observers.end(); ++it) {
		const sp<IObserver> observer = it->second;
		if (observer) {
		Return<void> transResult = observer->onMessage(it->first, invalidationId);
		(void) transResult;
		if (!transResult.isOk()) {
		++deadClients;
		}
		}
		}
		if (deadClients > 0) {
		ALOGD("During invalidation found %zu dead clients", deadClients);
		}
		}

		bool Accessor::Impl::isValid() {
		return mBufferPool.isValid();

+4 −0

Original line number	Diff line number	Diff line
		@@ -582,6 +582,10 @@ void BufferPoolClient::Impl::trySyncFromRemote() {
		(void) outStatus;
		(void) outBuffer;
		});
		if (!transResult.isOk()) {
		ALOGD("sync from client %lld failed: bufferpool process died.",
		(long long)mConnectionId);
		}
		}
		mRemoteSyncLock.unlock();
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -1772,7 +1772,7 @@ status_t MPEG4Extractor::parseChunk(off64_t *offset, int depth) {
		int64_t codecDelay = pre_skip * 1000000000ll / kOpusSampleRate;

		AMediaFormat_setBuffer(mLastTrack->meta,
		AMEDIAFORMAT_KEY_CSD_0, opusInfo, sizeof(opusInfo));
		AMEDIAFORMAT_KEY_CSD_0, opusInfo, opusInfoSize);
		AMediaFormat_setBuffer(mLastTrack->meta,
		AMEDIAFORMAT_KEY_CSD_1, &codecDelay, sizeof(codecDelay));
		AMediaFormat_setBuffer(mLastTrack->meta,

+1 −1

Original line number	Diff line number	Diff line
		@@ -208,7 +208,7 @@ int WriteOpusHeaders(const OpusHeader &header, int inputSampleRate,
		headerLen += AOPUS_LENGTH_SIZE;

		int headerSize = WriteOpusHeader(header, inputSampleRate, output + headerLen,
		outputSize);
		outputSize - headerLen);
		if (headerSize < 0) {
		ALOGD("%s: WriteOpusHeader failed", __func__);
		return -1;