From 2a4d0ee04e9ed090411738cc3df44378aa89ffad Mon Sep 17 00:00:00 2001 From: Andrei-Liviu Simion Date: Mon, 26 Jan 2015 16:45:04 -0800 Subject: [PATCH] video_common: Removed duplicate interlaced video timings. Removed 25 Hz and 30 Hz refresh rates since they have identical video timings to the 50 Hz and 60 Hz varients. The 50/60Hz refresh rates take into account both frames for interlaced. The common video functions use the 50/60Hz refresh rates and divide by 2 where needed to get the frame rate for each frame. Signed-off-by: Andrei-Liviu Simion --- .../drivers/video_common/src/xvidc.c | 2 +- .../drivers/video_common/src/xvidc.h | 8 ++------ .../drivers/video_common/src/xvidc_timings_table.c | 12 ------------ 3 files changed, 3 insertions(+), 19 deletions(-) diff --git a/XilinxProcessorIPLib/drivers/video_common/src/xvidc.c b/XilinxProcessorIPLib/drivers/video_common/src/xvidc.c index b8c251b4..426ee3e6 100644 --- a/XilinxProcessorIPLib/drivers/video_common/src/xvidc.c +++ b/XilinxProcessorIPLib/drivers/video_common/src/xvidc.c @@ -163,7 +163,7 @@ XVidC_VideoMode XVidC_GetVideoModeId(u32 Width, u32 Height, u32 FrameRate, u32 VActive; u32 Rate; u32 ResFound = (FALSE); - XVidC_VideoMode Mode = (XVIDC_VM_480_30_I); + XVidC_VideoMode Mode; if (IsInterlaced) { Low = (XVIDC_VM_INTL_START); diff --git a/XilinxProcessorIPLib/drivers/video_common/src/xvidc.h b/XilinxProcessorIPLib/drivers/video_common/src/xvidc.h index 3fdfd64b..be666c74 100644 --- a/XilinxProcessorIPLib/drivers/video_common/src/xvidc.h +++ b/XilinxProcessorIPLib/drivers/video_common/src/xvidc.h @@ -70,12 +70,8 @@ */ typedef enum { /* Interlaced modes. */ - XVIDC_VM_480_30_I = 0, - XVIDC_VM_480_60_I, - XVIDC_VM_576_25_I, + XVIDC_VM_480_60_I = 0, XVIDC_VM_576_50_I, - XVIDC_VM_1080_25_I, - XVIDC_VM_1080_30_I, XVIDC_VM_1080_50_I, XVIDC_VM_1080_60_I, @@ -180,7 +176,7 @@ typedef enum { XVIDC_VM_NOT_SUPPORTED, /* Marks beginning/end of interlaced/progressive modes in the table. */ - XVIDC_VM_INTL_START = XVIDC_VM_480_30_I, + XVIDC_VM_INTL_START = XVIDC_VM_480_60_I, XVIDC_VM_PROG_START = XVIDC_VM_640x350_85_P, XVIDC_VM_INTL_END = (XVIDC_VM_PROG_START - 1), XVIDC_VM_PROG_END = (XVIDC_VM_NUM_SUPPORTED - 1), diff --git a/XilinxProcessorIPLib/drivers/video_common/src/xvidc_timings_table.c b/XilinxProcessorIPLib/drivers/video_common/src/xvidc_timings_table.c index 4340e7a5..e9f4f99b 100644 --- a/XilinxProcessorIPLib/drivers/video_common/src/xvidc_timings_table.c +++ b/XilinxProcessorIPLib/drivers/video_common/src/xvidc_timings_table.c @@ -82,24 +82,12 @@ const XVidC_VideoTimingMode XVidC_VideoTimingModes[XVIDC_VM_NUM_SUPPORTED] = { /* Interlaced modes. */ - { XVIDC_VM_480_30_I, "720x480@30Hz (I)", XVIDC_FR_30HZ, - {720, 19, 62, 57, 858, 0, - 240, 4, 3, 15, 262, 4, 3, 16, 263, 0} }, { XVIDC_VM_480_60_I, "720x480@60Hz (I)", XVIDC_FR_60HZ, {720, 19, 62, 57, 858, 0, 240, 4, 3, 15, 262, 4, 3, 16, 263, 0} }, - { XVIDC_VM_576_25_I, "720x576@25Hz (I)", XVIDC_FR_25HZ, - {720, 12, 63, 69, 864, 0, - 288, 2, 3, 19, 312, 2, 3, 20, 313, 0} }, { XVIDC_VM_576_50_I, "720x576@50Hz (I)", XVIDC_FR_50HZ, {720, 12, 63, 69, 864, 0, 288, 2, 3, 19, 312, 2, 3, 20, 313, 0} }, - { XVIDC_VM_1080_25_I, "1920x1080@25Hz (I)", XVIDC_FR_25HZ, - {1920, 88, 44, 148, 2200, 1, - 540, 2, 5, 15, 562, 2, 5, 16, 563, 1} }, - { XVIDC_VM_1080_30_I, "1920x1080@30Hz (I)", XVIDC_FR_30HZ, - {1920, 88, 44, 148, 2200, 1, - 540, 2, 5, 15, 562, 2, 5, 16, 563, 1} }, { 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}, },