LineageOS/android_vendor_qcom_opensource_power
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

power: Remove unused camera_hint_ref_count

Browse Source 
* These were part of the commit that added mutex locks
  for camera hints. We have now removed the locks so
  this is no longer necessary

Change-Id: I38b91ce4e8fc811b8d9a04e6ec20521adde1b264
This commit is contained in:
Michael Bestas
2018-05-25 21:33:46 +03:00
parent 1c368078d1
commit 2b371015ef
4 changed files with 38 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
power-660.c
View File

@@ -56,7 +56,6 @@ static int display_hint_sent;
static int video_encode_hint_sent; static int video_encode_hint_sent;
static int cam_preview_hint_sent; static int cam_preview_hint_sent;
static int camera_hint_ref_count;
static void process_video_encode_hint(void *metadata); static void process_video_encode_hint(void *metadata);
//static void process_cam_preview_hint(void *metadata); //static void process_cam_preview_hint(void *metadata);
@@ -260,26 +259,19 @@ static void process_video_encode_hint(void *metadata)
memcpy(resource_values, res, MIN_VAL(sizeof(resource_values), sizeof(res))); memcpy(resource_values, res, MIN_VAL(sizeof(resource_values), sizeof(res)));
num_resources = sizeof(res)/sizeof(res[0]); num_resources = sizeof(res)/sizeof(res[0]);
} }
camera_hint_ref_count++;
if (camera_hint_ref_count == 1) {
if (!video_encode_hint_sent) { if (!video_encode_hint_sent) {
perform_hint_action(video_encode_metadata.hint_id, perform_hint_action(video_encode_metadata.hint_id,
resource_values, num_resources); resource_values, num_resources);
video_encode_hint_sent = 1; video_encode_hint_sent = 1;
} }
} }
}
} else if (video_encode_metadata.state == 0) { } else if (video_encode_metadata.state == 0) {
if ((strncmp(governor, INTERACTIVE_GOVERNOR, if ((strncmp(governor, INTERACTIVE_GOVERNOR,
strlen(INTERACTIVE_GOVERNOR)) == 0) && strlen(INTERACTIVE_GOVERNOR)) == 0) &&
(strlen(governor) == strlen(INTERACTIVE_GOVERNOR))) { (strlen(governor) == strlen(INTERACTIVE_GOVERNOR))) {
camera_hint_ref_count--;
if (!camera_hint_ref_count) {
undo_hint_action(video_encode_metadata.hint_id); undo_hint_action(video_encode_metadata.hint_id);
video_encode_hint_sent = 0; video_encode_hint_sent = 0;
} }
return ;
}
} }
return; return;
} }

14
power-8937.c
View File

