diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2019-07-25 03:15:48 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2019-07-25 03:15:48 +0000 |
| commit | 9cfbcfc2c0a9f1ddcfa5cdf5bff69785decd295d (patch) | |
| tree | 5bad823c29258e881625abb4bfe40dc035d842e0 | |
| parent | ae93a29cc269d6c8164f7675838e7780975bff58 (diff) | |
| parent | 432bb9bd2b26f2e393cf5543763db9c4d4cb3da4 (diff) | |
| download | pixel-android10-c2f2-s2-release.tar.gz | |
Snap for 5753328 from 432bb9bd2b26f2e393cf5543763db9c4d4cb3da4 to qt-c2f2-releaseandroid-10.0.0_r9android-10.0.0_r8android-10.0.0_r7android-10.0.0_r14android-10.0.0_r13android-10.0.0_r12android10-c2f2-s2-releaseandroid10-c2f2-s1-releaseandroid10-c2f2-release
Change-Id: Ibe05000733d623f37537980b7d520ccf565a8240
| -rw-r--r-- | power-libperfmgr/CameraMode.h | 1 | ||||
| -rw-r--r-- | power-libperfmgr/Power.cpp | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/power-libperfmgr/CameraMode.h b/power-libperfmgr/CameraMode.h index ce8f0c95..1e056231 100644 --- a/power-libperfmgr/CameraMode.h +++ b/power-libperfmgr/CameraMode.h @@ -21,6 +21,7 @@ enum CameraStreamingMode { CAMERA_STREAMING_OFF = 0, CAMERA_STREAMING, CAMERA_STREAMING_1080P, + CAMERA_STREAMING_60FPS, CAMERA_STREAMING_4K, CAMERA_STREAMING_SECURE, CAMERA_STREAMING_MAX diff --git a/power-libperfmgr/Power.cpp b/power-libperfmgr/Power.cpp index 4a7cc8e1..f199bfb2 100644 --- a/power-libperfmgr/Power.cpp +++ b/power-libperfmgr/Power.cpp @@ -54,6 +54,7 @@ static const std::map<enum CameraStreamingMode, std::string> kCamStreamingHint = {CAMERA_STREAMING_OFF, "CAMERA_STREAMING_OFF"}, {CAMERA_STREAMING, "CAMERA_STREAMING"}, {CAMERA_STREAMING_1080P, "CAMERA_STREAMING_1080P"}, + {CAMERA_STREAMING_60FPS, "CAMERA_STREAMING_60FPS"}, {CAMERA_STREAMING_4K, "CAMERA_STREAMING_4K"}, {CAMERA_STREAMING_SECURE, "CAMERA_STREAMING_SECURE"}}; @@ -81,6 +82,10 @@ Power::Power() ALOGI("Initialize CAMERA_STREAMING_1080P on"); mHintManager->DoHint("CAMERA_STREAMING_1080P"); mCameraStreamingMode = CAMERA_STREAMING_1080P; + } else if (state == "CAMERA_STREAMING_60FPS") { + ALOGI("Initialize CAMERA_STREAMING_60FPS on"); + mHintManager->DoHint("CAMERA_STREAMING_60FPS"); + mCameraStreamingMode = CAMERA_STREAMING_60FPS; } else if (state == "CAMERA_STREAMING_4K") { ALOGI("Initialize with CAMERA_STREAMING_4K on"); mHintManager->DoHint("CAMERA_STREAMING_4K"); |