From 1d907affe14452665a6862c603be0370943194ef Mon Sep 17 00:00:00 2001 From: max_10 Date: Mon, 20 Dec 2021 20:36:46 +0100 Subject: [PATCH] delete unused SetColorFormat Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/c46ffefcccc2a65a565d076f2d7a5c5e5be28d81 Author: max_10 Date: 2021-12-20 (Mon, 20 Dec 2021) Origin message was: ------------------ - delete unused SetColorFormat ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- libarmbox/video.cpp | 38 +------------------------------------- libarmbox/video_lib.h | 13 ------------- 2 files changed, 1 insertion(+), 50 deletions(-) diff --git a/libarmbox/video.cpp b/libarmbox/video.cpp index a30012c..421a161 100644 --- a/libarmbox/video.cpp +++ b/libarmbox/video.cpp @@ -1201,43 +1201,6 @@ void cVideo::SetControl(int control, int value) } } -void cVideo::SetColorFormat(COLOR_FORMAT color_format) -{ - const char *p = NULL; - switch (color_format) - { - case COLORFORMAT_RGB: - p = "rgb"; - break; - case COLORFORMAT_YUV: - p = "yuv"; - break; - case COLORFORMAT_CVBS: - p = "cvbs"; - break; - case COLORFORMAT_SVIDEO: - p = "svideo"; - break; - case COLORFORMAT_HDMI_AUTO: - p = "Edid(Auto)"; - break; - case COLORFORMAT_HDMI_RGB: - p = "Hdmi_Rgb"; - break; - case COLORFORMAT_HDMI_YCBCR444: - p = "444"; - break; - case COLORFORMAT_HDMI_YCBCR422: - p = "422"; - break; - case COLORFORMAT_HDMI_YCBCR420: - p = "420"; - break; - } - if (p) - proc_put("/proc/stb/video/hdmi_colorspace", p, strlen(p)); -} - #if BOXMODEL_VUPLUS_ARM void cVideo::SetHDMIColorimetry(HDMI_COLORIMETRY hdmi_colorimetry) { @@ -1279,6 +1242,7 @@ void cVideo::SetHDMIColorimetry(HDMI_COLORIMETRY hdmi_colorimetry) if (p) proc_put("/proc/stb/video/hdmi_colorimetry", p, strlen(p)); } +#endif bool getvideo2(unsigned char *video, int xres, int yres) { diff --git a/libarmbox/video_lib.h b/libarmbox/video_lib.h index ec3ecd0..7e9cc2d 100644 --- a/libarmbox/video_lib.h +++ b/libarmbox/video_lib.h @@ -23,18 +23,6 @@ typedef enum ANALOG_SCART_MASK = 0x10 } analog_mode_t; -typedef enum -{ - COLORFORMAT_RGB = 0x10, // keep compatible with analog_mode_t - COLORFORMAT_YUV, - COLORFORMAT_CVBS, - COLORFORMAT_SVIDEO, - COLORFORMAT_HDMI_AUTO, - COLORFORMAT_HDMI_RGB, - COLORFORMAT_HDMI_YCBCR444, - COLORFORMAT_HDMI_YCBCR422, - COLORFORMAT_HDMI_YCBCR420 -} COLOR_FORMAT; #if BOXMODEL_VUPLUS_ARM typedef enum @@ -294,7 +282,6 @@ class cVideo int StopVBI(void) { return 0; }; void SetDemux(cDemux *dmx); void SetHDMIColorimetry(HDMI_COLORIMETRY hdmi_colorimetry); - void SetColorFormat(COLOR_FORMAT color_format); bool GetScreenImage(unsigned char *&data, int &xres, int &yres, bool get_video = true, bool get_osd = false, bool scale_to_video = false); };