From a9df392446cccb925e503c6c3697fb4b62b427bd Mon Sep 17 00:00:00 2001 From: Andrei-Liviu Simion Date: Mon, 12 Jan 2015 18:09:06 -0800 Subject: [PATCH] video_common: XVID_VM_480_60_P->XVID_VM_720x480_60_P. Signed-off-by: Andrei-Liviu Simion --- XilinxProcessorIPLib/drivers/video_common/src/xvid.h | 3 ++- .../drivers/video_common/src/xvid_timings_table.c | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/XilinxProcessorIPLib/drivers/video_common/src/xvid.h b/XilinxProcessorIPLib/drivers/video_common/src/xvid.h index 3b5c7741..cef82344 100644 --- a/XilinxProcessorIPLib/drivers/video_common/src/xvid.h +++ b/XilinxProcessorIPLib/drivers/video_common/src/xvid.h @@ -88,6 +88,7 @@ typedef enum { XVID_VM_1024x768_85_P, XVID_VM_1024x768_120_P_RB, XVID_VM_1152x864_75_P, + XVID_VM_1280x720_50_P, XVID_VM_1280x768_60_P_RB, XVID_VM_1280x768_60_P, XVID_VM_1280x768_75_P, @@ -148,7 +149,6 @@ typedef enum { XVID_VM_2560x1600_85_P, XVID_VM_2560x1600_120_P_RB, - XVID_VM_720_50_P, XVID_VM_720_60_P, XVID_VM_1366x768_60_P, XVID_VM_1080_24_P, @@ -174,6 +174,7 @@ typedef enum { XVID_VM_NO_INPUT, XVID_VM_480_60_P = XVID_VM_720x480_60_P, + XVID_VM_720_50_P = XVID_VM_1280x720_50_P, XVID_VM_WXGA_60_P = XVID_VM_1366x768_60_P, XVID_VM_UXGA_60_P = XVID_VM_1600x1200_60_P, XVID_VM_WSXGA_60_P = XVID_VM_1680x1050_60_P, diff --git a/XilinxProcessorIPLib/drivers/video_common/src/xvid_timings_table.c b/XilinxProcessorIPLib/drivers/video_common/src/xvid_timings_table.c index 36f64daf..e2c6e1a3 100644 --- a/XilinxProcessorIPLib/drivers/video_common/src/xvid_timings_table.c +++ b/XilinxProcessorIPLib/drivers/video_common/src/xvid_timings_table.c @@ -154,6 +154,10 @@ const XVid_VideoTimingMode XVid_VideoTimingModes[XVID_VM_NUM_SUPPORT] = 108000, {1152, 64, 128, 256, 1600, 0, 864, 1, 3, 32, 900, 0, 0, 0, 0, 0} }, + { XVID_VM_1280x720_50_P, "1280x720@50Hz", XVID_FR_50HZ, + 46080, + {1280, 440, 40, 220, 1980, 1, + 720, 5, 5, 20, 750, 0, 0, 0, 0, 1} }, { XVID_VM_1280x768_60_P_RB, "1280x768@60Hz (RB)", XVID_FR_60HZ, 68250, {1280, 48, 32, 80, 1440, 0, @@ -392,10 +396,6 @@ const XVid_VideoTimingMode XVid_VideoTimingModes[XVID_VM_NUM_SUPPORT] = 1600, 3, 6, 85, 1694, 0, 0, 0, 0, 1} }, /* Progressive modes - non-DMT. */ - { XVID_VM_720_50_P, "1280x720", XVID_FR_50HZ, - 0, - {1280, 440, 40, 220, 1980, 1, - 720, 5, 5, 20, 750, 0, 0, 0, 0, 1} }, { XVID_VM_720_60_P, "720p@60Hz", XVID_FR_60HZ, 74250, {1280, 110, 40, 220, 1650, 1,