Merge "Camera3: Add error stream ID for buffer drop errors" into nyc-dev (97a33096) · Commits · e / os / android_frameworks_av

camera/CaptureResult.cpp

+2 −0

Original line number	Diff line number	Diff line
		@@ -38,6 +38,7 @@ status_t CaptureResultExtras::readFromParcel(const Parcel *parcel) {
		parcel->readInt32(&precaptureTriggerId);
		parcel->readInt64(&frameNumber);
		parcel->readInt32(&partialResultCount);
		parcel->readInt32(&errorStreamId);

		return OK;
		}
		@@ -54,6 +55,7 @@ status_t CaptureResultExtras::writeToParcel(Parcel *parcel) const {
		parcel->writeInt32(precaptureTriggerId);
		parcel->writeInt64(frameNumber);
		parcel->writeInt32(partialResultCount);
		parcel->writeInt32(errorStreamId);

		return OK;
		}

+8 −1

Original line number	Diff line number	Diff line
		@@ -63,6 +63,12 @@ struct CaptureResultExtras : public android::Parcelable {
		*/
		int32_t partialResultCount;

		/**
		* For buffer drop errors, the stream ID for the stream that lost a buffer.
		* Otherwise -1.
		*/
		int32_t errorStreamId;

		/**
		* Constructor initializes object as invalid by setting requestId to be -1.
		*/
		@@ -72,7 +78,8 @@ struct CaptureResultExtras : public android::Parcelable {
		afTriggerId(0),
		precaptureTriggerId(0),
		frameNumber(0),
		partialResultCount(0) {
		partialResultCount(0),
		errorStreamId(-1) {
		}

		/**

+1 −0

Original line number	Diff line number	Diff line
		@@ -2495,6 +2495,7 @@ void Camera3Device::notifyError(const camera3_error_msg_t &msg,
		resultExtras.frameNumber);
		}
		}
		resultExtras.errorStreamId = streamId;
		if (listener != NULL) {
		listener->notifyError(errorCode, resultExtras);
		} else {