diff --git a/XilinxProcessorIPLib/drivers/video_common/src/xvid.h b/XilinxProcessorIPLib/drivers/video_common/src/xvid.h index 0fcdbdd3..793ba173 100644 --- a/XilinxProcessorIPLib/drivers/video_common/src/xvid.h +++ b/XilinxProcessorIPLib/drivers/video_common/src/xvid.h @@ -69,6 +69,12 @@ * Where RB stands for reduced blanking. */ typedef enum { + /* Interlaced modes. */ + XVID_VM_480_30_I, + XVID_VM_576_25_I, + XVID_VM_1080_25_I, + XVID_VM_1080_30_I, + /* Progressive modes. */ XVID_VM_640x350_85_P = 0, XVID_VM_640x400_85_P, @@ -164,12 +170,6 @@ typedef enum { XVID_VM_3840x2160_30_P, XVID_VM_3840x2160_60_P, - /* Interlaced modes. */ - XVID_VM_480_30_I, - XVID_VM_576_25_I, - XVID_VM_1080_25_I, - XVID_VM_1080_30_I, - XVID_VM_NUM_SUPPORTED, XVID_VM_USE_EDID_PREFERRED, XVID_VM_NO_INPUT, diff --git a/XilinxProcessorIPLib/drivers/video_common/src/xvid_timings_table.c b/XilinxProcessorIPLib/drivers/video_common/src/xvid_timings_table.c index 39b61cf6..df9e235f 100644 --- a/XilinxProcessorIPLib/drivers/video_common/src/xvid_timings_table.c +++ b/XilinxProcessorIPLib/drivers/video_common/src/xvid_timings_table.c @@ -82,6 +82,24 @@ */ const XVid_VideoTimingMode XVid_VideoTimingModes[XVID_VM_NUM_SUPPORTED] = { + /* Interlaced modes. */ + { XVID_VM_480_30_I, "720x480@30Hz (I)", XVID_FR_30HZ, + 0, + {720, 19, 62, 57, 858, 0, + 240, 4, 3, 15, 262, 4, 3, 16, 263, 0} }, + { XVID_VM_576_25_I, "720x576@25Hz (I)", XVID_FR_25HZ, + 0, + {720, 12, 63, 69, 864, 0, + 288, 2, 3, 19, 312, 2, 3, 20, 313, 0} }, + { XVID_VM_1080_25_I, "1920x1080@25Hz (I)", XVID_FR_25HZ, + 0, + {1920, 88, 44, 148, 2200, 1, + 540, 2, 5, 15, 562, 2, 5, 16, 563, 1} }, + { XVID_VM_1080_30_I, "1920x1080@30Hz (I)", XVID_FR_30HZ, + 0, + {1920, 88, 44, 148, 2200, 1, + 540, 2, 5, 15, 562, 2, 5, 16, 563, 1} } + /* Progressive modes. */ { XVID_VM_640x350_85_P, "640x350@85Hz", XVID_FR_85HZ, 31500, @@ -451,22 +469,4 @@ const XVid_VideoTimingMode XVid_VideoTimingModes[XVID_VM_NUM_SUPPORTED] = 594000, {3840, 176, 88, 296, 4400, 0, 2160, 20, 10, 60, 2250, 0, 0, 0, 0, 1} }, - - /* Interlaced modes. */ - { XVID_VM_480_30_I, "720x480@30Hz (I)", XVID_FR_30HZ, - 0, - {720, 19, 62, 57, 858, 0, - 240, 4, 3, 15, 262, 4, 3, 16, 263, 0} }, - { XVID_VM_576_25_I, "720x576@25Hz (I)", XVID_FR_25HZ, - 0, - {720, 12, 63, 69, 864, 0, - 288, 2, 3, 19, 312, 2, 3, 20, 313, 0} }, - { XVID_VM_1080_25_I, "1920x1080@25Hz (I)", XVID_FR_25HZ, - 0, - {1920, 88, 44, 148, 2200, 1, - 540, 2, 5, 15, 562, 2, 5, 16, 563, 1} }, - { XVID_VM_1080_30_I, "1920x1080@30Hz (I)", XVID_FR_30HZ, - 0, - {1920, 88, 44, 148, 2200, 1, - 540, 2, 5, 15, 562, 2, 5, 16, 563, 1} } };