Merge "Always set geometry in queuebuffer" (7280088b) · Commits · e / os / android_frameworks_av

media/libstagefright/SurfaceMediaSource.cpp

+5 −4

Original line number	Diff line number	Diff line
		@@ -458,6 +458,10 @@ status_t SurfaceMediaSource::queueBuffer(int bufIndex, int64_t timestamp,
		LOGV("queueBuffer");

		Mutex::Autolock lock(mMutex);
		*outWidth = mDefaultWidth;
		*outHeight = mDefaultHeight;
		*outTransform = 0;

		if (bufIndex < 0 \|\| bufIndex >= mBufferCount) {
		LOGE("queueBuffer: slot index out of range [0, %d]: %d",
		mBufferCount, bufIndex);
		@@ -518,9 +522,6 @@ status_t SurfaceMediaSource::queueBuffer(int bufIndex, int64_t timestamp,
		// buffer is available
		onFrameReceivedLocked();

		*outWidth = mDefaultWidth;
		*outHeight = mDefaultHeight;
		*outTransform = 0;

		return OK;
		}