From 81d24be4855efdfcb95c24d31fa3d7236978e984 Mon Sep 17 00:00:00 2001 From: Andrei-Liviu Simion Date: Wed, 28 Jan 2015 19:37:57 -0800 Subject: [PATCH] video_common: ColorSpace->ColorFormat. Color format better describes the represented RGB/YUV444/YUV422/YUV420 formats. Color space would be YUV/RGB. Signed-off-by: Andrei-Liviu Simion --- XilinxProcessorIPLib/drivers/video_common/src/xvidc.c | 8 ++++---- XilinxProcessorIPLib/drivers/video_common/src/xvidc.h | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/XilinxProcessorIPLib/drivers/video_common/src/xvidc.c b/XilinxProcessorIPLib/drivers/video_common/src/xvidc.c index 727f89d2..1ee0c9d1 100644 --- a/XilinxProcessorIPLib/drivers/video_common/src/xvidc.c +++ b/XilinxProcessorIPLib/drivers/video_common/src/xvidc.c @@ -386,7 +386,7 @@ char *XVidC_GetFrameRateStr(XVidC_VideoMode VmId) /** * This function returns the color format name for index specified. * - * @param ColorSpaceId specifies the index of color space. + * @param ColorFormatId specifies the index of color format space. * 0 = XVIDC_CSF_RGB * 1 = XVIDC_CSF_YCRCB_444, * 2 = XVIDC_CSF_YCRCB_422, @@ -397,9 +397,9 @@ char *XVidC_GetFrameRateStr(XVidC_VideoMode VmId) * @note None. * *******************************************************************************/ -char *XVidC_GetColorFormatStr(XVidC_ColorSpace ColorSpaceId) +char *XVidC_GetColorFormatStr(XVidC_ColorFormat ColorFormatId) { - switch (ColorSpaceId) { + switch (ColorFormatId) { case (XVIDC_CSF_RGB): return ("RGB"); @@ -473,7 +473,7 @@ const XVidC_VideoTiming *XVidC_GetTimingInfo(XVidC_VideoMode VmId) void XVidC_ReportStreamInfo(XVidC_VideoStream *Stream) { xil_printf("\tColor Space Format:%s\r\n", \ - XVidC_GetColorFormatStr(Stream->ColorSpaceId)); + XVidC_GetColorFormatStr(Stream->ColorFormatId)); xil_printf("\tColor Depth:%d\r\n", Stream->ColorDepth); xil_printf("\tPixels Per Clock:%d\r\n", Stream->PixPerClk); xil_printf("\tFrame Rate:%s\r\n", XVidC_GetFrameRateStr(Stream->VmId)); diff --git a/XilinxProcessorIPLib/drivers/video_common/src/xvidc.h b/XilinxProcessorIPLib/drivers/video_common/src/xvidc.h index e998f422..8d79c4b5 100644 --- a/XilinxProcessorIPLib/drivers/video_common/src/xvidc.h +++ b/XilinxProcessorIPLib/drivers/video_common/src/xvidc.h @@ -270,7 +270,7 @@ typedef enum { XVIDC_CSF_YCRCB_420, XVIDC_CSF_NUM_SUPPORTED, XVIDC_CSF_UNKNOWN -} XVidC_ColorSpace; +} XVidC_ColorFormat; /** * Color space conversion standard. @@ -322,7 +322,7 @@ typedef struct { * Video stream structure. */ typedef struct { - XVidC_ColorSpace ColorSpaceId; + XVidC_ColorFormat ColorFormatId; XVidC_ColorDepth ColorDepth; XVidC_PixelsPerClock PixPerClk; XVidC_FrameRate FrameRate; @@ -376,7 +376,7 @@ XVidC_VideoMode XVidC_GetVideoModeId(u32 Width, u32 Height, u32 FrameRate, const XVidC_VideoTimingMode* XVidC_GetVideoModeData(XVidC_VideoMode VmId); const char* XVidC_GetVideoModeStr(XVidC_VideoMode VmId); char* XVidC_GetFrameRateStr(XVidC_VideoMode VmId); -char* XVidC_GetColorFormatStr(XVidC_ColorSpace ColorSpaceId); +char* XVidC_GetColorFormatStr(XVidC_ColorFormat ColorFormatId); XVidC_FrameRate XVidC_GetFrameRate(XVidC_VideoMode VmId); const XVidC_VideoTiming* XVidC_GetTimingInfo(XVidC_VideoMode VmId); void XVidC_ReportStreamInfo(XVidC_VideoStream *Stream);