From 4d116d48be8ab56c4d8111ba018b38dc4a8cc71b Mon Sep 17 00:00:00 2001 From: redblue-pkt Date: Thu, 4 Oct 2018 01:46:27 +0200 Subject: [PATCH] update SetColorFormat() Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/4806fe87b07c5895c3a4d0a9a4c1bee632cb2a76 Author: redblue-pkt Date: 2018-10-04 (Thu, 04 Oct 2018) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- libarmbox/video.cpp | 15 +++++++++++---- libarmbox/video_lib.h | 4 +++- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/libarmbox/video.cpp b/libarmbox/video.cpp index 3cc7e6a..ab5d7ff 100644 --- a/libarmbox/video.cpp +++ b/libarmbox/video.cpp @@ -853,7 +853,8 @@ void cVideo::SetControl(int control, int value) } } -void cVideo::SetColorFormat(COLOR_FORMAT color_format) { +void cVideo::SetColorFormat(COLOR_FORMAT color_format) +{ const char *p = NULL; switch(color_format) { case COLORFORMAT_RGB: @@ -868,14 +869,20 @@ void cVideo::SetColorFormat(COLOR_FORMAT color_format) { case COLORFORMAT_SVIDEO: p = "svideo"; break; + case COLORFORMAT_HDMI_AUTO: + p = "Edid(Auto)"; + break; case COLORFORMAT_HDMI_RGB: - p = "hdmi_rgb"; + p = "Hdmi_Rgb"; break; case COLORFORMAT_HDMI_YCBCR444: - p = "hdmi_yuv"; + p = "444"; break; case COLORFORMAT_HDMI_YCBCR422: - p = "hdmi_422"; + p = "422"; + break; + case COLORFORMAT_HDMI_YCBCR420: + p = "420"; break; } if (p) diff --git a/libarmbox/video_lib.h b/libarmbox/video_lib.h index 3ec7cd1..4cdc073 100644 --- a/libarmbox/video_lib.h +++ b/libarmbox/video_lib.h @@ -27,9 +27,11 @@ typedef enum { COLORFORMAT_YUV, COLORFORMAT_CVBS, COLORFORMAT_SVIDEO, + COLORFORMAT_HDMI_AUTO, COLORFORMAT_HDMI_RGB, COLORFORMAT_HDMI_YCBCR444, - COLORFORMAT_HDMI_YCBCR422 + COLORFORMAT_HDMI_YCBCR422, + COLORFORMAT_HDMI_YCBCR420 } COLOR_FORMAT; typedef enum {