stv0g/embeddedsw
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

video_common: Added 4K2K@60Hz (RB) to timings table.

Browse source 
Signed-off-by: Andrei-Liviu Simion <andrei.simion@xilinx.com>
Acked-by: K Krishna Deepak <kde@xilinx.com>
This commit is contained in:
Andrei-Liviu Simion 2015-09-01 13:53:08 -07:00 • committed by Nava kishore Manne
parent d52e73f99f
commit 7247a49431
3 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
XilinxProcessorIPLib/drivers/video_common/src/xvidc.c
View file

@ -312,6 +312,9 @@ const char *XVidC_GetVideoModeStr(XVidC_VideoMode VmId)
if (VmId < (XVIDC_VM_NUM_SUPPORTED)) { if (VmId < (XVIDC_VM_NUM_SUPPORTED)) {
return (XVidC_VideoTimingModes[VmId].Name); return (XVidC_VideoTimingModes[VmId].Name);
} }
else if (VmId == XVIDC_VM_CUSTOM) {
return ("Custom video mode");
}
else { else {
return ("Video mode not supported"); return ("Video mode not supported");
} }
@ -479,7 +482,8 @@ const XVidC_VideoTiming *XVidC_GetTimingInfo(XVidC_VideoMode VmId)
*******************************************************************************/ *******************************************************************************/
void XVidC_ReportStreamInfo(XVidC_VideoStream *Stream) 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", xil_printf("\tColor Format: %s\r\n",
XVidC_GetColorFormatStr(Stream->ColorFormatId)); XVidC_GetColorFormatStr(Stream->ColorFormatId));
xil_printf("\tColor Depth: %d\r\n", Stream->ColorDepth); xil_printf("\tColor Depth: %d\r\n", Stream->ColorDepth);

6
XilinxProcessorIPLib/drivers/video_common/src/xvidc.h
View file

@ -193,11 +193,13 @@ typedef enum {
XVIDC_VM_4096x2160_30_P, XVIDC_VM_4096x2160_30_P,
XVIDC_VM_4096x2160_50_P, XVIDC_VM_4096x2160_50_P,
XVIDC_VM_4096x2160_60_P, XVIDC_VM_4096x2160_60_P,
XVIDC_VM_4096x2160_60_P_RB,
XVIDC_VM_NUM_SUPPORTED, XVIDC_VM_NUM_SUPPORTED,
XVIDC_VM_USE_EDID_PREFERRED, XVIDC_VM_USE_EDID_PREFERRED,
XVIDC_VM_NO_INPUT, XVIDC_VM_NO_INPUT,
XVIDC_VM_NOT_SUPPORTED, XVIDC_VM_NOT_SUPPORTED,
XVIDC_VM_CUSTOM,
/* Marks beginning/end of interlaced/progressive modes in the table. */ /* Marks beginning/end of interlaced/progressive modes in the table. */
XVIDC_VM_INTL_START = XVIDC_VM_720x480_60_I, 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_24_P = XVIDC_VM_3840x2160_24_P,
XVIDC_VM_UHD_25_P = XVIDC_VM_3840x2160_25_P, XVIDC_VM_UHD_25_P = XVIDC_VM_3840x2160_25_P,
XVIDC_VM_UHD_30_P = XVIDC_VM_3840x2160_30_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; } XVidC_VideoMode;
/** /**

3
XilinxProcessorIPLib/drivers/video_common/src/xvidc_timings_table.c
View file

@ -438,5 +438,8 @@ const XVidC_VideoTimingMode XVidC_VideoTimingModes[XVIDC_VM_NUM_SUPPORTED] =
{ XVIDC_VM_4096x2160_60_P, "4096x2160@60Hz", XVIDC_FR_60HZ, { XVIDC_VM_4096x2160_60_P, "4096x2160@60Hz", XVIDC_FR_60HZ,
{4096, 88, 88, 128, 4400, 1, {4096, 88, 88, 128, 4400, 1,
2160, 8, 10, 72, 2250, 0, 0, 0, 0, 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} },
}; };
/** @} */ /** @} */