diff --git a/XilinxProcessorIPLib/drivers/video_common/src/xvidc.c b/XilinxProcessorIPLib/drivers/video_common/src/xvidc.c index 3f7453f8..4d95f47a 100644 --- a/XilinxProcessorIPLib/drivers/video_common/src/xvidc.c +++ b/XilinxProcessorIPLib/drivers/video_common/src/xvidc.c @@ -312,6 +312,9 @@ const char *XVidC_GetVideoModeStr(XVidC_VideoMode VmId) if (VmId < (XVIDC_VM_NUM_SUPPORTED)) { return (XVidC_VideoTimingModes[VmId].Name); } + else if (VmId == XVIDC_VM_CUSTOM) { + return ("Custom video mode"); + } else { return ("Video mode not supported"); } @@ -479,7 +482,8 @@ const XVidC_VideoTiming *XVidC_GetTimingInfo(XVidC_VideoMode VmId) *******************************************************************************/ void XVidC_ReportStreamInfo(XVidC_VideoStream *Stream) { - if (Stream->VmId < XVIDC_VM_NUM_SUPPORTED) { + if ((Stream->VmId < XVIDC_VM_NUM_SUPPORTED) || + (Stream->VmId == XVIDC_VM_CUSTOM)) { xil_printf("\tColor Format: %s\r\n", XVidC_GetColorFormatStr(Stream->ColorFormatId)); xil_printf("\tColor Depth: %d\r\n", Stream->ColorDepth); diff --git a/XilinxProcessorIPLib/drivers/video_common/src/xvidc.h b/XilinxProcessorIPLib/drivers/video_common/src/xvidc.h index 6dca660b..a0c5153f 100644 --- a/XilinxProcessorIPLib/drivers/video_common/src/xvidc.h +++ b/XilinxProcessorIPLib/drivers/video_common/src/xvidc.h @@ -193,11 +193,13 @@ typedef enum { XVIDC_VM_4096x2160_30_P, XVIDC_VM_4096x2160_50_P, XVIDC_VM_4096x2160_60_P, + XVIDC_VM_4096x2160_60_P_RB, XVIDC_VM_NUM_SUPPORTED, XVIDC_VM_USE_EDID_PREFERRED, XVIDC_VM_NO_INPUT, XVIDC_VM_NOT_SUPPORTED, + XVIDC_VM_CUSTOM, /* Marks beginning/end of interlaced/progressive modes in the table. */ XVIDC_VM_INTL_START = XVIDC_VM_720x480_60_I, @@ -229,7 +231,9 @@ typedef enum { XVIDC_VM_UHD_24_P = XVIDC_VM_3840x2160_24_P, XVIDC_VM_UHD_25_P = XVIDC_VM_3840x2160_25_P, XVIDC_VM_UHD_30_P = XVIDC_VM_3840x2160_30_P, - XVIDC_VM_UHD_60_P = XVIDC_VM_3840x2160_60_P + XVIDC_VM_UHD_60_P = XVIDC_VM_3840x2160_60_P, + XVIDC_VM_4K2K_60_P = XVIDC_VM_4096x2160_60_P, + XVIDC_VM_4K2K_60_P_RB = XVIDC_VM_4096x2160_60_P_RB, } XVidC_VideoMode; /** diff --git a/XilinxProcessorIPLib/drivers/video_common/src/xvidc_timings_table.c b/XilinxProcessorIPLib/drivers/video_common/src/xvidc_timings_table.c index 0513e4b1..5cf51de4 100644 --- a/XilinxProcessorIPLib/drivers/video_common/src/xvidc_timings_table.c +++ b/XilinxProcessorIPLib/drivers/video_common/src/xvidc_timings_table.c @@ -438,5 +438,8 @@ const XVidC_VideoTimingMode XVidC_VideoTimingModes[XVIDC_VM_NUM_SUPPORTED] = { XVIDC_VM_4096x2160_60_P, "4096x2160@60Hz", XVIDC_FR_60HZ, {4096, 88, 88, 128, 4400, 1, 2160, 8, 10, 72, 2250, 0, 0, 0, 0, 1} }, + { XVIDC_VM_4096x2160_60_P_RB, "4096x2160@60Hz (RB)", XVIDC_FR_60HZ, + {4096, 8, 32, 40, 4176, 1, + 2160, 48, 8, 6, 2222, 0, 0, 0, 0, 0} }, }; /** @} */