@@ -54,7 +54,6 @@
static int saved_interactive_mode = -1; static int saved_interactive_mode = -1;
static int display_hint_sent; static int display_hint_sent;
static int video_encode_hint_sent; static int video_encode_hint_sent;
static int camera_hint_ref_count;
static void process_video_encode_hint(void *metadata); static void process_video_encode_hint(void *metadata);
static bool is_target_SDM439() /* Returns value=1 if target is Hathi else value 0 */ static bool is_target_SDM439() /* Returns value=1 if target is Hathi else value 0 */
@@ -207,23 +206,18 @@ static void process_video_encode_hint(void *metadata)
}; };
memcpy(resource_values, res, MIN_VAL(sizeof(resource_values), sizeof(res))); memcpy(resource_values, res, MIN_VAL(sizeof(resource_values), sizeof(res)));
num_resources = sizeof(res)/sizeof(res[0]); num_resources = sizeof(res)/sizeof(res[0]);
camera_hint_ref_count++;
if (camera_hint_ref_count == 1) {
if (!video_encode_hint_sent) { if (!video_encode_hint_sent) {
perform_hint_action(video_encode_metadata.hint_id, perform_hint_action(video_encode_metadata.hint_id,
resource_values, num_resources); resource_values, num_resources);
video_encode_hint_sent = 1; video_encode_hint_sent = 1;
} }
} }
}
else { else {
/* sample_ms = 10mS */ /* sample_ms = 10mS */
int res[] = {0x41820000, 0xa, int res[] = {0x41820000, 0xa,
}; };
memcpy(resource_values, res, MIN_VAL(sizeof(resource_values), sizeof(res))); memcpy(resource_values, res, MIN_VAL(sizeof(resource_values), sizeof(res)));
num_resources = sizeof(res)/sizeof(res[0]); num_resources = sizeof(res)/sizeof(res[0]);
camera_hint_ref_count++;
if (camera_hint_ref_count == 1) {
if (!video_encode_hint_sent) { if (!video_encode_hint_sent) {
perform_hint_action(video_encode_metadata.hint_id, perform_hint_action(video_encode_metadata.hint_id,
resource_values, num_resources); resource_values, num_resources);
@@ -231,7 +225,6 @@ static void process_video_encode_hint(void *metadata)
} }
} }
} }
}
else if ((strncmp(governor, INTERACTIVE_GOVERNOR, else if ((strncmp(governor, INTERACTIVE_GOVERNOR,
strlen(INTERACTIVE_GOVERNOR)) == 0) && strlen(INTERACTIVE_GOVERNOR)) == 0) &&
(strlen(governor) == strlen(INTERACTIVE_GOVERNOR))) { (strlen(governor) == strlen(INTERACTIVE_GOVERNOR))) {
@@ -251,13 +244,10 @@ static void process_video_encode_hint(void *metadata)
}; };
memcpy(resource_values, res, MIN_VAL(sizeof(resource_values), sizeof(res))); memcpy(resource_values, res, MIN_VAL(sizeof(resource_values), sizeof(res)));
num_resources = sizeof(res)/sizeof(res[0]); num_resources = sizeof(res)/sizeof(res[0]);
camera_hint_ref_count++;
if (!video_encode_hint_sent) {
perform_hint_action(video_encode_metadata.hint_id, perform_hint_action(video_encode_metadata.hint_id,
resource_values,num_resources); resource_values,num_resources);
video_encode_hint_sent = 1; video_encode_hint_sent = 1;
} }
}
} else if (video_encode_metadata.state == 0) { } else if (video_encode_metadata.state == 0) {
if (((strncmp(governor, INTERACTIVE_GOVERNOR, if (((strncmp(governor, INTERACTIVE_GOVERNOR,
strlen(INTERACTIVE_GOVERNOR)) == 0) && strlen(INTERACTIVE_GOVERNOR)) == 0) &&
@@ -265,13 +255,9 @@ static void process_video_encode_hint(void *metadata)
((strncmp(governor, SCHEDUTIL_GOVERNOR, ((strncmp(governor, SCHEDUTIL_GOVERNOR,
strlen(SCHEDUTIL_GOVERNOR)) == 0) && strlen(SCHEDUTIL_GOVERNOR)) == 0) &&
(strlen(governor) == strlen(SCHEDUTIL_GOVERNOR)))) { (strlen(governor) == strlen(SCHEDUTIL_GOVERNOR)))) {
camera_hint_ref_count--;
if (!camera_hint_ref_count) {
undo_hint_action(video_encode_metadata.hint_id); undo_hint_action(video_encode_metadata.hint_id);
video_encode_hint_sent = 0; video_encode_hint_sent = 0;
} }
return ;
}
} }
return; return;
} }

14
power-8953.c
View File

