am aaf36e2f: Merge "don\'t trigger an integer underflow when decrementing." (ecff57d7) · Commits · e / os / android_frameworks_av

media/libstagefright/ACodec.cpp

+4 −2

Original line number	Diff line number	Diff line
		@@ -1003,7 +1003,8 @@ ACodec::BufferInfo *ACodec::dequeueBufferFromNativeWindow() {
		}

		status_t ACodec::freeBuffersOnPort(OMX_U32 portIndex) {
		for (size_t i = mBuffers[portIndex].size(); i-- > 0;) {
		for (size_t i = mBuffers[portIndex].size(); i > 0;) {
		i--;
		CHECK_EQ((status_t)OK, freeBuffer(portIndex, i));
		}

		@@ -1013,7 +1014,8 @@ status_t ACodec::freeBuffersOnPort(OMX_U32 portIndex) {
		}

		status_t ACodec::freeOutputBuffersNotOwnedByComponent() {
		for (size_t i = mBuffers[kPortIndexOutput].size(); i-- > 0;) {
		for (size_t i = mBuffers[kPortIndexOutput].size(); i > 0;) {
		i--;
		BufferInfo *info =
		&mBuffers[kPortIndexOutput].editItemAt(i);

+2 −1

Original line number	Diff line number	Diff line
		@@ -123,7 +123,8 @@ void MediaCodecList::parseTopLevelXMLFile(const char *codecs_xml) {
		return;
		}

		for (size_t i = mCodecInfos.size(); i-- > 0;) {
		for (size_t i = mCodecInfos.size(); i > 0;) {
		i--;
		const MediaCodecInfo &info = *mCodecInfos.itemAt(i).get();

		if (info.mCaps.size() == 0) {

+2 −1

Original line number	Diff line number	Diff line
		@@ -109,7 +109,8 @@ void AHierarchicalStateMachine::changeState(const sp<AState> &state) {
		A.editItemAt(i)->stateExited();
		}

		for (size_t i = B.size(); i-- > 0;) {
		for (size_t i = B.size(); i > 0;) {
		i--;
		B.editItemAt(i)->stateEntered();
		}
		}

+2 −1

Original line number	Diff line number	Diff line
		@@ -80,7 +80,8 @@ void ALooperRoster::unregisterStaleHandlers() {
		{
		Mutex::Autolock autoLock(mLock);

		for (size_t i = mHandlers.size(); i-- > 0;) {
		for (size_t i = mHandlers.size(); i > 0;) {
		i--;
		const HandlerInfo &info = mHandlers.valueAt(i);

		sp<ALooper> looper = info.mLooper.promote();