Revert "Camera: Add lastCompletedFrameNumber in CaptureResultExtras"
Revert "Camera: Fix race for onCaptureBufferLost callback"
Revert submission 11415576-bufferErrorLossFix
Reason for revert: Breaks Camera on at least the wembley device
Reverted Changes:
I12b716acc:Camera: Fix race for onCaptureBufferLost callback
I43f0f5ea1:Camera: Add lastCompletedFrameNumber in CaptureRes...
Bug: 158622719
Change-Id: I98440c52f61d571e1cb6692667fb067020746795
Test: Locally tried this revert on rvc-dev on a wembley, and now the Camera works
diff --git a/services/camera/libcameraservice/device3/Camera3Device.cpp b/services/camera/libcameraservice/device3/Camera3Device.cpp
index 453040e..b00a2d9 100644
--- a/services/camera/libcameraservice/device3/Camera3Device.cpp
+++ b/services/camera/libcameraservice/device3/Camera3Device.cpp
@@ -756,10 +756,9 @@
for (size_t i = 0; i < mInFlightMap.size(); i++) {
InFlightRequest r = mInFlightMap.valueAt(i);
lines.appendFormat(" Frame %d | Timestamp: %" PRId64 ", metadata"
- " arrived: %s, buffers left: %d, buffers returned with STATUS_ERROR: %d, "
- " buffers notified with error: %d\n", mInFlightMap.keyAt(i),
+ " arrived: %s, buffers left: %d\n", mInFlightMap.keyAt(i),
r.shutterTimestamp, r.haveResultMetadata ? "true" : "false",
- r.numBuffersLeft, r.numErrorBuffersReturned, r.numErrorBuffersNotified);
+ r.numBuffersLeft);
}
}
write(fd, lines.string(), lines.size());
@@ -1044,9 +1043,8 @@
}
CaptureOutputStates states {
mId,
- mInFlightLock, mLastCompletedRegularFrameNumber,
- mLastCompletedReprocessFrameNumber, mLastCompletedZslFrameNumber,
- mInFlightMap, mOutputLock, mResultQueue, mResultSignal,
+ mInFlightLock, mInFlightMap,
+ mOutputLock, mResultQueue, mResultSignal,
mNextShutterFrameNumber,
mNextReprocessShutterFrameNumber, mNextZslStillShutterFrameNumber,
mNextResultFrameNumber,
@@ -1102,9 +1100,8 @@
CaptureOutputStates states {
mId,
- mInFlightLock, mLastCompletedRegularFrameNumber,
- mLastCompletedReprocessFrameNumber, mLastCompletedZslFrameNumber,
- mInFlightMap, mOutputLock, mResultQueue, mResultSignal,
+ mInFlightLock, mInFlightMap,
+ mOutputLock, mResultQueue, mResultSignal,
mNextShutterFrameNumber,
mNextReprocessShutterFrameNumber, mNextZslStillShutterFrameNumber,
mNextResultFrameNumber,
@@ -1142,9 +1139,8 @@
CaptureOutputStates states {
mId,
- mInFlightLock, mLastCompletedRegularFrameNumber,
- mLastCompletedReprocessFrameNumber, mLastCompletedZslFrameNumber,
- mInFlightMap, mOutputLock, mResultQueue, mResultSignal,
+ mInFlightLock, mInFlightMap,
+ mOutputLock, mResultQueue, mResultSignal,
mNextShutterFrameNumber,
mNextReprocessShutterFrameNumber, mNextZslStillShutterFrameNumber,
mNextResultFrameNumber,
@@ -5910,13 +5906,11 @@
// though technically no other thread should be talking to Camera3Device at this point
Camera3OfflineStates offlineStates(
mTagMonitor, mVendorTagId, mUseHalBufManager, mNeedFixupMonochromeTags,
- mUsePartialResult, mNumPartialResults, mLastCompletedRegularFrameNumber,
- mLastCompletedReprocessFrameNumber, mLastCompletedZslFrameNumber,
- mNextResultFrameNumber, mNextReprocessResultFrameNumber,
- mNextZslStillResultFrameNumber, mNextShutterFrameNumber,
- mNextReprocessShutterFrameNumber, mNextZslStillShutterFrameNumber,
- mDeviceInfo, mPhysicalDeviceInfoMap, mDistortionMappers,
- mZoomRatioMappers, mRotateAndCropMappers);
+ mUsePartialResult, mNumPartialResults, mNextResultFrameNumber,
+ mNextReprocessResultFrameNumber, mNextZslStillResultFrameNumber,
+ mNextShutterFrameNumber, mNextReprocessShutterFrameNumber,
+ mNextZslStillShutterFrameNumber, mDeviceInfo, mPhysicalDeviceInfoMap,
+ mDistortionMappers, mZoomRatioMappers, mRotateAndCropMappers);
*session = new Camera3OfflineSession(mId, inputStream, offlineStreamSet,
std::move(bufferRecords), offlineReqs, offlineStates, offlineSession);
diff --git a/services/camera/libcameraservice/device3/Camera3Device.h b/services/camera/libcameraservice/device3/Camera3Device.h
index ac3b344..c059f55 100644
--- a/services/camera/libcameraservice/device3/Camera3Device.h
+++ b/services/camera/libcameraservice/device3/Camera3Device.h
@@ -1017,9 +1017,6 @@
std::mutex mInFlightLock;
camera3::InFlightRequestMap mInFlightMap;
nsecs_t mExpectedInflightDuration = 0;
- int64_t mLastCompletedRegularFrameNumber = -1;
- int64_t mLastCompletedReprocessFrameNumber = -1;
- int64_t mLastCompletedZslFrameNumber = -1;
// End of mInFlightLock protection scope
int mInFlightStatusId; // const after initialize
diff --git a/services/camera/libcameraservice/device3/Camera3OfflineSession.cpp b/services/camera/libcameraservice/device3/Camera3OfflineSession.cpp
index 95f9633..5942868 100644
--- a/services/camera/libcameraservice/device3/Camera3OfflineSession.cpp
+++ b/services/camera/libcameraservice/device3/Camera3OfflineSession.cpp
@@ -61,9 +61,6 @@
mNeedFixupMonochromeTags(offlineStates.mNeedFixupMonochromeTags),
mUsePartialResult(offlineStates.mUsePartialResult),
mNumPartialResults(offlineStates.mNumPartialResults),
- mLastCompletedRegularFrameNumber(offlineStates.mLastCompletedRegularFrameNumber),
- mLastCompletedReprocessFrameNumber(offlineStates.mLastCompletedReprocessFrameNumber),
- mLastCompletedZslFrameNumber(offlineStates.mLastCompletedZslFrameNumber),
mNextResultFrameNumber(offlineStates.mNextResultFrameNumber),
mNextReprocessResultFrameNumber(offlineStates.mNextReprocessResultFrameNumber),
mNextZslStillResultFrameNumber(offlineStates.mNextZslStillResultFrameNumber),
@@ -250,9 +247,8 @@
CaptureOutputStates states {
mId,
- mOfflineReqsLock, mLastCompletedRegularFrameNumber,
- mLastCompletedReprocessFrameNumber, mLastCompletedZslFrameNumber,
- mOfflineReqs, mOutputLock, mResultQueue, mResultSignal,
+ mOfflineReqsLock, mOfflineReqs,
+ mOutputLock, mResultQueue, mResultSignal,
mNextShutterFrameNumber,
mNextReprocessShutterFrameNumber, mNextZslStillShutterFrameNumber,
mNextResultFrameNumber,
@@ -289,9 +285,8 @@
CaptureOutputStates states {
mId,
- mOfflineReqsLock, mLastCompletedRegularFrameNumber,
- mLastCompletedReprocessFrameNumber, mLastCompletedZslFrameNumber,
- mOfflineReqs, mOutputLock, mResultQueue, mResultSignal,
+ mOfflineReqsLock, mOfflineReqs,
+ mOutputLock, mResultQueue, mResultSignal,
mNextShutterFrameNumber,
mNextReprocessShutterFrameNumber, mNextZslStillShutterFrameNumber,
mNextResultFrameNumber,
@@ -323,9 +318,8 @@
CaptureOutputStates states {
mId,
- mOfflineReqsLock, mLastCompletedRegularFrameNumber,
- mLastCompletedReprocessFrameNumber, mLastCompletedZslFrameNumber,
- mOfflineReqs, mOutputLock, mResultQueue, mResultSignal,
+ mOfflineReqsLock, mOfflineReqs,
+ mOutputLock, mResultQueue, mResultSignal,
mNextShutterFrameNumber,
mNextReprocessShutterFrameNumber, mNextZslStillShutterFrameNumber,
mNextResultFrameNumber,
diff --git a/services/camera/libcameraservice/device3/Camera3OfflineSession.h b/services/camera/libcameraservice/device3/Camera3OfflineSession.h
index c4c7a85..208f70d 100644
--- a/services/camera/libcameraservice/device3/Camera3OfflineSession.h
+++ b/services/camera/libcameraservice/device3/Camera3OfflineSession.h
@@ -57,11 +57,10 @@
const TagMonitor& tagMonitor, const metadata_vendor_id_t vendorTagId,
const bool useHalBufManager, const bool needFixupMonochromeTags,
const bool usePartialResult, const uint32_t numPartialResults,
- const int64_t lastCompletedRegularFN, const int64_t lastCompletedReprocessFN,
- const int64_t lastCompletedZslFN, const uint32_t nextResultFN,
- const uint32_t nextReprocResultFN, const uint32_t nextZslResultFN,
- const uint32_t nextShutterFN, const uint32_t nextReprocShutterFN,
- const uint32_t nextZslShutterFN, const CameraMetadata& deviceInfo,
+ const uint32_t nextResultFN, const uint32_t nextReprocResultFN,
+ const uint32_t nextZslResultFN, const uint32_t nextShutterFN,
+ const uint32_t nextReprocShutterFN, const uint32_t nextZslShutterFN,
+ const CameraMetadata& deviceInfo,
const std::unordered_map<std::string, CameraMetadata>& physicalDeviceInfoMap,
const std::unordered_map<std::string, camera3::DistortionMapper>& distortionMappers,
const std::unordered_map<std::string, camera3::ZoomRatioMapper>& zoomRatioMappers,
@@ -70,9 +69,6 @@
mTagMonitor(tagMonitor), mVendorTagId(vendorTagId),
mUseHalBufManager(useHalBufManager), mNeedFixupMonochromeTags(needFixupMonochromeTags),
mUsePartialResult(usePartialResult), mNumPartialResults(numPartialResults),
- mLastCompletedRegularFrameNumber(lastCompletedRegularFN),
- mLastCompletedReprocessFrameNumber(lastCompletedReprocessFN),
- mLastCompletedZslFrameNumber(lastCompletedZslFN),
mNextResultFrameNumber(nextResultFN),
mNextReprocessResultFrameNumber(nextReprocResultFN),
mNextZslStillResultFrameNumber(nextZslResultFN),
@@ -94,15 +90,6 @@
const bool mUsePartialResult;
const uint32_t mNumPartialResults;
- // The last completed (buffers, result metadata, and error notify) regular
- // request frame number
- const int64_t mLastCompletedRegularFrameNumber;
- // The last completed (buffers, result metadata, and error notify) reprocess
- // request frame number
- const int64_t mLastCompletedReprocessFrameNumber;
- // The last completed (buffers, result metadata, and error notify) zsl
- // request frame number
- const int64_t mLastCompletedZslFrameNumber;
// the minimal frame number of the next non-reprocess result
const uint32_t mNextResultFrameNumber;
// the minimal frame number of the next reprocess result
@@ -227,12 +214,6 @@
std::mutex mOutputLock;
std::list<CaptureResult> mResultQueue;
std::condition_variable mResultSignal;
- // the last completed frame number of regular requests
- int64_t mLastCompletedRegularFrameNumber;
- // the last completed frame number of reprocess requests
- int64_t mLastCompletedReprocessFrameNumber;
- // the last completed frame number of ZSL still capture requests
- int64_t mLastCompletedZslFrameNumber;
// the minimal frame number of the next non-reprocess result
uint32_t mNextResultFrameNumber;
// the minimal frame number of the next reprocess result
diff --git a/services/camera/libcameraservice/device3/Camera3OutputUtils.cpp b/services/camera/libcameraservice/device3/Camera3OutputUtils.cpp
index 4994393..603f516 100644
--- a/services/camera/libcameraservice/device3/Camera3OutputUtils.cpp
+++ b/services/camera/libcameraservice/device3/Camera3OutputUtils.cpp
@@ -395,7 +395,7 @@
void removeInFlightRequestIfReadyLocked(CaptureOutputStates& states, int idx) {
InFlightRequestMap& inflightMap = states.inflightMap;
- InFlightRequest &request = inflightMap.editValueAt(idx);
+ const InFlightRequest &request = inflightMap.valueAt(idx);
const uint32_t frameNumber = inflightMap.keyAt(idx);
nsecs_t sensorTimestamp = request.sensorTimestamp;
@@ -405,8 +405,8 @@
// In the case of a successful request:
// all input and output buffers, all result metadata, shutter callback
// arrived.
- // In the case of an unsuccessful request:
- // all input and output buffers, as well as error notifications, arrived.
+ // In the case of a unsuccessful request:
+ // all input and output buffers arrived.
if (request.numBuffersLeft == 0 &&
(request.skipResultMetadata ||
(request.haveResultMetadata && shutterTimestamp != 0))) {
@@ -430,26 +430,14 @@
assert(request.requestStatus != OK ||
request.pendingOutputBuffers.size() == 0);
- size_t bufferErrorCnt = returnOutputBuffers(
+ returnOutputBuffers(
states.useHalBufManager, states.listener,
request.pendingOutputBuffers.array(),
request.pendingOutputBuffers.size(), 0, /*timestampIncreasing*/true,
request.outputSurfaces, request.resultExtras);
- request.numErrorBuffersReturned += bufferErrorCnt;
- if (request.numErrorBuffersReturned == request.numErrorBuffersNotified) {
- removeInFlightMapEntryLocked(states, idx);
- ALOGVV("%s: removed frame %d from InFlightMap", __FUNCTION__, frameNumber);
-
- // Note down the just completed frame number
- if (request.hasInputBuffer) {
- states.lastCompletedReprocessFrameNumber = frameNumber;
- } else if (request.zslCapture) {
- states.lastCompletedZslFrameNumber = frameNumber;
- } else {
- states.lastCompletedRegularFrameNumber = frameNumber;
- }
- }
+ removeInFlightMapEntryLocked(states, idx);
+ ALOGVV("%s: removed frame %d from InFlightMap", __FUNCTION__, frameNumber);
}
states.inflightIntf.checkInflightMapLengthLocked();
@@ -499,10 +487,10 @@
InFlightRequest &request = states.inflightMap.editValueAt(idx);
ALOGVV("%s: got InFlightRequest requestId = %" PRId32
", frameNumber = %" PRId64 ", burstId = %" PRId32
- ", partialResultCount = %d, hasCallback = %d, num_output_buffers %d",
+ ", partialResultCount = %d, hasCallback = %d",
__FUNCTION__, request.resultExtras.requestId,
request.resultExtras.frameNumber, request.resultExtras.burstId,
- result->partial_result, request.hasCallback, result->num_output_buffers);
+ result->partial_result, request.hasCallback);
// Always update the partial count to the latest one if it's not 0
// (buffers only). When framework aggregates adjacent partial results
// into one, the latest partial count will be used.
@@ -601,11 +589,10 @@
result->num_output_buffers);
} else {
bool timestampIncreasing = !(request.zslCapture || request.hasInputBuffer);
- auto numErrorBuffers = returnOutputBuffers(states.useHalBufManager, states.listener,
+ returnOutputBuffers(states.useHalBufManager, states.listener,
result->output_buffers, result->num_output_buffers,
shutterTimestamp, timestampIncreasing,
request.outputSurfaces, request.resultExtras);
- request.numErrorBuffersReturned += numErrorBuffers;
}
if (result->result != NULL && !isPartialResult) {
@@ -643,7 +630,6 @@
" its stream:%s (%d)", __FUNCTION__,
frameNumber, strerror(-res), res);
}
-
} else {
ALOGW("%s: Input buffer should be NULL if there is no input"
" buffer sent in the request, skipping input buffer return.",
@@ -799,7 +785,7 @@
processCaptureResult(states, &r);
}
-size_t returnOutputBuffers(
+void returnOutputBuffers(
bool useHalBufManager,
sp<NotificationListener> listener,
const camera3_stream_buffer_t *outputBuffers, size_t numBuffers,
@@ -807,7 +793,6 @@
const SurfaceMap& outputSurfaces,
const CaptureResultExtras &inResultExtras) {
- size_t numErrorBuffers = 0;
for (size_t i = 0; i < numBuffers; i++)
{
if (outputBuffers[i].buffer == nullptr) {
@@ -816,10 +801,6 @@
// has not got a output buffer handle filled yet. This is though illegal if HAL
// buffer management API is not being used.
ALOGE("%s: cannot return a null buffer!", __FUNCTION__);
- } else {
- if (outputBuffers[i].status == CAMERA3_BUFFER_STATUS_ERROR) {
- numErrorBuffers++;
- }
}
continue;
}
@@ -863,13 +844,8 @@
hardware::camera2::ICameraDeviceCallbacks::ERROR_CAMERA_BUFFER,
extras);
}
- } else {
- if (outputBuffers[i].status == CAMERA3_BUFFER_STATUS_ERROR) {
- numErrorBuffers++;
- }
}
}
- return numErrorBuffers;
}
void notifyShutter(CaptureOutputStates& states, const camera3_shutter_msg_t &msg) {
@@ -923,12 +899,6 @@
msg.frame_number, r.resultExtras.requestId, msg.timestamp);
// Call listener, if any
if (states.listener != nullptr) {
- r.resultExtras.lastCompletedRegularFrameNumber =
- states.lastCompletedRegularFrameNumber;
- r.resultExtras.lastCompletedReprocessFrameNumber =
- states.lastCompletedReprocessFrameNumber;
- r.resultExtras.lastCompletedZslFrameNumber =
- states.lastCompletedZslFrameNumber;
states.listener->notifyShutter(r.resultExtras, msg.timestamp);
}
// send pending result and buffers
@@ -939,12 +909,11 @@
r.rotateAndCropAuto, r.cameraIdsWithZoom, r.physicalMetadatas);
}
bool timestampIncreasing = !(r.zslCapture || r.hasInputBuffer);
- size_t bufferErrorCnt = returnOutputBuffers(
+ returnOutputBuffers(
states.useHalBufManager, states.listener,
r.pendingOutputBuffers.array(),
r.pendingOutputBuffers.size(), r.shutterTimestamp, timestampIncreasing,
r.outputSurfaces, r.resultExtras);
- r.numErrorBuffersReturned += bufferErrorCnt;
r.pendingOutputBuffers.clear();
removeInFlightRequestIfReadyLocked(states, idx);
@@ -1007,7 +976,7 @@
InFlightRequest &r = states.inflightMap.editValueAt(idx);
r.requestStatus = msg.error_code;
resultExtras = r.resultExtras;
- bool physicalDeviceResultError = false;
+ bool logicalDeviceResultError = false;
if (hardware::camera2::ICameraDeviceCallbacks::ERROR_CAMERA_RESULT ==
errorCode) {
if (physicalCameraId.size() > 0) {
@@ -1021,39 +990,23 @@
}
r.physicalCameraIds.erase(iter);
resultExtras.errorPhysicalCameraId = physicalCameraId;
- physicalDeviceResultError = true;
+ } else {
+ logicalDeviceResultError = true;
}
}
- if (!physicalDeviceResultError) {
- if (hardware::camera2::ICameraDeviceCallbacks::ERROR_CAMERA_RESULT
- == errorCode) {
- r.skipResultMetadata = true;
- } else if (hardware::camera2::ICameraDeviceCallbacks::ERROR_CAMERA_BUFFER
- == errorCode) {
- r.numErrorBuffersNotified ++;
- } else {
- // errorCode is ERROR_CAMERA_REQUEST
- if (!r.skipResultMetadata) {
- // In case HAL calls multiples ERROR_REQUEST
- // callback, only count the pending buffer
- // notify error counter once. And also handle
- // the case where ERROR_BUFFERs are sent before
- // ERROR_REQUEST, even though it's not allowed
- // by the HAL API.
- if (r.numErrorBuffersNotified != 0) {
- ALOGW("Camera %s: %s: HAL should not notify ERROR_REQUEST"
- " and ERROR_BUFFER for the same request",
- states.cameraId.string(), __FUNCTION__);
- }
- r.numErrorBuffersNotified =
- r.numOutputBuffers - r.numErrorBuffersNotified;
- r.skipResultMetadata = true;
- }
- }
-
- // Check whether the buffers returned. If they returned,
- // remove inflight request.
+ if (logicalDeviceResultError
+ || hardware::camera2::ICameraDeviceCallbacks::ERROR_CAMERA_REQUEST ==
+ errorCode) {
+ r.skipResultMetadata = true;
+ }
+ if (logicalDeviceResultError) {
+ // In case of missing result check whether the buffers
+ // returned. If they returned, then remove inflight
+ // request.
+ // TODO: should we call this for ERROR_CAMERA_REQUEST as well?
+ // otherwise we are depending on HAL to send the buffers back after
+ // calling notifyError. Not sure if that's in the spec.
removeInFlightRequestIfReadyLocked(states, idx);
}
} else {
@@ -1379,23 +1332,14 @@
{ // First return buffers cached in mInFlightMap
std::lock_guard<std::mutex> l(states.inflightLock);
for (size_t idx = 0; idx < states.inflightMap.size(); idx++) {
- InFlightRequest &request = states.inflightMap.editValueAt(idx);
- size_t bufferErrorCnt = returnOutputBuffers(
+ const InFlightRequest &request = states.inflightMap.valueAt(idx);
+ returnOutputBuffers(
states.useHalBufManager, states.listener,
request.pendingOutputBuffers.array(),
request.pendingOutputBuffers.size(), 0,
/*timestampIncreasing*/true, request.outputSurfaces,
request.resultExtras);
- request.numErrorBuffersReturned += bufferErrorCnt;
- ALOGW("%s: Frame %d | Timestamp: %" PRId64 ", metadata"
- " arrived: %s, buffers left: %d, buffers returned with STATUS_ERROR: %d, "
- " buffers notified with error: %d\n", __FUNCTION__,
- states.inflightMap.keyAt(idx), request.shutterTimestamp,
- request.haveResultMetadata ? "true" : "false",
- request.numBuffersLeft, request.numErrorBuffersReturned,
- request.numErrorBuffersNotified);
}
-
states.inflightMap.clear();
states.inflightIntf.onInflightMapFlushedLocked();
}
diff --git a/services/camera/libcameraservice/device3/Camera3OutputUtils.h b/services/camera/libcameraservice/device3/Camera3OutputUtils.h
index 53f78f2..fbb47f8 100644
--- a/services/camera/libcameraservice/device3/Camera3OutputUtils.h
+++ b/services/camera/libcameraservice/device3/Camera3OutputUtils.h
@@ -45,8 +45,7 @@
* Helper methods shared between Camera3Device/Camera3OfflineSession for HAL callbacks
*/
// helper function to return the output buffers to output streams.
- // returns the number of STATUS_ERROR buffers
- size_t returnOutputBuffers(
+ void returnOutputBuffers(
bool useHalBufManager,
sp<NotificationListener> listener, // Only needed when outputSurfaces is not empty
const camera3_stream_buffer_t *outputBuffers,
@@ -61,9 +60,6 @@
struct CaptureOutputStates {
const String8& cameraId;
std::mutex& inflightLock;
- int64_t& lastCompletedRegularFrameNumber;
- int64_t& lastCompletedZslFrameNumber;
- int64_t& lastCompletedReprocessFrameNumber;
InFlightRequestMap& inflightMap; // end of inflightLock scope
std::mutex& outputLock;
std::list<CaptureResult>& resultQueue;
diff --git a/services/camera/libcameraservice/device3/InFlightRequest.h b/services/camera/libcameraservice/device3/InFlightRequest.h
index 3cb8324..424043b 100644
--- a/services/camera/libcameraservice/device3/InFlightRequest.h
+++ b/services/camera/libcameraservice/device3/InFlightRequest.h
@@ -43,19 +43,6 @@
// Decremented by calls to process_capture_result with valid output
// and input buffers
int numBuffersLeft;
- // Total number of output buffers for this request
- int numOutputBuffers;
-
- // The inflight request is considered complete if all buffers are returned
- // and numErrorBuffersReturned == numErrorBuffersNotified.
-
- // The number of buffers returned with STATUS_ERROR;
- int numErrorBuffersReturned;
- // The number of buffers that are notified as error:
- // +1 for each notifyError(ERROR_BUFFER), and
- // +numOutputBuffers for notifyError(ERROR_REQUEST)
- int numErrorBuffersNotified;
-
CaptureResultExtras resultExtras;
// If this request has any input buffer
bool hasInputBuffer;
@@ -123,9 +110,6 @@
requestStatus(OK),
haveResultMetadata(false),
numBuffersLeft(0),
- numOutputBuffers(0),
- numErrorBuffersReturned(0),
- numErrorBuffersNotified(0),
hasInputBuffer(false),
hasCallback(true),
maxExpectedDuration(kDefaultExpectedDuration),
@@ -145,9 +129,6 @@
requestStatus(OK),
haveResultMetadata(false),
numBuffersLeft(numBuffers),
- numOutputBuffers(hasInput ? numBuffers-1 : numBuffers),
- numErrorBuffersReturned(0),
- numErrorBuffersNotified(0),
resultExtras(extras),
hasInputBuffer(hasInput),
hasCallback(hasAppCallback),