diff --git a/XilinxProcessorIPLib/drivers/video_common/src/xvidc.h b/XilinxProcessorIPLib/drivers/video_common/src/xvidc.h index 835108dd..023bef4c 100644 --- a/XilinxProcessorIPLib/drivers/video_common/src/xvidc.h +++ b/XilinxProcessorIPLib/drivers/video_common/src/xvidc.h @@ -168,6 +168,7 @@ typedef enum { XVIDC_VM_3840x2160_24_P, XVIDC_VM_3840x2160_25_P, XVIDC_VM_3840x2160_30_P, + XVIDC_VM_3840x2160_50_P, XVIDC_VM_3840x2160_60_P, XVIDC_VM_NUM_SUPPORTED, diff --git a/XilinxProcessorIPLib/drivers/video_common/src/xvidc_timings_table.c b/XilinxProcessorIPLib/drivers/video_common/src/xvidc_timings_table.c index 5fd641f9..02018cb5 100644 --- a/XilinxProcessorIPLib/drivers/video_common/src/xvidc_timings_table.c +++ b/XilinxProcessorIPLib/drivers/video_common/src/xvidc_timings_table.c @@ -89,11 +89,11 @@ const XVidC_VideoTimingMode XVidC_VideoTimingModes[XVIDC_VM_NUM_SUPPORTED] = {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, - {1920, 88, 44, 148, 2200, 1, - 540, 2, 5, 15, 562, 2, 5, 16, 563, 1}, }, + {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, {1920, 88, 44, 148, 2200, 1, - 540, 2, 5, 15, 562, 2, 5, 16, 563, 1}, }, + 540, 2, 5, 15, 562, 2, 5, 16, 563, 1} }, /* Progressive modes. */ { XVIDC_VM_640x350_85_P, "640x350@85Hz", XVIDC_FR_85HZ, @@ -118,8 +118,8 @@ const XVidC_VideoTimingMode XVidC_VideoTimingModes[XVIDC_VM_NUM_SUPPORTED] = {720, 16, 62, 60, 858, 0, 480, 9, 6, 30, 525, 0, 0, 0, 0, 0} }, { XVIDC_VM_720x576_50_P, "720x576@50Hz", XVIDC_FR_50HZ, - {720, 16, 64, 68, 864, 1, - 576, 5, 5, 39, 625, 0, 0, 0, 0, 1}, }, + {720, 12, 64, 68, 864, 0, + 576, 5, 5, 39, 625, 0, 0, 0, 0, 0} }, { XVIDC_VM_800x600_56_P, "800x600@56Hz", XVIDC_FR_56HZ, {800, 24, 72, 128, 1024, 1, 600, 1, 2, 22, 625, 0, 0, 0, 0, 1} }, @@ -163,8 +163,8 @@ const XVidC_VideoTimingMode XVidC_VideoTimingModes[XVIDC_VM_NUM_SUPPORTED] = {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, - {1280, 110, 40, 220, 1650, 0, - 720, 5, 5, 20, 750, 0, 0, 0, 0, 0} }, + {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, {1280, 64, 128, 192, 1664, 0, 768, 3, 7, 20, 798, 0, 0, 0, 0, 1} }, @@ -307,20 +307,20 @@ const XVidC_VideoTimingMode XVidC_VideoTimingModes[XVIDC_VM_NUM_SUPPORTED] = {1856, 48, 32, 80, 2016, 1, 1392, 3, 4, 75, 1474, 0, 0, 0, 0, 0} }, { XVIDC_VM_1920x1080_24_P, "1920x1080@24Hz", XVIDC_FR_24HZ, - {1920, 638, 44, 148, 2750, 0, - 1080, 4, 5, 36, 1125, 0, 0, 0, 0, 0} }, + {1920, 638, 44, 148, 2750, 1, + 1080, 4, 5, 36, 1125, 0, 0, 0, 0, 1} }, { XVIDC_VM_1920x1080_25_P, "1920x1080@25Hz", XVIDC_FR_25HZ, - {1920, 528, 44, 148, 2640, 0, - 1080, 4, 5, 36, 1125, 0, 0, 0, 0, 0} }, + {1920, 528, 44, 148, 2640, 1, + 1080, 4, 5, 36, 1125, 0, 0, 0, 0, 1} }, { XVIDC_VM_1920x1080_30_P, "1920x1080@30Hz", XVIDC_FR_30HZ, - {1920, 88, 44, 148, 2200, 0, - 1080, 4, 5, 36, 1125, 0, 0, 0, 0, 0} }, + {1920, 88, 44, 148, 2200, 1, + 1080, 4, 5, 36, 1125, 0, 0, 0, 0, 1} }, { XVIDC_VM_1920x1080_50_P, "1920x1080@50Hz", XVIDC_FR_50HZ, - {1920, 528, 44, 148, 2640, 0, - 1080, 4, 5, 36, 1125, 0, 0, 0, 0, 0} }, + {1920, 528, 44, 148, 2640, 1, + 1080, 4, 5, 36, 1125, 0, 0, 0, 0, 1} }, { XVIDC_VM_1920x1080_60_P, "1920x1080@60Hz", XVIDC_FR_60HZ, - {1920, 88, 44, 148, 2200, 0, - 1080, 4, 5, 36, 1125, 0, 0, 0, 0, 0} }, + {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} }, @@ -364,15 +364,18 @@ const XVidC_VideoTimingMode XVidC_VideoTimingModes[XVIDC_VM_NUM_SUPPORTED] = {2560, 48, 32, 80, 2720, 1, 1600, 3, 6, 85, 1694, 0, 0, 0, 0, 0} }, { XVIDC_VM_3840x2160_24_P, "3840x2160@24Hz", XVIDC_FR_24HZ, - {3840, 1276, 88, 296, 5500, 0, - 2160, 8, 10, 72, 2250, 0, 0, 0, 0, 0} }, + {3840, 1276, 88, 296, 5500, 1, + 2160, 8, 10, 72, 2250, 0, 0, 0, 0, 1} }, { XVIDC_VM_3840x2160_25_P, "3840x2160@25Hz", XVIDC_FR_25HZ, - {3840, 1056, 88, 296, 5280, 0, - 2160, 8, 10, 72, 2250, 0, 0, 0, 0, 0} }, + {3840, 1056, 88, 296, 5280, 1, + 2160, 8, 10, 72, 2250, 0, 0, 0, 0, 1} }, { XVIDC_VM_3840x2160_30_P, "3840x2160@30Hz", XVIDC_FR_30HZ, {3840, 176, 88, 296, 4400, 1, - 2160, 20, 10, 60, 2250, 0, 0, 0, 0, 0} }, + 2160, 20, 10, 60, 2250, 0, 0, 0, 0, 1} }, + { XVIDC_VM_3840x2160_50_P, "3840x2160@50Hz", XVIDC_FR_50HZ, + {3840, 1056, 88, 296, 5280, 1, + 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, 0} } + 2160, 20, 10, 60, 2250, 0, 0, 0, 0, 1} } };