Skip to content

Commit 5b8e9b1

Browse files
committed
Fix the compatible with libavif 0.8+, which drop the symbol of nclx
1 parent d942206 commit 5b8e9b1

4 files changed

Lines changed: 92 additions & 110 deletions

File tree

Example/Tests/Tests.m

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
static UInt16 kBlue16[] = {0,0,65535};
2828
static UInt16 kSpecial16[] = {0xe4 << 8,0x7a << 8,0x8c << 8};
2929

30-
static avifNclxColourPrimaries const kNumPrimaries = AVIF_NCLX_COLOUR_PRIMARIES_EBU3213;
31-
static avifNclxTransferCharacteristics const kNumTransfers = AVIF_NCLX_TRANSFER_CHARACTERISTICS_HLG;
30+
static avifColorPrimaries const kNumPrimaries = AVIF_COLOR_PRIMARIES_EBU3213;
31+
static avifTransferCharacteristics const kNumTransfers = AVIF_TRANSFER_CHARACTERISTICS_HLG;
3232

3333

3434
// FIXME(ledyba-z): libavif does not respect MatrixCoefficients in AV1 Sequence Header.
@@ -160,8 +160,8 @@ - (void)testSpecialTest
160160

161161
-(void)testAllColorSpaceSupportsOutput
162162
{
163-
for(avifNclxColourPrimaries primaries = 0; primaries < kNumPrimaries; ++primaries) {
164-
for(avifNclxTransferCharacteristics transfer = 0; transfer < kNumTransfers; ++transfer) {
163+
for(avifColorPrimaries primaries = 0; primaries < kNumPrimaries; ++primaries) {
164+
for(avifTransferCharacteristics transfer = 0; transfer < kNumTransfers; ++transfer) {
165165
CGColorSpaceRef space = NULL;
166166

167167
space = SDAVIFCreateColorSpaceRGB(primaries, transfer);
@@ -179,12 +179,10 @@ -(void)testAllColorSpaceSupportsOutput
179179
-(void)testCalcNCLXColorSpaceFromAVIFImage
180180
{
181181
avifImage* img = avifImageCreate(100, 100, 8, AVIF_PIXEL_FORMAT_YUV420);
182-
for(avifNclxColourPrimaries primaries = 0; primaries < kNumPrimaries; ++primaries) {
183-
for(avifNclxTransferCharacteristics transfer = 0; transfer < kNumTransfers; ++transfer) {
184-
avifNclxColorProfile nclx;
185-
nclx.colourPrimaries = primaries;
186-
nclx.transferCharacteristics = transfer;
187-
avifImageSetProfileNCLX(img, &nclx);
182+
for(avifColorPrimaries primaries = 0; primaries < kNumPrimaries; ++primaries) {
183+
for(avifTransferCharacteristics transfer = 0; transfer < kNumTransfers; ++transfer) {
184+
img->colorPrimaries = primaries;
185+
img->transferCharacteristics = transfer;
188186
avifImageAllocatePlanes(img, AVIF_PLANES_YUV);
189187

190188
CGColorSpaceRef space = NULL;

0 commit comments

Comments
 (0)