diff options
| author | Sebastian Ramacher <sramacher@debian.org> | 2024-12-29 12:50:37 +0000 |
|---|---|---|
| committer | Sebastian Ramacher <sramacher@debian.org> | 2024-12-29 12:50:37 +0000 |
| commit | 873c687c09e0a1a78a8f3601d31330ad1897e484 (patch) | |
| tree | ff2fa2e2d27b55c002a6d46d50aab2c66e0bf21a /src/gav1 | |
| parent | 395b1f6877fbc2666383f3428f17400c35aa52a4 (diff) | |
| parent | b9ae809f200982119d16ec9613f3db95eca923b9 (diff) | |
| download | libgav1-873c687c09e0a1a78a8f3601d31330ad1897e484.tar.gz libgav1-873c687c09e0a1a78a8f3601d31330ad1897e484.tar.bz2 libgav1-873c687c09e0a1a78a8f3601d31330ad1897e484.zip | |
Merge branch 'master' into 'scrub-obsolete'
# Conflicts:
# debian/changelog
Diffstat (limited to 'src/gav1')
| -rw-r--r-- | src/gav1/decoder_buffer.h | 10 | ||||
| -rw-r--r-- | src/gav1/version.h | 2 |
2 files changed, 11 insertions, 1 deletions
diff --git a/src/gav1/decoder_buffer.h b/src/gav1/decoder_buffer.h index 0a5586e..816eca4 100644 --- a/src/gav1/decoder_buffer.h +++ b/src/gav1/decoder_buffer.h @@ -115,20 +115,30 @@ typedef enum Libgav1ColorRange { kLibgav1ColorRangeFull // YUV/RGB [0..255] } Libgav1ColorRange; +// Section 6.7.3. typedef struct Libgav1ObuMetadataHdrCll { // NOLINT uint16_t max_cll; // Maximum content light level. uint16_t max_fall; // Maximum frame-average light level. } Libgav1ObuMetadataHdrCll; +// Section 6.7.4. typedef struct Libgav1ObuMetadataHdrMdcv { // NOLINT + // 0.16 fixed-point X/Y chromaticity coordinate as defined by CIE 1931 in + // R/G/B order. uint16_t primary_chromaticity_x[3]; uint16_t primary_chromaticity_y[3]; + // 0.16 fixed-point X/Y chromaticity coordinate as defined by CIE 1931. uint16_t white_point_chromaticity_x; uint16_t white_point_chromaticity_y; + // 24.8 fixed-point maximum luminance, represented in candelas per square + // meter. uint32_t luminance_max; + // 18.14 fixed-point minimum luminance, represented in candelas per square + // meter. uint32_t luminance_min; } Libgav1ObuMetadataHdrMdcv; +// Section 6.7.2. typedef struct Libgav1ObuMetadataItutT35 { // NOLINT uint8_t country_code; uint8_t country_code_extension_byte; // Valid if country_code is 0xFF. diff --git a/src/gav1/version.h b/src/gav1/version.h index b386acc..cca2383 100644 --- a/src/gav1/version.h +++ b/src/gav1/version.h @@ -23,7 +23,7 @@ // (https://semver.org). #define LIBGAV1_MAJOR_VERSION 0 -#define LIBGAV1_MINOR_VERSION 18 +#define LIBGAV1_MINOR_VERSION 19 #define LIBGAV1_PATCH_VERSION 0 #define LIBGAV1_VERSION \ |