diff options
| author | Yin-Chia Yeh <yinchiayeh@google.com> | 2014-11-19 18:09:30 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-11-19 18:09:31 +0000 |
| commit | 03181012beab17e145ca8b9bedbcc08d117df1cb (patch) | |
| tree | 3daf671d6fa40318dee8fb5d0ee73eab2fe68ffe /services/camera/libcameraservice/api1/client2 | |
| parent | bbda5ce4782b20f3ed75482e5f73b8d999223438 (diff) | |
| parent | 092d49c26d77fafad5170bf709c2a716ec335855 (diff) | |
| download | frameworks_av-03181012beab17e145ca8b9bedbcc08d117df1cb.zip frameworks_av-03181012beab17e145ca8b9bedbcc08d117df1cb.tar.gz frameworks_av-03181012beab17e145ca8b9bedbcc08d117df1cb.tar.bz2 | |
Merge "Camera2Client: remove recording stream if necessary" into lmp-mr1-dev
Diffstat (limited to 'services/camera/libcameraservice/api1/client2')
| -rw-r--r-- | services/camera/libcameraservice/api1/client2/Parameters.cpp | 4 | ||||
| -rw-r--r-- | services/camera/libcameraservice/api1/client2/Parameters.h | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/services/camera/libcameraservice/api1/client2/Parameters.cpp b/services/camera/libcameraservice/api1/client2/Parameters.cpp index 74bbb9d..234247b 100644 --- a/services/camera/libcameraservice/api1/client2/Parameters.cpp +++ b/services/camera/libcameraservice/api1/client2/Parameters.cpp @@ -2203,6 +2203,10 @@ status_t Parameters::recoverOverriddenJpegSize() { return OK; } +bool Parameters::isJpegSizeOverridden() { + return pictureSizeOverriden; +} + const char* Parameters::getStateName(State state) { #define CASE_ENUM_TO_CHAR(x) case x: return(#x); break; switch(state) { diff --git a/services/camera/libcameraservice/api1/client2/Parameters.h b/services/camera/libcameraservice/api1/client2/Parameters.h index 389cb92..7e5be84 100644 --- a/services/camera/libcameraservice/api1/client2/Parameters.h +++ b/services/camera/libcameraservice/api1/client2/Parameters.h @@ -266,6 +266,8 @@ struct Parameters { status_t overrideJpegSizeByVideoSize(); // Recover overridden jpeg size. Called during stopRecording. status_t recoverOverriddenJpegSize(); + // if video snapshot size is currently overridden + bool isJpegSizeOverridden(); // Calculate the crop region rectangle based on current stream sizes struct CropRegion { |