From d552049259e9c3af6c6c5d63c6238b65acdb2d29 Mon Sep 17 00:00:00 2001 From: Andrei-Liviu Simion Date: Mon, 12 Jan 2015 17:19:02 -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 3064eabf..3b5c7741 100644 --- a/XilinxProcessorIPLib/drivers/video_common/src/xvid.h +++ b/XilinxProcessorIPLib/drivers/video_common/src/xvid.h @@ -74,6 +74,7 @@ typedef enum { XVID_VM_640x480_75_P, XVID_VM_640x480_85_P, XVID_VM_720x400_85_P, + XVID_VM_720x480_60_P, XVID_VM_800x600_56_P, XVID_VM_800x600_60_P, XVID_VM_800x600_72_P, @@ -147,7 +148,6 @@ typedef enum { XVID_VM_2560x1600_85_P, XVID_VM_2560x1600_120_P_RB, - XVID_VM_480_60_P, XVID_VM_720_50_P, XVID_VM_720_60_P, XVID_VM_1366x768_60_P, @@ -173,6 +173,7 @@ typedef enum { XVID_VM_USE_EDID_PREFERRED, XVID_VM_NO_INPUT, + XVID_VM_480_60_P = XVID_VM_720x480_60_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 eebd99cf..36f64daf 100644 --- a/XilinxProcessorIPLib/drivers/video_common/src/xvid_timings_table.c +++ b/XilinxProcessorIPLib/drivers/video_common/src/xvid_timings_table.c @@ -98,6 +98,10 @@ const XVid_VideoTimingMode XVid_VideoTimingModes[XVID_VM_NUM_SUPPORT] = 35500, {720, 36, 72, 108, 936, 1, 400, 1, 3, 42, 446, 0, 0, 0, 0, 0} }, + { XVID_VM_720x480_60_P, "720x480@60Hz", XVID_FR_60HZ, + 27027, + {720, 16, 62, 60, 858, 1, + 480, 9, 6, 30, 525, 0, 0, 0, 0, 1} }, { XVID_VM_800x600_56_P, "800x600@56Hz", XVID_FR_56HZ, 36000, {800, 24, 72, 128, 1024, 0, @@ -388,10 +392,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_480_60_P, "480p@60Hz", XVID_FR_60HZ, - 27027, - {720, 16, 62, 60, 858, 1, - 480, 9, 6, 30, 525, 0, 0, 0, 0, 1} }, { XVID_VM_720_50_P, "1280x720", XVID_FR_50HZ, 0, {1280, 440, 40, 220, 1980, 1,