From 9814d7dd96e74df86a6e4a8be08f1735db9e15a4 Mon Sep 17 00:00:00 2001 From: Sebastian Wick Date: Mon, 30 Jan 2023 16:34:45 +0100 Subject: [PATCH] cta: Rename ycbcr420_cap_map struct Signed-off-by: Sebastian Wick --- cta.c | 6 +++--- di-edid-decode/cta.c | 4 ++-- include/cta.h | 4 ++-- include/libdisplay-info/cta.h | 6 +++--- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/cta.c b/cta.c index 20f7f96..039c477 100644 --- a/cta.c +++ b/cta.c @@ -1153,7 +1153,7 @@ parse_video_format_pref_block(struct di_edid_cta *cta, static void parse_ycbcr420_cap_map(struct di_edid_cta *cta, - struct di_cta_ycbcr420_cap_map *ycbcr420_cap_map, + struct di_cta_ycbcr420_cap_map_block *ycbcr420_cap_map, const uint8_t *data, size_t size) { if (size == 0) { @@ -2056,7 +2056,7 @@ di_cta_data_block_get_vesa_display_device(const struct di_cta_data_block *block) } bool -di_cta_ycbcr420_cap_map_supported(const struct di_cta_ycbcr420_cap_map *cap_map, +di_cta_ycbcr420_cap_map_supported(const struct di_cta_ycbcr420_cap_map_block *cap_map, size_t svd_index) { size_t byte, bit; @@ -2073,7 +2073,7 @@ di_cta_ycbcr420_cap_map_supported(const struct di_cta_ycbcr420_cap_map *cap_map, return cap_map->svd_bitmap[byte] & (1 << bit); } -const struct di_cta_ycbcr420_cap_map * +const struct di_cta_ycbcr420_cap_map_block * di_cta_data_block_get_ycbcr420_cap_map(const struct di_cta_data_block *block) { if (block->tag != DI_CTA_DATA_BLOCK_YCBCR420_CAP_MAP) { diff --git a/di-edid-decode/cta.c b/di-edid-decode/cta.c index 14236c5..7aa6fa5 100644 --- a/di-edid-decode/cta.c +++ b/di-edid-decode/cta.c @@ -642,7 +642,7 @@ print_cta_sads(const struct di_cta_sad *const *sads) static void print_ycbcr420_cap_map(const struct di_edid_cta *cta, - const struct di_cta_ycbcr420_cap_map *map) + const struct di_cta_ycbcr420_cap_map_block *map) { const struct di_cta_data_block *const *data_blocks; const struct di_cta_data_block *data_block; @@ -902,7 +902,7 @@ print_cta(const struct di_edid_cta *cta) const struct di_cta_hdr_dynamic_metadata_block *hdr_dynamic_metadata; const struct di_cta_vesa_transfer_characteristics_block *transfer_characteristics; const struct di_cta_sad *const *sads; - const struct di_cta_ycbcr420_cap_map *ycbcr420_cap_map; + const struct di_cta_ycbcr420_cap_map_block *ycbcr420_cap_map; const struct di_cta_infoframe_block *infoframe; const struct di_cta_svr *const *svrs; const struct di_edid_detailed_timing_def *const *detailed_timing_defs; diff --git a/include/cta.h b/include/cta.h index 1117dc4..56e332b 100644 --- a/include/cta.h +++ b/include/cta.h @@ -149,7 +149,7 @@ struct di_cta_audio_block_priv { size_t sads_len; }; -struct di_cta_ycbcr420_cap_map { +struct di_cta_ycbcr420_cap_map_block { bool all; uint8_t svd_bitmap[EDID_CTA_MAX_YCBCR420_CAP_MAP_BLOCK_ENTRIES]; }; @@ -206,7 +206,7 @@ struct di_cta_data_block { /* Used for DI_CTA_DATA_BLOCK_VESA_DISPLAY_TRANSFER_CHARACTERISTIC */ struct di_cta_vesa_transfer_characteristics_block vesa_transfer_characteristics; /* Used for DI_CTA_DATA_BLOCK_YCBCR420_CAP_MAP */ - struct di_cta_ycbcr420_cap_map ycbcr420_cap_map; + struct di_cta_ycbcr420_cap_map_block ycbcr420_cap_map; /* Used for DI_CTA_DATA_BLOCK_HDMI_AUDIO */ struct di_cta_hdmi_audio_block_priv hdmi_audio; /* Used for DI_CTA_DATA_BLOCK_INFOFRAME */ diff --git a/include/libdisplay-info/cta.h b/include/libdisplay-info/cta.h index b95fd6f..7bbe013 100644 --- a/include/libdisplay-info/cta.h +++ b/include/libdisplay-info/cta.h @@ -884,14 +884,14 @@ di_cta_data_block_get_vesa_transfer_characteristics(const struct di_cta_data_blo /** * CTA YCbCr 4:2:0 Capability Map block, defined in section 7.5.11. */ -struct di_cta_ycbcr420_cap_map; +struct di_cta_ycbcr420_cap_map_block; /** * Returns true if the SVD in regular Video Data Blocks at index `svd_index` * supports YCbCr 4:2:0 subsampling. */ bool -di_cta_ycbcr420_cap_map_supported(const struct di_cta_ycbcr420_cap_map *cap_map, +di_cta_ycbcr420_cap_map_supported(const struct di_cta_ycbcr420_cap_map_block *cap_map, size_t svd_index); /** @@ -899,7 +899,7 @@ di_cta_ycbcr420_cap_map_supported(const struct di_cta_ycbcr420_cap_map *cap_map, * * Returns NULL if the data block tag is not DI_CTA_DATA_BLOCK_YCBCR420_CAP_MAP. */ -const struct di_cta_ycbcr420_cap_map * +const struct di_cta_ycbcr420_cap_map_block * di_cta_data_block_get_ycbcr420_cap_map(const struct di_cta_data_block *block); enum di_cta_hdmi_audio_3d_channels {