summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKourosh Derakshan <kouroshd@google.com>2019-07-24 13:53:22 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-07-24 13:53:22 -0700
commit522219f9c76214aeec23b2cd8e5733122e0207e3 (patch)
tree5bad823c29258e881625abb4bfe40dc035d842e0
parent571f675a12098d5aa512f0a4b8d6971a55111b27 (diff)
parent432bb9bd2b26f2e393cf5543763db9c4d4cb3da4 (diff)
downloadpixel-android10-d4-release.tar.gz
am: 432bb9bd2b Change-Id: I958aab9cad46defbf01c319eb6f360d8d5355b41
-rw-r--r--power-libperfmgr/CameraMode.h1
-rw-r--r--power-libperfmgr/Power.cpp5
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");