|
7 | 7 |
|
8 | 8 | #include "svt-av1/EbSvtAv1Enc.h"
|
9 | 9 |
|
| 10 | +#include <stdbool.h> |
10 | 11 | #include <stdint.h>
|
11 | 12 | #include <string.h>
|
12 |
| -#if SVT_AV1_CHECK_VERSION(3, 0, 0) |
13 |
| -#include <stdbool.h> |
14 |
| -#endif |
15 | 13 |
|
16 | 14 | // The SVT_AV1_VERSION_MAJOR, SVT_AV1_VERSION_MINOR, SVT_AV1_VERSION_PATCHLEVEL, and
|
17 | 15 | // SVT_AV1_CHECK_VERSION macros were added in SVT-AV1 v0.9.0. Define these macros for older
|
@@ -131,14 +129,6 @@ static avifResult svtCodecEncodeImage(avifCodec * codec,
|
131 | 129 | #if !SVT_AV1_CHECK_VERSION(0, 9, 0)
|
132 | 130 | svt_config->is_16bit_pipeline = image->depth > 8;
|
133 | 131 | #endif
|
134 |
| - |
135 |
| -#if !SVT_AV1_CHECK_VERSION(3, 0, 0) |
136 |
| - // Follow comment in svt header: set if input is HDR10 BT2020 using SMPTE ST2084 (PQ). |
137 |
| - svt_config->high_dynamic_range_input = (image->depth == 10 && image->colorPrimaries == AVIF_COLOR_PRIMARIES_BT2020 && |
138 |
| - image->transferCharacteristics == AVIF_TRANSFER_CHARACTERISTICS_SMPTE2084 && |
139 |
| - image->matrixCoefficients == AVIF_MATRIX_COEFFICIENTS_BT2020_NCL); |
140 |
| -#endif |
141 |
| - |
142 | 132 | svt_config->source_width = image->width;
|
143 | 133 | svt_config->source_height = image->height;
|
144 | 134 | #if SVT_AV1_CHECK_VERSION(3, 0, 0)
|
@@ -188,11 +178,7 @@ static avifResult svtCodecEncodeImage(avifCodec * codec,
|
188 | 178 |
|
189 | 179 | // In order for SVT-AV1 to force keyframes by setting pic_type to
|
190 | 180 | // EB_AV1_KEY_PICTURE on any frame, force_key_frames has to be set.
|
191 |
| -#if SVT_AV1_CHECK_VERSION(3, 0, 0) |
192 | 181 | svt_config->force_key_frames = true;
|
193 |
| -#else |
194 |
| - svt_config->force_key_frames = TRUE; |
195 |
| -#endif |
196 | 182 |
|
197 | 183 | // keyframeInterval == 1 case is handled when encoding each frame by
|
198 | 184 | // setting pic_type to EB_AV1_KEY_PICTURE. For keyframeInterval > 1,
|
|
0 commit comments