Merge "video: driver: keep default complexity as 50"

driver/platform/kalama/src/msm_vidc_kalama.c

@@ -1687,7 +1687,7 @@ static struct msm_platform_inst_capability instance_cap_data_kalama[] = {
 
 	{COMPLEXITY, ENC, H264|HEVC,
 		0, 100,
-		1, 100,
+		1, DEFAULT_COMPLEXITY,
 		V4L2_CID_MPEG_VIDC_VENC_COMPLEXITY},
 
 	{META_MAX_NUM_REORDER_FRAMES, DEC, HEVC | H264,

driver/platform/waipio/src/msm_vidc_waipio.c

@@ -1540,7 +1540,7 @@ static struct msm_platform_inst_capability instance_cap_data_waipio[] = {
 
 	{COMPLEXITY, ENC, H264 | HEVC,
 		0, 100,
-		1, 100,
+		1, DEFAULT_COMPLEXITY,
 		V4L2_CID_MPEG_VIDC_VENC_COMPLEXITY},
 
 	{META_MAX_NUM_REORDER_FRAMES, DEC, HEVC | H264,

driver/variant/iris2/src/msm_vidc_iris2.c

@@ -1158,10 +1158,10 @@ int msm_vidc_decide_quality_mode_iris2(struct msm_vidc_inst* inst)
 	max_hq_mbpf = core->capabilities[MAX_MBPF_HQ].value;;
 	max_hq_mbps = core->capabilities[MAX_MBPS_HQ].value;;
 
-	/* NRT session to have max quality unless client configures least complexity */
+	/* NRT session to have max quality unless client configures lesser complexity */
 	if (!is_realtime_session(inst) && mbpf <= max_hq_mbpf) {
 		mode = MSM_VIDC_MAX_QUALITY_MODE;
-		if (!capability->cap[COMPLEXITY].value)
+		if (capability->cap[COMPLEXITY].value < DEFAULT_COMPLEXITY)
 			mode = MSM_VIDC_POWER_SAVE_MODE;
 		goto exit;
 	}

driver/variant/iris3/src/msm_vidc_iris3.c

@@ -1116,8 +1116,8 @@ int msm_vidc_decide_quality_mode_iris3(struct msm_vidc_inst* inst)
 		goto decision_done;
 	}
 
-	/* for least complexity, make LP for all resolution */
-	if (!capability->cap[COMPLEXITY].value) {
+	/* for lesser complexity, make LP for all resolution */
+	if (capability->cap[COMPLEXITY].value < DEFAULT_COMPLEXITY) {
 		mode = MSM_VIDC_POWER_SAVE_MODE;
 		goto decision_done;
 	}

driver/vidc/inc/msm_vidc_internal.h

@@ -70,6 +70,8 @@
 #define DEC_FPS_WINDOW 10
 #define INPUT_TIMER_LIST_SIZE 30
 
+#define DEFAULT_COMPLEXITY 50
+
 #define INPUT_MPLANE V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE
 #define OUTPUT_MPLANE V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE
 #define INPUT_META_PLANE V4L2_BUF_TYPE_META_OUTPUT