diff --git a/XilinxProcessorIPLib/drivers/video_common/src/xvidc.h b/XilinxProcessorIPLib/drivers/video_common/src/xvidc.h index 31e858ca..6dca660b 100644 --- a/XilinxProcessorIPLib/drivers/video_common/src/xvidc.h +++ b/XilinxProcessorIPLib/drivers/video_common/src/xvidc.h @@ -49,6 +49,7 @@ * ----- ---- -------- ----------------------------------------------- * 1.0 rc, 01/10/15 Initial release. * als + * 2.0 als 08/14/15 Added new video timings. * * *******************************************************************************/ @@ -73,10 +74,12 @@ */ typedef enum { /* Interlaced modes. */ - XVIDC_VM_480_60_I = 0, - XVIDC_VM_576_50_I, - XVIDC_VM_1080_50_I, - XVIDC_VM_1080_60_I, + XVIDC_VM_720x480_60_I = 0, + XVIDC_VM_720x576_50_I, + XVIDC_VM_1440x480_60_I, + XVIDC_VM_1440x576_50_I, + XVIDC_VM_1920x1080_50_I, + XVIDC_VM_1920x1080_60_I, /* Progressive modes. */ XVIDC_VM_640x350_85_P, @@ -127,6 +130,7 @@ typedef enum { XVIDC_VM_1400x1050_75_P, XVIDC_VM_1400x1050_85_P, XVIDC_VM_1400x1050_120_P_RB, + XVIDC_VM_1440x240_60_P, XVIDC_VM_1440x900_60_P, XVIDC_VM_1440x900_60_P_RB, XVIDC_VM_1440x900_75_P, @@ -138,6 +142,11 @@ typedef enum { XVIDC_VM_1600x1200_75_P, XVIDC_VM_1600x1200_85_P, XVIDC_VM_1600x1200_120_P_RB, + XVIDC_VM_1680x720_50_P, + XVIDC_VM_1680x720_60_P, + XVIDC_VM_1680x720_100_P, + XVIDC_VM_1680x720_120_P, + XVIDC_VM_1680x1050_50_P, XVIDC_VM_1680x1050_60_P, XVIDC_VM_1680x1050_60_P_RB, XVIDC_VM_1680x1050_75_P, @@ -154,6 +163,8 @@ typedef enum { XVIDC_VM_1920x1080_30_P, XVIDC_VM_1920x1080_50_P, XVIDC_VM_1920x1080_60_P, + XVIDC_VM_1920x1080_100_P, + XVIDC_VM_1920x1080_120_P, XVIDC_VM_1920x1200_60_P, XVIDC_VM_1920x1200_60_P_RB, XVIDC_VM_1920x1200_75_P, @@ -163,6 +174,10 @@ typedef enum { XVIDC_VM_1920x1440_75_P, XVIDC_VM_1920x1440_120_P_RB, XVIDC_VM_1920x2160_60_P, + XVIDC_VM_2560x1080_50_P, + XVIDC_VM_2560x1080_60_P, + XVIDC_VM_2560x1080_100_P, + XVIDC_VM_2560x1080_120_P, XVIDC_VM_2560x1600_60_P, XVIDC_VM_2560x1600_60_P_RB, XVIDC_VM_2560x1600_75_P, @@ -173,6 +188,11 @@ typedef enum { XVIDC_VM_3840x2160_30_P, XVIDC_VM_3840x2160_50_P, XVIDC_VM_3840x2160_60_P, + XVIDC_VM_4096x2160_24_P, + XVIDC_VM_4096x2160_25_P, + XVIDC_VM_4096x2160_30_P, + XVIDC_VM_4096x2160_50_P, + XVIDC_VM_4096x2160_60_P, XVIDC_VM_NUM_SUPPORTED, XVIDC_VM_USE_EDID_PREFERRED, @@ -180,12 +200,16 @@ typedef enum { XVIDC_VM_NOT_SUPPORTED, /* Marks beginning/end of interlaced/progressive modes in the table. */ - XVIDC_VM_INTL_START = XVIDC_VM_480_60_I, + XVIDC_VM_INTL_START = XVIDC_VM_720x480_60_I, XVIDC_VM_PROG_START = XVIDC_VM_640x350_85_P, XVIDC_VM_INTL_END = (XVIDC_VM_PROG_START - 1), XVIDC_VM_PROG_END = (XVIDC_VM_NUM_SUPPORTED - 1), /* Common naming. */ + XVIDC_VM_480_60_I = XVIDC_VM_720x480_60_I, + XVIDC_VM_576_50_I = XVIDC_VM_720x576_50_I, + XVIDC_VM_1080_50_I = XVIDC_VM_1920x1080_50_I, + XVIDC_VM_1080_60_I = XVIDC_VM_1920x1080_60_I, XVIDC_VM_VGA_60_P = XVIDC_VM_640x480_60_P, XVIDC_VM_480_60_P = XVIDC_VM_720x480_60_P, XVIDC_VM_SVGA_60_P = XVIDC_VM_800x600_60_P, diff --git a/XilinxProcessorIPLib/drivers/video_common/src/xvidc_timings_table.c b/XilinxProcessorIPLib/drivers/video_common/src/xvidc_timings_table.c index c2f79224..0513e4b1 100644 --- a/XilinxProcessorIPLib/drivers/video_common/src/xvidc_timings_table.c +++ b/XilinxProcessorIPLib/drivers/video_common/src/xvidc_timings_table.c @@ -47,6 +47,7 @@ * ----- ---- -------- ----------------------------------------------- * 1.0 als, 01/10/15 Initial release. * rc + * 2.0 als 08/14/15 Added new video timings. * * *******************************************************************************/ @@ -84,16 +85,22 @@ const XVidC_VideoTimingMode XVidC_VideoTimingModes[XVIDC_VM_NUM_SUPPORTED] = { /* Interlaced modes. */ - { XVIDC_VM_480_60_I, "720x480@60Hz (I)", XVIDC_FR_60HZ, + { XVIDC_VM_720x480_60_I, "720x480@60Hz (I)", XVIDC_FR_60HZ, {720, 19, 62, 57, 858, 0, 240, 4, 3, 15, 262, 4, 3, 16, 263, 0} }, - { XVIDC_VM_576_50_I, "720x576@50Hz (I)", XVIDC_FR_50HZ, + { XVIDC_VM_720x576_50_I, "720x576@50Hz (I)", XVIDC_FR_50HZ, {720, 12, 63, 69, 864, 0, 288, 2, 3, 19, 312, 2, 3, 20, 313, 0} }, - { XVIDC_VM_1080_50_I, "1920x1080@50Hz (I)", XVIDC_FR_50HZ, + { XVIDC_VM_1440x480_60_I, "1440x480@60Hz (I)", XVIDC_FR_60HZ, + {1440, 38, 124, 114, 1716, 0, + 240, 4, 3, 15, 262, 4, 3, 16, 263, 0} }, + { XVIDC_VM_1440x576_50_I, "1440x576@50Hz (I)", XVIDC_FR_50HZ, + {1440, 24, 126, 138, 1728, 0, + 288, 2, 3, 19, 312, 2, 3, 20, 313, 0} }, + { XVIDC_VM_1920x1080_50_I, "1920x1080@50Hz (I)", XVIDC_FR_50HZ, {1920, 528, 44, 148, 2640, 1, 540, 2, 5, 15, 562, 2, 5, 16, 563, 1} }, - { XVIDC_VM_1080_60_I, "1920x1080@60Hz (I)", XVIDC_FR_60HZ, + { XVIDC_VM_1920x1080_60_I, "1920x1080@60Hz (I)", XVIDC_FR_60HZ, {1920, 88, 44, 148, 2200, 1, 540, 2, 5, 15, 562, 2, 5, 16, 563, 1} }, @@ -137,7 +144,7 @@ const XVidC_VideoTimingMode XVidC_VideoTimingModes[XVIDC_VM_NUM_SUPPORTED] = { XVIDC_VM_800x600_85_P, "800x600@85Hz", XVIDC_FR_85HZ, {800, 32, 64, 152, 1048, 1, 600, 1, 3, 27, 631, 0, 0, 0, 0, 1} }, - { XVIDC_VM_800x600_120_P_RB, "800x700@120Hz (RB)", XVIDC_FR_120HZ, + { XVIDC_VM_800x600_120_P_RB, "800x600@120Hz (RB)", XVIDC_FR_120HZ, {800, 48, 32, 80, 960, 1, 600, 3, 4, 29, 636, 0, 0, 0, 0, 0} }, { XVIDC_VM_848x480_60_P, "848x480@60Hz", XVIDC_FR_60HZ, @@ -164,7 +171,7 @@ const XVidC_VideoTimingMode XVidC_VideoTimingModes[XVIDC_VM_NUM_SUPPORTED] = { XVIDC_VM_1280x720_50_P, "1280x720@50Hz", XVIDC_FR_50HZ, {1280, 440, 40, 220, 1980, 0, 720, 5, 5, 20, 750, 0, 0, 0, 0, 0} }, - { XVIDC_VM_1280x720_60_P, "720p@60Hz", XVIDC_FR_60HZ, + { XVIDC_VM_1280x720_60_P, "1280x720@60Hz", XVIDC_FR_60HZ, {1280, 110, 40, 220, 1650, 1, 720, 5, 5, 20, 750, 0, 0, 0, 0, 1} }, { XVIDC_VM_1280x768_60_P, "1280x768@60Hz", XVIDC_FR_60HZ, @@ -242,6 +249,9 @@ const XVidC_VideoTimingMode XVidC_VideoTimingModes[XVIDC_VM_NUM_SUPPORTED] = { XVIDC_VM_1400x1050_120_P_RB, "1400x1050@120Hz (RB)", XVIDC_FR_120HZ, {1400, 48, 32, 80, 1560, 1, 1050, 3, 4, 55, 1112, 0, 0, 0, 0, 0} }, + { XVIDC_VM_1440x240_60_P, "1440x240@60Hz", XVIDC_FR_60HZ, + {1440, 38, 124, 114, 1716, 0, + 240, 14, 3, 4, 262, 0, 0, 0, 0, 1} }, { XVIDC_VM_1440x900_60_P, "1440x900@60Hz", XVIDC_FR_60HZ, {1440, 80, 152, 232, 1904, 0, 900, 3, 6, 25, 934, 0, 0, 0, 0, 1} }, @@ -275,6 +285,21 @@ const XVidC_VideoTimingMode XVidC_VideoTimingModes[XVIDC_VM_NUM_SUPPORTED] = { XVIDC_VM_1600x1200_120_P_RB, "1600x1200@120Hz (RB)", XVIDC_FR_120HZ, {1600, 48, 32, 80, 1760, 1, 1200, 3, 4, 64, 1271, 0, 0, 0, 0, 0} }, + { XVIDC_VM_1680x720_50_P, "1680x720@50Hz", XVIDC_FR_50HZ, + {1680, 260, 40, 220, 2240, 1, + 720, 5, 5, 20, 750, 0, 0, 0, 0, 1} }, + { XVIDC_VM_1680x720_60_P, "1680x720@60Hz", XVIDC_FR_60HZ, + {1680, 260, 40, 220, 2240, 1, + 720, 5, 5, 20, 750, 0, 0, 0, 0, 1} }, + { XVIDC_VM_1680x720_100_P, "1680x720@100Hz", XVIDC_FR_100HZ, + {1680, 60, 40, 220, 2000, 1, + 720, 5, 5, 95, 825, 0, 0, 0, 0, 1} }, + { XVIDC_VM_1680x720_120_P, "1680x720@120Hz", XVIDC_FR_120HZ, + {1680, 60, 40, 220, 2000, 1, + 720, 5, 5, 95, 825, 0, 0, 0, 0, 1} }, + { XVIDC_VM_1680x1050_50_P, "1680x1050@50Hz", XVIDC_FR_50HZ, + {1680, 88, 176, 264, 2208, 0, + 1050, 3, 6, 24, 1083, 0, 0, 0, 0, 1} }, { XVIDC_VM_1680x1050_60_P, "1680x1050@60Hz", XVIDC_FR_60HZ, {1680, 104, 176, 280, 2240, 0, 1050, 3, 6, 30, 1089, 0, 0, 0, 0, 1} }, @@ -323,6 +348,12 @@ const XVidC_VideoTimingMode XVidC_VideoTimingModes[XVIDC_VM_NUM_SUPPORTED] = { XVIDC_VM_1920x1080_60_P, "1920x1080@60Hz", XVIDC_FR_60HZ, {1920, 88, 44, 148, 2200, 1, 1080, 4, 5, 36, 1125, 0, 0, 0, 0, 1} }, + { XVIDC_VM_1920x1080_100_P, "1920x1080@100Hz", XVIDC_FR_100HZ, + {1920, 528, 44, 148, 2640, 1, + 1080, 4, 5, 36, 1125, 0, 0, 0, 0, 1} }, + { XVIDC_VM_1920x1080_120_P, "1920x1080@120Hz", XVIDC_FR_120HZ, + {1920, 88, 44, 148, 2200, 1, + 1080, 4, 5, 36, 1125, 0, 0, 0, 0, 1} }, { XVIDC_VM_1920x1200_60_P, "1920x1200@60Hz", XVIDC_FR_60HZ, {1920, 136, 200, 336, 2592, 0, 1200, 3, 6, 36, 1245, 0, 0, 0, 0, 1} }, @@ -350,6 +381,18 @@ const XVidC_VideoTimingMode XVidC_VideoTimingModes[XVIDC_VM_NUM_SUPPORTED] = { XVIDC_VM_1920x2160_60_P, "1920x2160@60Hz", XVIDC_FR_60HZ, {1920, 88, 44, 148, 2200, 1, 2160, 20, 10, 60, 2250, 0, 0, 0, 0, 0} }, + { XVIDC_VM_2560x1080_50_P, "2560x1080@50Hz", XVIDC_FR_50HZ, + {2560, 548, 44, 148, 3300, 1, + 1080, 4, 5, 36, 1125, 0, 0, 0, 0, 1} }, + { XVIDC_VM_2560x1080_60_P, "2560x1080@60Hz", XVIDC_FR_60HZ, + {2560, 248, 44, 148, 3000, 1, + 1080, 4, 5, 11, 1100, 0, 0, 0, 0, 1} }, + { XVIDC_VM_2560x1080_100_P, "2560x1080@100Hz", XVIDC_FR_100HZ, + {2560, 218, 44, 148, 2970, 1, + 1080, 4, 5, 161, 1250, 0, 0, 0, 0, 1} }, + { XVIDC_VM_2560x1080_120_P, "2560x1080@120Hz", XVIDC_FR_120HZ, + {2560, 548, 44, 148, 3300, 1, + 1080, 4, 5, 161, 1250, 0, 0, 0, 0, 1} }, { XVIDC_VM_2560x1600_60_P, "2560x1600@60Hz", XVIDC_FR_60HZ, {2560, 192, 280, 472, 3504, 0, 1600, 3, 6, 49, 1658, 0, 0, 0, 0, 1} }, @@ -379,6 +422,21 @@ const XVidC_VideoTimingMode XVidC_VideoTimingModes[XVIDC_VM_NUM_SUPPORTED] = 2160, 8, 10, 72, 2250, 0, 0, 0, 0, 1} }, { XVIDC_VM_3840x2160_60_P, "3840x2160@60Hz", XVIDC_FR_60HZ, {3840, 176, 88, 296, 4400, 1, - 2160, 20, 10, 60, 2250, 0, 0, 0, 0, 1} } + 2160, 8, 10, 72, 2250, 0, 0, 0, 0, 1} }, + { XVIDC_VM_4096x2160_24_P, "4096x2160@24Hz", XVIDC_FR_24HZ, + {4096, 1020, 88, 296, 5500, 1, + 2160, 8, 10, 72, 2250, 0, 0, 0, 0, 1} }, + { XVIDC_VM_4096x2160_25_P, "4096x2160@25Hz", XVIDC_FR_25HZ, + {4096, 968, 88, 128, 5280, 1, + 2160, 8, 10, 72, 2250, 0, 0, 0, 0, 1} }, + { XVIDC_VM_4096x2160_30_P, "4096x2160@30Hz", XVIDC_FR_30HZ, + {4096, 88, 88, 128, 4400, 1, + 2160, 8, 10, 72, 2250, 0, 0, 0, 0, 1} }, + { XVIDC_VM_4096x2160_50_P, "4096x2160@50Hz", XVIDC_FR_50HZ, + {4096, 968, 88, 128, 5280, 1, + 2160, 8, 10, 72, 2250, 0, 0, 0, 0, 1} }, + { XVIDC_VM_4096x2160_60_P, "4096x2160@60Hz", XVIDC_FR_60HZ, + {4096, 88, 88, 128, 4400, 1, + 2160, 8, 10, 72, 2250, 0, 0, 0, 0, 1} }, }; /** @} */