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 | 11297ccaa742bc5406a133ddcbf309002f0e7f19 (patch) | |
tree | 00d78750149ba247cc2bae25e03115fc9d294e9e | |
parent | 9e3a261d30ed837b15f0bd48f463df52f0901f9d (diff) | |
parent | 587879f29d1282f20f5043a840a40eefb68547c3 (diff) | |
download | frameworks_av-11297ccaa742bc5406a133ddcbf309002f0e7f19.zip frameworks_av-11297ccaa742bc5406a133ddcbf309002f0e7f19.tar.gz frameworks_av-11297ccaa742bc5406a133ddcbf309002f0e7f19.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) { |