video: driver: amend colorformat mask values

Amend database colorformat mask values to avoid
enum / query colorformat failure for clients.

Change-Id: I2ef61129d0aac3da12b015af699eea9bdc73dc57
Signed-off-by: Maheshwar Ajja <[email protected]>

driver/platform/waipio/src/msm_vidc_waipio.c

@@ -113,13 +113,13 @@ static struct msm_platform_inst_capability instance_data_waipio[] = {
 	{PIX_FMTS, ENC, H264,
 		MSM_VIDC_FMT_NV12,
 		MSM_VIDC_FMT_NV12C,
-		MSM_VIDC_FMT_NV12 | MSM_VIDC_FMT_NV21 | MSM_VIDC_FMT_NV12C,
+		BIT(MSM_VIDC_FMT_NV12) | BIT(MSM_VIDC_FMT_NV21) | BIT(MSM_VIDC_FMT_NV12C),
 		MSM_VIDC_FMT_NV12C},
 	{PIX_FMTS, ENC|DEC, HEVC,
 		MSM_VIDC_FMT_NV12,
 		MSM_VIDC_FMT_TP10C,
-		MSM_VIDC_FMT_NV12 | MSM_VIDC_FMT_NV21 | MSM_VIDC_FMT_NV12C |
-		MSM_VIDC_FMT_P010 | MSM_VIDC_FMT_TP10C,
+		BIT(MSM_VIDC_FMT_NV12) | BIT(MSM_VIDC_FMT_NV21) | BIT(MSM_VIDC_FMT_NV12C ) |
+		BIT(MSM_VIDC_FMT_P010) | BIT(MSM_VIDC_FMT_TP10C),
 		MSM_VIDC_FMT_NV12C,
 		0, 0,
 		CAP_FLAG_ROOT,
@@ -129,14 +129,14 @@ static struct msm_platform_inst_capability instance_data_waipio[] = {
 	{PIX_FMTS, DEC, H264,
 		MSM_VIDC_FMT_NV12,
 		MSM_VIDC_FMT_NV12C,
-		MSM_VIDC_FMT_NV12 | MSM_VIDC_FMT_NV21 | MSM_VIDC_FMT_NV12C,
+		BIT(MSM_VIDC_FMT_NV12) | BIT(MSM_VIDC_FMT_NV21) | BIT(MSM_VIDC_FMT_NV12C),
 		MSM_VIDC_FMT_NV12C},
 
 	{PIX_FMTS, DEC, VP9,
 		MSM_VIDC_FMT_NV12,
 		MSM_VIDC_FMT_TP10C,
-		MSM_VIDC_FMT_NV12 | MSM_VIDC_FMT_NV21 | MSM_VIDC_FMT_NV12C |
-		MSM_VIDC_FMT_P010 | MSM_VIDC_FMT_TP10C,
+		BIT(MSM_VIDC_FMT_NV12) | BIT(MSM_VIDC_FMT_NV21) | BIT(MSM_VIDC_FMT_NV12C) |
+		BIT(MSM_VIDC_FMT_P010) | BIT(MSM_VIDC_FMT_TP10C),
 		MSM_VIDC_FMT_NV12C},
 
 	{MIN_BUFFERS_INPUT, ENC|DEC, CODECS_ALL, 0, 64, 1, 4,

driver/vidc/inc/msm_vidc_internal.h

@@ -112,30 +112,30 @@ enum msm_vidc_codec_type {
 
 enum msm_vidc_colorformat_type {
 	MSM_VIDC_FMT_NONE = 0,
-	MSM_VIDC_FMT_NV12,
-	MSM_VIDC_FMT_NV21,
-	MSM_VIDC_FMT_NV12C,
-	MSM_VIDC_FMT_P010,
-	MSM_VIDC_FMT_TP10C,
-	MSM_VIDC_FMT_RGBA8888,
-	MSM_VIDC_FMT_RGBA8888C,
+	MSM_VIDC_FMT_NV12          = 1,
+	MSM_VIDC_FMT_NV12C         = 2,
+	MSM_VIDC_FMT_P010          = 3,
+	MSM_VIDC_FMT_TP10C         = 4,
+	MSM_VIDC_FMT_RGBA8888      = 5,
+	MSM_VIDC_FMT_RGBA8888C     = 6,
+	MSM_VIDC_FMT_NV21          = 7,
 };
 
 enum msm_vidc_buffer_type {
 	MSM_VIDC_BUF_NONE = 0,
-	MSM_VIDC_BUF_INPUT,
-	MSM_VIDC_BUF_OUTPUT,
-	MSM_VIDC_BUF_INPUT_META,
-	MSM_VIDC_BUF_OUTPUT_META,
-	MSM_VIDC_BUF_QUEUE,
-	MSM_VIDC_BUF_BIN,
-	MSM_VIDC_BUF_ARP,
-	MSM_VIDC_BUF_COMV,
-	MSM_VIDC_BUF_NON_COMV,
-	MSM_VIDC_BUF_LINE,
-	MSM_VIDC_BUF_DPB,
-	MSM_VIDC_BUF_PERSIST,
-	MSM_VIDC_BUF_VPSS,
+	MSM_VIDC_BUF_INPUT         = 1,
+	MSM_VIDC_BUF_OUTPUT        = 2,
+	MSM_VIDC_BUF_INPUT_META    = 3,
+	MSM_VIDC_BUF_OUTPUT_META   = 4,
+	MSM_VIDC_BUF_QUEUE         = 10,
+	MSM_VIDC_BUF_BIN           = 20,
+	MSM_VIDC_BUF_ARP           = 21,
+	MSM_VIDC_BUF_COMV          = 22,
+	MSM_VIDC_BUF_NON_COMV      = 23,
+	MSM_VIDC_BUF_LINE          = 24,
+	MSM_VIDC_BUF_DPB           = 25,
+	MSM_VIDC_BUF_PERSIST       = 26,
+	MSM_VIDC_BUF_VPSS          = 27,
 };
 
 /* always match with v4l2 flags V4L2_BUF_FLAG_* */