diff options
author | Eino-Ville Talvala <etalvala@google.com> | 2013-06-11 18:21:05 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-06-11 18:21:05 -0700 |
commit | 44ade05f8d030ae3af8d05359734b18eac433935 (patch) | |
tree | 201f10ac3d980c16aadf01b6a16e383e78f4f846 /services | |
parent | 6c72c1877fadca5068fa94f7a0249c0609e85534 (diff) | |
parent | ea26c7772f4721657db409068d4bed194ae49c94 (diff) | |
download | frameworks_av-44ade05f8d030ae3af8d05359734b18eac433935.zip frameworks_av-44ade05f8d030ae3af8d05359734b18eac433935.tar.gz frameworks_av-44ade05f8d030ae3af8d05359734b18eac433935.tar.bz2 |
am ea26c777: Camera3: Skip no-op stream configurations.
* commit 'ea26c7772f4721657db409068d4bed194ae49c94':
Camera3: Skip no-op stream configurations.
Diffstat (limited to 'services')
-rw-r--r-- | services/camera/libcameraservice/Camera3Device.cpp | 9 | ||||
-rw-r--r-- | services/camera/libcameraservice/Camera3Device.h | 1 |
2 files changed, 10 insertions, 0 deletions
diff --git a/services/camera/libcameraservice/Camera3Device.cpp b/services/camera/libcameraservice/Camera3Device.cpp index c7edb76..bc4db91 100644 --- a/services/camera/libcameraservice/Camera3Device.cpp +++ b/services/camera/libcameraservice/Camera3Device.cpp @@ -170,6 +170,7 @@ status_t Camera3Device::initialize(camera_module_t *module) mHal3Device = device; mStatus = STATUS_IDLE; mNextStreamId = 0; + mNeedConfig = true; return OK; } @@ -582,6 +583,7 @@ status_t Camera3Device::createStream(sp<ANativeWindow> consumer, } *id = mNextStreamId++; + mNeedConfig = true; // Continue captures if active at start if (wasActive) { @@ -707,6 +709,7 @@ status_t Camera3Device::deleteStream(int id) { // fall through since we want to still list the stream as deleted. } mDeletedStreams.add(deletedStream); + mNeedConfig = true; return res; } @@ -1007,6 +1010,11 @@ status_t Camera3Device::configureStreamsLocked() { return INVALID_OPERATION; } + if (!mNeedConfig) { + ALOGV("%s: Skipping config, no stream changes", __FUNCTION__); + return OK; + } + // Start configuring the streams camera3_stream_configuration config; @@ -1091,6 +1099,7 @@ status_t Camera3Device::configureStreamsLocked() { // Finish configuring the streams lazily on first reference mStatus = STATUS_ACTIVE; + mNeedConfig = false; return OK; } diff --git a/services/camera/libcameraservice/Camera3Device.h b/services/camera/libcameraservice/Camera3Device.h index 7a8c22a..faa42b9 100644 --- a/services/camera/libcameraservice/Camera3Device.h +++ b/services/camera/libcameraservice/Camera3Device.h @@ -149,6 +149,7 @@ class Camera3Device : StreamSet mOutputStreams; sp<camera3::Camera3Stream> mInputStream; int mNextStreamId; + bool mNeedConfig; // Need to hold on to stream references until configure completes. Vector<sp<camera3::Camera3StreamInterface> > mDeletedStreams; |