From bd41eea20660207ea245cfd1883be2cf8b37bfd7 Mon Sep 17 00:00:00 2001 From: Andrei-Liviu Simion Date: Mon, 15 Dec 2014 20:58:01 -0800 Subject: [PATCH] video_common: Fixed some video timings. A few DMT resolutions use borders which weren't being taken into account for the horizontal and vertical total. Signed-off-by: Andrei-Liviu Simion --- .../video_common/src/xvid_timings_table.c | 50 +++++++++---------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/XilinxProcessorIPLib/drivers/video_common/src/xvid_timings_table.c b/XilinxProcessorIPLib/drivers/video_common/src/xvid_timings_table.c index 810c58af..f5ff598e 100644 --- a/XilinxProcessorIPLib/drivers/video_common/src/xvid_timings_table.c +++ b/XilinxProcessorIPLib/drivers/video_common/src/xvid_timings_table.c @@ -76,8 +76,8 @@ const XVid_VideoTimingMode XVid_VideoTimingModes[XVID_VM_NUM_SUPPORT] = /* Progressive modes - display mode timings (DMT). */ { XVID_VM_640x480_60_P, "640x480@60Hz", XVID_FR_60HZ, 0x04, 25175, - {640, 8, 96, 40, 784, 1, - 480, 2, 2, 25, 509, 0, 0, 0, 0, 1} }, + {640, 8+8, 96, 40+8, 800, 1, + 480, 2+8, 2, 25+8, 525, 0, 0, 0, 0, 1} }, { XVID_VM_800x600_60_P, "800x600@60Hz", XVID_FR_60HZ, 0x09, 40000, {800, 40, 128, 88, 1056, 0, @@ -140,8 +140,8 @@ const XVid_VideoTimingMode XVid_VideoTimingModes[XVID_VM_NUM_SUPPORT] = 1200, 1, 3, 46, 1250, 0, 0, 0, 0, 0} }, { XVID_VM_1680x1050_60_P_RB, "1680x1050@60Hz (RB)", XVID_FR_60HZ, 0x39, 119000, - {1680, 48, 32, 80, 1840, 1, - 1050, 3, 6, 21, 1080, 0, 0, 0, 0, 0} }, + {1680, 48, 32, 80, 1840, 0, + 1050, 3, 6, 21, 1080, 0, 0, 0, 0, 1} }, { XVID_VM_1680x1050_60_P, "1680x1050@60Hz", XVID_FR_60HZ, 0x3A, 146250, {1680, 104, 176, 280, 2240, 1, @@ -192,8 +192,8 @@ const XVid_VideoTimingMode XVid_VideoTimingModes[XVID_VM_NUM_SUPPORT] = 768, 3, 6, 29, 806, 0, 0, 0, 0, 1} }, { XVID_VM_640x480_72_P, "640x480@72Hz", XVID_FR_72HZ, 0x05, 31500, - {640, 16, 40, 120, 816, 1, - 480, 1, 3, 20, 504, 0, 0, 0, 0, 1} }, + {640, 8+16, 40, 120+8, 832, 1, + 480, 8+1, 3, 20+8, 520, 0, 0, 0, 0, 1} }, { XVID_VM_800x600_72_P, "800x600@72Hz", XVID_FR_72HZ, 0x0A, 50000, {800, 56, 120, 64, 1040, 0, @@ -232,7 +232,7 @@ const XVid_VideoTimingMode XVid_VideoTimingModes[XVID_VM_NUM_SUPPORT] = 1050, 3, 4, 42, 1099, 0, 0, 0, 0, 0} }, { XVID_VM_1440x900_75_P, "1440x900@75Hz", XVID_FR_75HZ, 0x30, 136750, - {1440, 96, 152, 31, 1719, 1, + {1440, 96, 152, 248, 1936, 1, 900, 3, 6, 33, 942, 0, 0, 0, 0, 0} }, { XVID_VM_1600x1200_75_P, "1600x1200@75Hz", XVID_FR_75HZ, 0x36, 202500, @@ -240,7 +240,7 @@ const XVid_VideoTimingMode XVid_VideoTimingModes[XVID_VM_NUM_SUPPORT] = 1200, 1, 3, 46, 1250, 0, 0, 0, 0, 0} }, { XVID_VM_1680x1050_75_P, "1680x1050@75Hz", XVID_FR_75HZ, 0x3B, 187000, - {1680, 120, 176, 37, 2013, 1, + {1680, 120, 176, 296, 2272, 1, 1050, 3, 6, 40, 1099, 0, 0, 0, 0, 0} }, { XVID_VM_1792x1344_75_P, "1792x1344@75Hz", XVID_FR_75HZ, 0x3F, 261000, @@ -270,7 +270,7 @@ const XVid_VideoTimingMode XVid_VideoTimingModes[XVID_VM_NUM_SUPPORT] = 0x02, 31500, {640, 32, 64, 96, 832, 1, 400, 1, 3, 41, 445, 0, 0, 0, 0, 0} }, - { XVID_VM_720x400_85_P, "720x400@85Hz", XVID_FR_85HZ, + { XVID_VM_720x400_85_P, "720x400@85Hz", XVID_FR_85HZ, 0x03, 35500, {720, 36, 72, 108, 936, 1, 400, 1, 3, 42, 446, 0, 0, 0, 0, 0} }, @@ -308,7 +308,7 @@ const XVid_VideoTimingMode XVid_VideoTimingModes[XVID_VM_NUM_SUPPORT] = 1050, 3, 4, 48, 1105, 0, 0, 0, 0, 0} }, { XVID_VM_1440x900_85_P, "1440x900@85Hz", XVID_FR_85HZ, 0x31, 157000, - {1440, 104, 152, 32, 1728, 1, + {1440, 104, 152, 256, 1952, 1, 900, 3, 6, 39, 948, 0, 0, 0, 0, 0} }, { XVID_VM_1600x1200_85_P, "1600x1200@85Hz", XVID_FR_85HZ, 0x37, 229500, @@ -326,7 +326,7 @@ const XVid_VideoTimingMode XVid_VideoTimingModes[XVID_VM_NUM_SUPPORT] = 0x4F, 505250, {2560, 208, 280, 488, 3536, 1, 1600, 3, 6, 73, 1682, 0, 0, 0, 0, 0} }, - { XVID_VM_800x600_120_P_RB, "800x600@120Hz (RB)", XVID_FR_120HZ, + { XVID_VM_800x600_120_P_RB, "800x700@120Hz (RB)", XVID_FR_120HZ, 0x0D, 73250, {800, 48, 32, 80, 960, 0, 600, 3, 4, 29, 636, 0, 0, 0, 0, 1} }, @@ -440,58 +440,58 @@ const XVid_VideoTimingMode XVid_VideoTimingModes[XVID_VM_NUM_SUPPORT] = 0x00, 594000, {3840, 176, 88, 296, 4400, 0, 2160, 20, 10, 60, 2250, 0, 0, 0, 0, 1} }, - { XVID_VM_4K2K_24_P, "3840x2160", XVID_FR_24HZ, + { XVID_VM_4K2K_24_P, "3840x2160@24Hz", XVID_FR_24HZ, 0x00, 0, {3840, 1276, 88, 296, 5500, 1, 2160, 8, 10, 72, 2250, 0, 0, 0, 0, 1} }, - { XVID_VM_4K2K_25_P, "3840x2160", XVID_FR_25HZ, + { XVID_VM_4K2K_25_P, "3840x2160@25Hz", XVID_FR_25HZ, 0x00, 0, {3840, 1056, 88, 296, 5280, 1, 2160, 8, 10, 72, 2250, 0, 0, 0, 0, 1} }, - { XVID_VM_4K2K_30_P, "3840x2160", XVID_FR_30HZ, + { XVID_VM_4K2K_30_P, "3840x2160@30Hz", XVID_FR_30HZ, 0x00, 0, {3840, 176, 88, 296, 4400, 1, 2160, 8, 10, 72, 2250, 0, 0, 0, 0, 1} }, - { XVID_VM_4K2K_60_P, "3840x2160", XVID_FR_60HZ, + { XVID_VM_4K2K_60_P, "3840x2160@60Hz", XVID_FR_60HZ, 0x00, 0, - {3840, 176, 80, 304, 4400, 1, 2160, - 60, 8, 22, 2250, 0, 0, 0, 0, 1} }, + {3840, 176, 80, 304, 4400, 1, + 2160, 60, 8, 22, 2250, 0, 0, 0, 0, 1} }, /* PC resolutions. */ - { XVID_VM_WXGA_60_P, "1366x768", XVID_FR_60HZ, + { XVID_VM_WXGA_60_P, "1366x768@60Hz", XVID_FR_60HZ, 0x00, 0, {1366, 70, 143, 213, 1792, 1, 768, 3, 3, 24, 798, 0, 0, 0, 0, 1} }, - { XVID_VM_UXGA_60_P, "1600x1200", XVID_FR_60HZ, + { XVID_VM_UXGA_60_P, "1600x1200@60Hz", XVID_FR_60HZ, 0x00, 0, {1600, 64, 192, 304, 2160, 1, 1200, 1, 3, 46, 1250, 0, 0, 0, 0, 1} }, /* XVID_VM_1600x1200_60_P */ - { XVID_VM_WUXGA_60_P, "1920x1200", XVID_FR_60HZ, + { XVID_VM_WUXGA_60_P, "1920x1200@60Hz", XVID_FR_60HZ, 0x00, 0, {1920, 136, 200, 336, 2592, 1, 1200, 3, 6, 36, 1245, 0, 0, 0, 0, 1} }, /* XVID_VM_1920x1200_60_P */ - { XVID_VM_WSXGA_60_P, "1680x1050", XVID_FR_60HZ, + { XVID_VM_WSXGA_60_P, "1680x1050@60Hz", XVID_FR_60HZ, 0x00, 0, {1680, 104, 176, 280, 2240, 1, 1050, 3, 6, 30, 1089, 0, 0, 0, 0, 1} }, /* XVID_VM_1680x1050_60_P */ /* Interlaced modes. */ - { XVID_VM_480_30_I, "720x480", XVID_FR_30HZ, + { XVID_VM_480_30_I, "720x480@30Hz (I)", XVID_FR_30HZ, 0x00, 0, {720, 19, 62, 57, 858, 0, 240, 4, 3, 15, 262, 4, 3, 16, 263, 0} }, - { XVID_VM_576_25_I, "720x576", XVID_FR_25HZ, + { XVID_VM_576_25_I, "720x576@25Hz (I)", XVID_FR_25HZ, 0x00, 0, {720, 12, 63, 69, 864, 0, 288, 2, 3, 19, 312, 2, 3, 20, 313, 0} }, - { XVID_VM_1080_25_I, "1920x1080", XVID_FR_25HZ, + { XVID_VM_1080_25_I, "1920x1080@25Hz (I)", XVID_FR_25HZ, 0x00, 0, {1920, 88, 44, 148, 2200, 1, 540, 2, 5, 15, 562, 2, 5, 16, 563, 1} }, - { XVID_VM_1080_30_I, "1920x1080", XVID_FR_30HZ, + { XVID_VM_1080_30_I, "1920x1080@30Hz (I)", XVID_FR_30HZ, 0x00, 0, {1920, 88, 44, 148, 2200, 1, 540, 2, 5, 15, 562, 2, 5, 16, 563, 1} }