hc
2024-05-13 9d77db3c730780c8ef5ccd4b66403ff5675cfe4e
kernel/drivers/media/i2c/nvp6158_drv/nvp6158_common.h
....@@ -339,18 +339,6 @@
339339 AHD20_SD_H960_2EX_Btype_NT, //3840h*480i
340340 AHD20_SD_H960_2EX_Btype_PAL, //3840h*576i
341341
342
- AHD20_1080P_30P,
343
- AHD20_1080P_25P,
344
-
345
- AHD20_720P_60P,
346
- AHD20_720P_50P,
347
- AHD20_720P_30P,
348
- AHD20_720P_25P,
349
- AHD20_720P_30P_EX,
350
- AHD20_720P_25P_EX,
351
- AHD20_720P_30P_EX_Btype,
352
- AHD20_720P_25P_EX_Btype,
353
-
354342 AHD30_4M_30P,
355343 AHD30_4M_25P,
356344 AHD30_4M_15P,
....@@ -359,7 +347,6 @@
359347 AHD30_3M_18P, //2048 x 1536
360348 AHD30_5M_12_5P, //2592 x 1944
361349 AHD30_5M_20P, //2592 x 1944
362
-
363350
364351 AHD30_5_3M_20P,
365352 AHD30_6M_18P,
....@@ -427,6 +414,18 @@
427414 AHD20_720P_15P_EX_Btype, // Hidden For test
428415 AHD20_720P_12_5P_EX_Btype, // Hidden For test
429416
417
+ AHD20_1080P_30P,
418
+ AHD20_1080P_25P,
419
+
420
+ AHD20_720P_60P,
421
+ AHD20_720P_50P,
422
+ AHD20_720P_30P,
423
+ AHD20_720P_25P,
424
+ AHD20_720P_30P_EX,
425
+ AHD20_720P_25P_EX,
426
+ AHD20_720P_30P_EX_Btype,
427
+ AHD20_720P_25P_EX_Btype,
428
+
430429 NC_VIVO_CH_FORMATDEF_MAX,
431430
432431 } NC_VIVO_CH_FORMATDEF;