From 7af0fea40b41e90123908e0ea104f70dfc370edb Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Sun, 6 Oct 2019 02:05:22 +0300 Subject: power: Clean up and fix video encode/decode hint handling * Unify code style for non legacy SoCs * Restore legacy SoC handling which used to live in power-common.c but was removed in commit 561cffcbfa66192e839e040d2da3bff2ecf8dcac Change-Id: Ieb84e6d6c8d762614e21267e81e6057aa64b36dd --- power-8994.c | 53 +++++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 45 insertions(+), 8 deletions(-) (limited to 'power-8994.c') diff --git a/power-8994.c b/power-8994.c index 84737ff..561809e 100644 --- a/power-8994.c +++ b/power-8994.c @@ -51,9 +51,10 @@ static int process_video_encode_hint(void* metadata) { char governor[80]; struct video_encode_metadata_t video_encode_metadata; + if (!metadata) return HINT_NONE; + if (get_scaling_governor(governor, sizeof(governor)) == -1) { ALOGE("Can't obtain scaling governor."); - return HINT_NONE; } @@ -62,12 +63,8 @@ static int process_video_encode_hint(void* metadata) { video_encode_metadata.state = -1; video_encode_metadata.hint_id = DEFAULT_VIDEO_ENCODE_HINT_ID; - if (metadata) { - if (parse_video_encode_metadata((char*)metadata, &video_encode_metadata) == -1) { - ALOGE("Error occurred while parsing metadata."); - return HINT_NONE; - } - } else { + if (parse_video_encode_metadata((char*)metadata, &video_encode_metadata) == -1) { + ALOGE("Error occurred while parsing metadata."); return HINT_NONE; } @@ -80,7 +77,6 @@ static int process_video_encode_hint(void* metadata) { * sched_small_tsk - 50 */ int resource_values[] = {0x2C07, 0x2F5A, 0x2704, 0x4032}; - perform_hint_action(video_encode_metadata.hint_id, resource_values, ARRAY_SIZE(resource_values)); return HINT_HANDLED; @@ -94,12 +90,53 @@ static int process_video_encode_hint(void* metadata) { return HINT_NONE; } +static int process_video_decode_hint(void* metadata) { + char governor[80]; + struct video_decode_metadata_t video_decode_metadata; + + if (!metadata) return HINT_NONE; + + if (get_scaling_governor(governor, sizeof(governor)) == -1) { + ALOGE("Can't obtain scaling governor."); + return HINT_NONE; + } + + /* Initialize decode metadata struct fields */ + memset(&video_decode_metadata, 0, sizeof(struct video_decode_metadata_t)); + video_decode_metadata.state = -1; + video_decode_metadata.hint_id = DEFAULT_VIDEO_DECODE_HINT_ID; + + if (parse_video_decode_metadata((char*)metadata, &video_decode_metadata) == -1) { + ALOGE("Error occurred while parsing metadata."); + return HINT_NONE; + } + + if (video_decode_metadata.state == 1) { + if (is_interactive_governor(governor)) { + int resource_values[] = {TR_MS_30, HISPEED_LOAD_90, HS_FREQ_1026, + THREAD_MIGRATION_SYNC_OFF}; + perform_hint_action(video_decode_metadata.hint_id, resource_values, + ARRAY_SIZE(resource_values)); + return HINT_HANDLED; + } + } else if (video_decode_metadata.state == 0) { + if (is_interactive_governor(governor)) { + undo_hint_action(video_decode_metadata.hint_id); + return HINT_HANDLED; + } + } + return HINT_NONE; +} + int power_hint_override(power_hint_t hint, void* data) { int ret_val = HINT_NONE; switch (hint) { case POWER_HINT_VIDEO_ENCODE: ret_val = process_video_encode_hint(data); break; + case POWER_HINT_VIDEO_DECODE: + ret_val = process_video_decode_hint(data); + break; default: break; } -- cgit v1.2.3