diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2012-09-10 18:44:37 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-10 18:44:41 -0700 |
| commit | ac19caca75e7268c0a87bfcb2db73df1dd964616 (patch) | |
| tree | 996e52fafbff09468ad708db26be1a01830ef4da | |
| parent | ba5e65057f061f27a58fbb7c5249200910a88033 (diff) | |
| parent | 14fe42d8d8d622f6fcdbd83df5f3932e24cd896e (diff) | |
| download | frameworks_av-ac19caca75e7268c0a87bfcb2db73df1dd964616.zip frameworks_av-ac19caca75e7268c0a87bfcb2db73df1dd964616.tar.gz frameworks_av-ac19caca75e7268c0a87bfcb2db73df1dd964616.tar.bz2 | |
Merge "Camera2: Temporarily stop pre-allocation of recording stream." into jb-mr1-dev
| -rw-r--r-- | services/camera/libcameraservice/Camera2Client.cpp | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/services/camera/libcameraservice/Camera2Client.cpp b/services/camera/libcameraservice/Camera2Client.cpp index 90355be..4237afb 100644 --- a/services/camera/libcameraservice/Camera2Client.cpp +++ b/services/camera/libcameraservice/Camera2Client.cpp @@ -681,13 +681,8 @@ status_t Camera2Client::startPreviewL(Parameters ¶ms, bool restart) { } request = &mRecordingRequest; - res = updateRecordingStream(params); - if (res != OK) { - ALOGE("%s: Camera %d: Unable to pre-configure recording " - "stream: %s (%d)", - __FUNCTION__, mCameraId, strerror(-res), res); - return res; - } + // TODO: Re-enable recording stream creation/update here once issues are + // resolved res = mJpegProcessor->updateStream(params); if (res != OK) { |