diff options
| author | Zhijun He <zhijunhe@google.com> | 2014-10-14 23:35:50 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-14 23:35:50 +0000 |
| commit | 62c456f02d3f1071d18644fb3a1de354d6e4ee7f (patch) | |
| tree | e685c17ba9cca9069a4d2e39a1090ec00b7328a7 /services | |
| parent | 027aca334d145d26ccd2f321ea5b74ac9d97965f (diff) | |
| parent | 9d2189ffcf1142b2948ce3065c32521ed7d966c4 (diff) | |
| download | frameworks_av-62c456f02d3f1071d18644fb3a1de354d6e4ee7f.zip frameworks_av-62c456f02d3f1071d18644fb3a1de354d6e4ee7f.tar.gz frameworks_av-62c456f02d3f1071d18644fb3a1de354d6e4ee7f.tar.bz2 | |
am 9d2189ff: Merge "Camera2Client: avoid two consecutive sets of configure_streams calls" into lmp-dev
* commit '9d2189ffcf1142b2948ce3065c32521ed7d966c4':
Camera2Client: avoid two consecutive sets of configure_streams calls
Diffstat (limited to 'services')
| -rw-r--r-- | services/camera/libcameraservice/api1/Camera2Client.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/services/camera/libcameraservice/api1/Camera2Client.cpp b/services/camera/libcameraservice/api1/Camera2Client.cpp index 3610362..2a6aa7b 100644 --- a/services/camera/libcameraservice/api1/Camera2Client.cpp +++ b/services/camera/libcameraservice/api1/Camera2Client.cpp @@ -995,6 +995,10 @@ status_t Camera2Client::startRecordingL(Parameters ¶ms, bool restart) { case Parameters::STOPPED: res = startPreviewL(params, false); if (res != OK) return res; + // Make sure first preview request is submitted to the HAL device to avoid + // two consecutive set of configure_streams being called into the HAL. + // TODO: Refactor this to avoid initial preview configuration. + syncWithDevice(); break; case Parameters::PREVIEW: // Ready to go |