@@ -56,7 +56,6 @@ static int display_hint_sent;
static int video_encode_hint_sent; static int video_encode_hint_sent;
static int cam_preview_hint_sent; static int cam_preview_hint_sent;
static int camera_hint_ref_count;
static void process_video_encode_hint(void *metadata); static void process_video_encode_hint(void *metadata);
//static void process_cam_preview_hint(void *metadata); //static void process_cam_preview_hint(void *metadata);
@@ -210,23 +209,18 @@ static void process_video_encode_hint(void *metadata)
}; };
memcpy(resource_values, res, MIN_VAL(sizeof(resource_values), sizeof(res))); memcpy(resource_values, res, MIN_VAL(sizeof(resource_values), sizeof(res)));
num_resources = sizeof(res)/sizeof(res[0]); num_resources = sizeof(res)/sizeof(res[0]);
camera_hint_ref_count++;
if (camera_hint_ref_count == 1) {
if (!video_encode_hint_sent) { if (!video_encode_hint_sent) {
perform_hint_action(video_encode_metadata.hint_id, perform_hint_action(video_encode_metadata.hint_id,
resource_values, num_resources); resource_values, num_resources);
video_encode_hint_sent = 1; video_encode_hint_sent = 1;
} }
} }
}
else { else {
/* sample_ms = 10mS */ /* sample_ms = 10mS */
int res[] = {0x41820000, 0xa, int res[] = {0x41820000, 0xa,
}; };
memcpy(resource_values, res, MIN_VAL(sizeof(resource_values), sizeof(res))); memcpy(resource_values, res, MIN_VAL(sizeof(resource_values), sizeof(res)));
num_resources = sizeof(res)/sizeof(res[0]); num_resources = sizeof(res)/sizeof(res[0]);
camera_hint_ref_count++;
if (camera_hint_ref_count == 1) {
if (!video_encode_hint_sent) { if (!video_encode_hint_sent) {
perform_hint_action(video_encode_metadata.hint_id, perform_hint_action(video_encode_metadata.hint_id,
resource_values, num_resources); resource_values, num_resources);
@@ -234,7 +228,6 @@ static void process_video_encode_hint(void *metadata)
} }
} }
} }
}
else if ((strncmp(governor, INTERACTIVE_GOVERNOR, else if ((strncmp(governor, INTERACTIVE_GOVERNOR,
strlen(INTERACTIVE_GOVERNOR)) == 0) && strlen(INTERACTIVE_GOVERNOR)) == 0) &&
(strlen(governor) == strlen(INTERACTIVE_GOVERNOR))) { (strlen(governor) == strlen(INTERACTIVE_GOVERNOR))) {
@@ -246,15 +239,12 @@ static void process_video_encode_hint(void *metadata)
}; };
memcpy(resource_values, res, MIN_VAL(sizeof(resource_values), sizeof(res))); memcpy(resource_values, res, MIN_VAL(sizeof(resource_values), sizeof(res)));
num_resources = sizeof(res)/sizeof(res[0]); num_resources = sizeof(res)/sizeof(res[0]);
camera_hint_ref_count++;
if (camera_hint_ref_count == 1) {
if (!video_encode_hint_sent) { if (!video_encode_hint_sent) {
perform_hint_action(video_encode_metadata.hint_id, perform_hint_action(video_encode_metadata.hint_id,
resource_values, num_resources); resource_values, num_resources);
video_encode_hint_sent = 1; video_encode_hint_sent = 1;
} }
} }
}
} else if (video_encode_metadata.state == 0) { } else if (video_encode_metadata.state == 0) {
if (((strncmp(governor, INTERACTIVE_GOVERNOR, if (((strncmp(governor, INTERACTIVE_GOVERNOR,
strlen(INTERACTIVE_GOVERNOR)) == 0) && strlen(INTERACTIVE_GOVERNOR)) == 0) &&
@@ -262,13 +252,9 @@ static void process_video_encode_hint(void *metadata)
((strncmp(governor, SCHEDUTIL_GOVERNOR, ((strncmp(governor, SCHEDUTIL_GOVERNOR,
strlen(SCHEDUTIL_GOVERNOR)) == 0) && strlen(SCHEDUTIL_GOVERNOR)) == 0) &&
(strlen(governor) == strlen(SCHEDUTIL_GOVERNOR)))) { (strlen(governor) == strlen(SCHEDUTIL_GOVERNOR)))) {
camera_hint_ref_count--;
if (!camera_hint_ref_count) {
undo_hint_action(video_encode_metadata.hint_id); undo_hint_action(video_encode_metadata.hint_id);
video_encode_hint_sent = 0; video_encode_hint_sent = 0;
} }
return ;
}
} }
return; return;
} }

7
power-8996.c
View File

@@ -48,7 +48,6 @@
#include "power-common.h" #include "power-common.h"
static int display_hint_sent; static int display_hint_sent;
static int camera_hint_ref_count;
static int process_video_encode_hint(void *metadata) static int process_video_encode_hint(void *metadata)
{ {
@@ -100,21 +99,15 @@ static int process_video_encode_hint(void *metadata)
0x41420000, 0x5A, 0x41400100, 0x4, 0x41410100, 0x5F, 0x41414100, 0x22C, 0x41420100, 0x5A, 0x41420000, 0x5A, 0x41400100, 0x4, 0x41410100, 0x5F, 0x41414100, 0x22C, 0x41420100, 0x5A,
0x41810000, 0x9C4, 0x41814000, 0x32, 0x4180C000, 0x0, 0x41820000, 0xA}; 0x41810000, 0x9C4, 0x41814000, 0x32, 0x4180C000, 0x0, 0x41820000, 0xA};
camera_hint_ref_count++;
if (camera_hint_ref_count == 1) {
perform_hint_action(video_encode_metadata.hint_id, perform_hint_action(video_encode_metadata.hint_id,
resource_values, sizeof(resource_values)/sizeof(resource_values[0])); resource_values, sizeof(resource_values)/sizeof(resource_values[0]));
}
ALOGI("Video Encode hint start"); ALOGI("Video Encode hint start");
return HINT_HANDLED; return HINT_HANDLED;
} }
} else if (video_encode_metadata.state == 0) { } else if (video_encode_metadata.state == 0) {
if ((strncmp(governor, INTERACTIVE_GOVERNOR, strlen(INTERACTIVE_GOVERNOR)) == 0) && if ((strncmp(governor, INTERACTIVE_GOVERNOR, strlen(INTERACTIVE_GOVERNOR)) == 0) &&
(strlen(governor) == strlen(INTERACTIVE_GOVERNOR))) { (strlen(governor) == strlen(INTERACTIVE_GOVERNOR))) {
camera_hint_ref_count--;
if (!camera_hint_ref_count) {
undo_hint_action(video_encode_metadata.hint_id); undo_hint_action(video_encode_metadata.hint_id);
}
ALOGI("Video Encode hint stop"); ALOGI("Video Encode hint stop");
return HINT_HANDLED; return HINT_HANDLED;