From d81fb97f4587f73f62a760b99f686139f9b8d966 Mon Sep 17 00:00:00 2001 From: Niklas Haas Date: Wed, 29 Jun 2016 09:16:13 +0200 Subject: mp_image: split colorimetry metadata into its own struct MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This has two reasons: 1. I tend to add new fields to this metadata, and every time I've done so I've consistently forgotten to update all of the dozens of places in which this colorimetry metadata might end up getting used. While most usages don't really care about most of the metadata, sometimes the intend was simply to “copy” the colorimetry metadata from one struct to another. With this being inside a substruct, those lines of code can now simply read a.color = b.color without having to care about added or removed fields. 2. It makes the type definitions nicer for upcoming refactors. In going through all of the usages, I also expanded a few where I felt that omitting the “young” fields was a bug. --- video/mp_image.h | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'video/mp_image.h') diff --git a/video/mp_image.h b/video/mp_image.h index 18d25968c0..dfbe4ee0ba 100644 --- a/video/mp_image.h +++ b/video/mp_image.h @@ -43,11 +43,7 @@ struct mp_image_params { // (will use the HW API's format identifiers) int w, h; // image dimensions int p_w, p_h; // define pixel aspect ratio (undefined: 0/0) - enum mp_csp colorspace; - enum mp_csp_levels colorlevels; - enum mp_csp_prim primaries; - enum mp_csp_trc gamma; - float peak; // 0 = auto/unknown + struct mp_colorspace color; enum mp_chroma_location chroma_location; // The image should be rotated clockwise (0-359 degrees). int rotate; -- cgit v1.2.3