Mercurial > hg > forks > libbpg
annotate bpgenc.c @ 34:5d51fff843eb default tip
A "commit dump" of random changes I've made, as I probably won't be touching this code anymore.
| author | Matti Hamalainen <ccr@tnsp.org> |
|---|---|
| date | Sun, 08 Mar 2020 19:18:48 +0200 |
| parents | 33594243ce31 |
| children |
| rev | line source |
|---|---|
| 0 | 1 /* |
| 2 * BPG encoder | |
| 3 * | |
| 4 * Copyright (c) 2014 Fabrice Bellard | |
| 5 * | |
| 6 * Permission is hereby granted, free of charge, to any person obtaining a copy | |
| 7 * of this software and associated documentation files (the "Software"), to deal | |
| 8 * in the Software without restriction, including without limitation the rights | |
| 9 * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | |
| 10 * copies of the Software, and to permit persons to whom the Software is | |
| 11 * furnished to do so, subject to the following conditions: | |
| 12 * | |
| 13 * The above copyright notice and this permission notice shall be included in | |
| 14 * all copies or substantial portions of the Software. | |
| 15 * | |
| 16 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | |
| 17 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | |
| 18 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL | |
| 19 * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | |
| 20 * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | |
| 21 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | |
| 22 * THE SOFTWARE. | |
| 23 */ | |
| 24 #include <stdlib.h> | |
| 25 #include <stdio.h> | |
| 26 #include <string.h> | |
| 27 #include <inttypes.h> | |
| 28 #include <getopt.h> | |
| 29 #include <math.h> | |
| 30 #include <assert.h> | |
| 31 | |
| 32 #include <png.h> | |
| 33 #include <jpeglib.h> | |
|
4
bbd61622856a
Initial implementation of TIFF format read support via libtiff.
Matti Hamalainen <ccr@tnsp.org>
parents:
3
diff
changeset
|
34 #include <tiffio.h> |
|
24
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
35 #ifdef HAVE_LIBEXIF |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
36 #include <exif-data.h> |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
37 #endif |
| 0 | 38 |
| 39 #include "bpgenc.h" | |
| 40 | |
| 33 | 41 |
| 42 | |
| 0 | 43 typedef uint16_t PIXEL; |
| 44 | |
| 45 static void put_ue(uint8_t **pp, uint32_t v); | |
| 46 | |
| 47 static inline int clamp_pix(int a, int pixel_max) | |
| 48 { | |
| 49 if (a < 0) | |
| 50 return 0; | |
| 51 else if (a > pixel_max) | |
| 52 return pixel_max; | |
| 53 else | |
| 54 return a; | |
| 55 } | |
| 56 | |
| 57 static inline int sub_mod_int(int a, int b, int m) | |
| 58 { | |
| 59 a -= b; | |
| 60 if (a < 0) | |
| 61 a += m; | |
| 62 return a; | |
| 63 } | |
| 64 | |
| 65 static inline int add_mod_int(int a, int b, int m) | |
| 66 { | |
| 67 a += b; | |
| 68 if (a >= m) | |
| 69 a -= m; | |
| 70 return a; | |
| 71 } | |
| 72 | |
| 73 typedef struct { | |
| 74 int c_shift; | |
| 75 int c_rnd; | |
| 76 int c_0_25, c_0_5, c_one; | |
| 77 int rgb_to_ycc[3 * 3]; | |
| 78 int y_one; | |
| 79 int y_offset; | |
| 80 int bit_depth; | |
| 81 int pixel_max; | |
| 82 int c_center; | |
| 83 } ColorConvertState; | |
| 84 | |
|
5
524eae707ba4
Cosmetics: Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
85 static void convert_init(ColorConvertState *s, int in_bit_depth, |
| 0 | 86 int out_bit_depth, BPGColorSpaceEnum color_space, |
| 87 int limited_range) | |
| 88 { | |
| 89 double k_r, k_b, mult, mult_y, mult_c; | |
| 90 int in_pixel_max, out_pixel_max, c_shift, i; | |
| 91 double rgb_to_ycc[3 * 3]; | |
| 92 | |
| 93 /* XXX: could use one more bit */ | |
| 94 c_shift = 31 - out_bit_depth; | |
| 95 in_pixel_max = (1 << in_bit_depth) - 1; | |
| 96 out_pixel_max = (1 << out_bit_depth) - 1; | |
| 97 mult = (double)out_pixel_max * (1 << c_shift) / (double)in_pixel_max; | |
| 98 // printf("mult=%f c_shift=%d\n", mult, c_shift); | |
| 99 if (limited_range) { | |
|
5
524eae707ba4
Cosmetics: Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
100 mult_y = (double)(219 << (out_bit_depth - 8)) * (1 << c_shift) / |
| 0 | 101 (double)in_pixel_max; |
|
5
524eae707ba4
Cosmetics: Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
102 mult_c = (double)(224 << (out_bit_depth - 8)) * (1 << c_shift) / |
| 0 | 103 (double)in_pixel_max; |
| 104 } else { | |
| 105 mult_y = mult; | |
| 106 mult_c = mult; | |
| 107 } | |
| 108 switch(color_space) { | |
| 109 case BPG_CS_YCbCr: | |
| 110 k_r = 0.299; | |
| 111 k_b = 0.114; | |
| 112 goto convert_ycc; | |
|
5
524eae707ba4
Cosmetics: Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
113 |
| 0 | 114 case BPG_CS_YCbCr_BT709: |
|
5
524eae707ba4
Cosmetics: Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
115 k_r = 0.2126; |
| 0 | 116 k_b = 0.0722; |
| 117 goto convert_ycc; | |
|
5
524eae707ba4
Cosmetics: Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
118 |
| 0 | 119 case BPG_CS_YCbCr_BT2020: |
| 120 k_r = 0.2627; | |
| 121 k_b = 0.0593; | |
| 122 convert_ycc: | |
| 123 rgb_to_ycc[0] = k_r; | |
| 124 rgb_to_ycc[1] = 1 - k_r - k_b; | |
| 125 rgb_to_ycc[2] = k_b; | |
| 126 rgb_to_ycc[3] = -0.5 * k_r / (1 - k_b); | |
| 127 rgb_to_ycc[4] = -0.5 * (1 - k_r - k_b) / (1 - k_b); | |
| 128 rgb_to_ycc[5] = 0.5; | |
| 129 rgb_to_ycc[6] = 0.5; | |
| 130 rgb_to_ycc[7] = -0.5 * (1 - k_r - k_b) / (1 - k_r); | |
| 131 rgb_to_ycc[8] = -0.5 * k_b / (1 - k_r); | |
|
5
524eae707ba4
Cosmetics: Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
132 |
| 0 | 133 for(i = 0; i < 3; i++) |
| 134 s->rgb_to_ycc[i] = lrint(rgb_to_ycc[i] * mult_y); | |
| 135 for(i = 3; i < 9; i++) | |
| 136 s->rgb_to_ycc[i] = lrint(rgb_to_ycc[i] * mult_c); | |
| 137 break; | |
| 138 case BPG_CS_YCgCo: | |
| 139 s->c_0_25 = lrint(0.25 * mult_y); | |
| 140 s->c_0_5 = lrint(0.5 * mult_y); | |
| 141 break; | |
| 142 default: | |
| 143 break; | |
| 144 } | |
| 145 | |
| 146 s->c_one = lrint(mult); | |
| 147 s->c_shift = c_shift; | |
| 148 s->c_rnd = (1 << (c_shift - 1)); | |
| 149 if (limited_range) { | |
| 150 s->y_offset = s->c_rnd + (16 << (c_shift + out_bit_depth - 8)); | |
| 151 s->y_one = lrint(mult_y); | |
| 152 } else { | |
| 153 s->y_offset = s->c_rnd; | |
| 154 s->y_one = s->c_one; | |
| 155 } | |
| 156 | |
| 157 s->bit_depth = out_bit_depth; | |
| 158 s->c_center = 1 << (out_bit_depth - 1); | |
| 159 s->pixel_max = out_pixel_max; | |
| 160 } | |
| 161 | |
| 162 /* 8 bit input */ | |
| 163 static void rgb24_to_ycc(ColorConvertState *s, | |
| 164 PIXEL *y_ptr, PIXEL *cb_ptr, PIXEL *cr_ptr, | |
| 165 const void *src1, int n, int incr) | |
| 166 { | |
| 167 const uint8_t *src = src1; | |
| 168 int i, r, g, b, c0, c1, c2, c3, c4, c5, c6, c7, c8, shift, rnd, center; | |
| 169 int pixel_max, y_offset; | |
| 170 | |
| 171 c0 = s->rgb_to_ycc[0]; | |
| 172 c1 = s->rgb_to_ycc[1]; | |
| 173 c2 = s->rgb_to_ycc[2]; | |
| 174 c3 = s->rgb_to_ycc[3]; | |
| 175 c4 = s->rgb_to_ycc[4]; | |
| 176 c5 = s->rgb_to_ycc[5]; | |
| 177 c6 = s->rgb_to_ycc[6]; | |
| 178 c7 = s->rgb_to_ycc[7]; | |
| 179 c8 = s->rgb_to_ycc[8]; | |
| 180 shift = s->c_shift; | |
| 181 rnd = s->c_rnd; | |
| 182 y_offset = s->y_offset; | |
| 183 center = s->c_center; | |
| 184 pixel_max = s->pixel_max; | |
| 185 for(i = 0; i < n; i++) { | |
| 186 r = src[0]; | |
| 187 g = src[1]; | |
| 188 b = src[2]; | |
| 189 y_ptr[i] = clamp_pix((c0 * r + c1 * g + c2 * b + | |
| 190 y_offset) >> shift, pixel_max); | |
|
5
524eae707ba4
Cosmetics: Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
191 cb_ptr[i] = clamp_pix(((c3 * r + c4 * g + c5 * b + |
| 0 | 192 rnd) >> shift) + center, pixel_max); |
|
5
524eae707ba4
Cosmetics: Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
193 cr_ptr[i] = clamp_pix(((c6 * r + c7 * g + c8 * b + |
| 0 | 194 rnd) >> shift) + center, pixel_max); |
| 195 src += incr; | |
| 196 } | |
| 197 } | |
| 198 | |
| 199 static void rgb24_to_rgb(ColorConvertState *s, | |
| 200 PIXEL *y_ptr, PIXEL *cb_ptr, PIXEL *cr_ptr, | |
| 201 const void *src1, int n, int incr) | |
| 202 { | |
| 203 const uint8_t *src = src1; | |
| 204 int i, r, g, b, c, shift, rnd; | |
| 205 | |
| 206 c = s->y_one; | |
| 207 shift = s->c_shift; | |
| 208 rnd = s->y_offset; | |
| 209 for(i = 0; i < n; i++) { | |
| 210 r = src[0]; | |
| 211 g = src[1]; | |
| 212 b = src[2]; | |
| 213 y_ptr[i] = (c * g + rnd) >> shift; | |
| 214 cb_ptr[i] = (c * b + rnd) >> shift; | |
| 215 cr_ptr[i] = (c * r + rnd) >> shift; | |
| 216 src += incr; | |
| 217 } | |
| 218 } | |
| 219 | |
| 220 static void rgb24_to_ycgco(ColorConvertState *s, | |
| 221 PIXEL *y_ptr, PIXEL *cb_ptr, PIXEL *cr_ptr, | |
| 222 const void *src1, int n, int incr) | |
| 223 { | |
| 224 const uint8_t *src = src1; | |
| 225 int i, r, g, b, t1, t2, pixel_max, c_0_5, c_0_25, rnd, shift, center; | |
| 226 int y_offset; | |
| 227 | |
| 228 c_0_25 = s->c_0_25; | |
| 229 c_0_5 = s->c_0_5; | |
| 230 rnd = s->c_rnd; | |
| 231 shift = s->c_shift; | |
| 232 pixel_max = s->pixel_max; | |
| 233 center = s->c_center; | |
| 234 y_offset = s->y_offset; | |
| 235 for(i = 0; i < n; i++) { | |
| 236 r = src[0]; | |
| 237 g = src[1]; | |
| 238 b = src[2]; | |
| 239 t1 = c_0_5 * g; | |
| 240 t2 = c_0_25 * (r + b); | |
| 241 y_ptr[i] = clamp_pix((t1 + t2 + y_offset) >> shift, pixel_max); | |
|
5
524eae707ba4
Cosmetics: Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
242 cb_ptr[i] = clamp_pix(((t1 - t2 + rnd) >> shift) + center, |
| 0 | 243 pixel_max); |
| 244 cr_ptr[i] = clamp_pix(((c_0_5 * (r - b) + | |
| 245 rnd) >> shift) + center, pixel_max); | |
| 246 src += incr; | |
| 247 } | |
| 248 } | |
| 249 | |
| 250 /* Note: used for alpha/W so no limited range */ | |
| 251 static void gray8_to_gray(ColorConvertState *s, | |
| 252 PIXEL *y_ptr, const uint8_t *src, int n, int incr) | |
| 253 { | |
| 254 int i, g, c, shift, rnd; | |
| 255 | |
| 256 c = s->c_one; | |
| 257 shift = s->c_shift; | |
| 258 rnd = s->c_rnd; | |
| 259 for(i = 0; i < n; i++) { | |
| 260 g = src[0]; | |
| 261 y_ptr[i] = (c * g + rnd) >> shift; | |
| 262 src += incr; | |
| 263 } | |
| 264 } | |
| 265 | |
| 266 static void luma8_to_gray(ColorConvertState *s, | |
| 267 PIXEL *y_ptr, const uint8_t *src, int n, int incr) | |
| 268 { | |
| 269 int i, g, c, shift, rnd; | |
| 270 | |
| 271 c = s->y_one; | |
| 272 shift = s->c_shift; | |
| 273 rnd = s->y_offset; | |
| 274 for(i = 0; i < n; i++) { | |
| 275 g = src[0]; | |
| 276 y_ptr[i] = (c * g + rnd) >> shift; | |
| 277 src += incr; | |
| 278 } | |
| 279 } | |
| 280 | |
| 281 /* 16 bit input */ | |
| 282 | |
|
5
524eae707ba4
Cosmetics: Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
283 static void rgb48_to_ycc(ColorConvertState *s, |
| 0 | 284 PIXEL *y_ptr, PIXEL *cb_ptr, PIXEL *cr_ptr, |
| 285 const void *src1, int n, int incr) | |
| 286 { | |
| 287 const uint16_t *src = src1; | |
| 288 int i, r, g, b, c0, c1, c2, c3, c4, c5, c6, c7, c8, shift, rnd, center; | |
| 289 int pixel_max, y_offset; | |
| 290 | |
| 291 c0 = s->rgb_to_ycc[0]; | |
| 292 c1 = s->rgb_to_ycc[1]; | |
| 293 c2 = s->rgb_to_ycc[2]; | |
| 294 c3 = s->rgb_to_ycc[3]; | |
| 295 c4 = s->rgb_to_ycc[4]; | |
| 296 c5 = s->rgb_to_ycc[5]; | |
| 297 c6 = s->rgb_to_ycc[6]; | |
| 298 c7 = s->rgb_to_ycc[7]; | |
| 299 c8 = s->rgb_to_ycc[8]; | |
| 300 shift = s->c_shift; | |
| 301 rnd = s->c_rnd; | |
| 302 y_offset = s->y_offset; | |
| 303 center = s->c_center; | |
| 304 pixel_max = s->pixel_max; | |
| 305 for(i = 0; i < n; i++) { | |
| 306 r = src[0]; | |
| 307 g = src[1]; | |
| 308 b = src[2]; | |
| 309 y_ptr[i] = clamp_pix((c0 * r + c1 * g + c2 * b + | |
| 310 y_offset) >> shift, pixel_max); | |
|
5
524eae707ba4
Cosmetics: Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
311 cb_ptr[i] = clamp_pix(((c3 * r + c4 * g + c5 * b + |
| 0 | 312 rnd) >> shift) + center, pixel_max); |
|
5
524eae707ba4
Cosmetics: Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
313 cr_ptr[i] = clamp_pix(((c6 * r + c7 * g + c8 * b + |
| 0 | 314 rnd) >> shift) + center, pixel_max); |
| 315 src += incr; | |
| 316 } | |
| 317 } | |
| 318 | |
|
5
524eae707ba4
Cosmetics: Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
319 static void rgb48_to_ycgco(ColorConvertState *s, |
| 0 | 320 PIXEL *y_ptr, PIXEL *cb_ptr, PIXEL *cr_ptr, |
| 321 const void *src1, int n, int incr) | |
| 322 { | |
| 323 const uint16_t *src = src1; | |
| 324 int i, r, g, b, t1, t2, pixel_max, c_0_5, c_0_25, rnd, shift, center; | |
| 325 int y_offset; | |
| 326 | |
| 327 c_0_25 = s->c_0_25; | |
| 328 c_0_5 = s->c_0_5; | |
| 329 rnd = s->c_rnd; | |
| 330 y_offset = s->y_offset; | |
| 331 shift = s->c_shift; | |
| 332 pixel_max = s->pixel_max; | |
| 333 center = s->c_center; | |
| 334 for(i = 0; i < n; i++) { | |
| 335 r = src[0]; | |
| 336 g = src[1]; | |
| 337 b = src[2]; | |
| 338 t1 = c_0_5 * g; | |
| 339 t2 = c_0_25 * (r + b); | |
| 340 y_ptr[i] = clamp_pix((t1 + t2 + y_offset) >> shift, pixel_max); | |
|
5
524eae707ba4
Cosmetics: Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
341 cb_ptr[i] = clamp_pix(((t1 - t2 + rnd) >> shift) + center, |
| 0 | 342 pixel_max); |
| 343 cr_ptr[i] = clamp_pix(((c_0_5 * (r - b) + | |
| 344 rnd) >> shift) + center, pixel_max); | |
| 345 src += incr; | |
| 346 } | |
| 347 } | |
| 348 | |
| 349 /* Note: use for alpha/W so no limited range */ | |
|
5
524eae707ba4
Cosmetics: Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
350 static void gray16_to_gray(ColorConvertState *s, |
| 0 | 351 PIXEL *y_ptr, const uint16_t *src, int n, int incr) |
| 352 { | |
| 353 int i, g, c, shift, rnd; | |
| 354 | |
| 355 c = s->c_one; | |
| 356 shift = s->c_shift; | |
| 357 rnd = s->c_rnd; | |
| 358 for(i = 0; i < n; i++) { | |
| 359 g = src[0]; | |
| 360 y_ptr[i] = (c * g + rnd) >> shift; | |
| 361 src += incr; | |
| 362 } | |
| 363 } | |
| 364 | |
|
5
524eae707ba4
Cosmetics: Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
365 static void luma16_to_gray(ColorConvertState *s, |
| 0 | 366 PIXEL *y_ptr, const uint16_t *src, int n, int incr) |
| 367 { | |
| 368 int i, g, c, shift, rnd; | |
| 369 | |
| 370 c = s->y_one; | |
| 371 shift = s->c_shift; | |
| 372 rnd = s->y_offset; | |
| 373 for(i = 0; i < n; i++) { | |
| 374 g = src[0]; | |
| 375 y_ptr[i] = (c * g + rnd) >> shift; | |
| 376 src += incr; | |
| 377 } | |
| 378 } | |
| 379 | |
|
5
524eae707ba4
Cosmetics: Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
380 static void rgb48_to_rgb(ColorConvertState *s, |
| 0 | 381 PIXEL *y_ptr, PIXEL *cb_ptr, PIXEL *cr_ptr, |
| 382 const void *src1, int n, int incr) | |
| 383 { | |
| 384 const uint16_t *src = src1; | |
| 385 | |
| 386 luma16_to_gray(s, y_ptr, src + 1, n, incr); | |
| 387 luma16_to_gray(s, cb_ptr, src + 2, n, incr); | |
| 388 luma16_to_gray(s, cr_ptr, src + 0, n, incr); | |
| 389 } | |
| 390 | |
|
5
524eae707ba4
Cosmetics: Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
391 typedef void RGBConvertFunc(ColorConvertState *s, |
| 0 | 392 PIXEL *y_ptr, PIXEL *cb_ptr, PIXEL *cr_ptr, |
| 393 const void *src, int n, int incr); | |
| 394 | |
| 395 static RGBConvertFunc *rgb_to_cs[2][BPG_CS_COUNT] = { | |
| 396 { | |
| 397 rgb24_to_ycc, | |
| 398 rgb24_to_rgb, | |
| 399 rgb24_to_ycgco, | |
| 400 rgb24_to_ycc, | |
| 401 rgb24_to_ycc, | |
| 402 }, | |
| 403 { | |
| 404 rgb48_to_ycc, | |
| 405 rgb48_to_rgb, | |
| 406 rgb48_to_ycgco, | |
| 407 rgb48_to_ycc, | |
| 408 rgb48_to_ycc, | |
| 409 } | |
| 410 }; | |
|
5
524eae707ba4
Cosmetics: Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
411 |
| 0 | 412 /* val = 1.0 - val */ |
| 413 static void gray_one_minus(ColorConvertState *s, PIXEL *y_ptr, int n) | |
| 414 { | |
| 415 int pixel_max = s->pixel_max; | |
| 416 int i; | |
| 417 | |
| 418 for(i = 0; i < n; i++) { | |
| 419 y_ptr[i] = pixel_max - y_ptr[i]; | |
| 420 } | |
| 421 } | |
| 422 | |
| 423 /* val = -val for chroma */ | |
| 424 static void gray_neg_c(ColorConvertState *s, PIXEL *y_ptr, int n) | |
| 425 { | |
| 426 int pixel_max = s->pixel_max; | |
| 427 int i, v; | |
| 428 | |
| 429 for(i = 0; i < n; i++) { | |
| 430 v = y_ptr[i]; | |
| 431 if (v == 0) | |
| 432 v = pixel_max; | |
| 433 else | |
| 434 v = pixel_max + 1 - v; | |
| 435 y_ptr[i] = v; | |
| 436 } | |
| 437 } | |
| 438 | |
| 439 | |
| 440 /* decimation */ | |
| 441 | |
| 442 /* phase = 0 */ | |
| 443 #define DP0TAPS2 7 | |
| 444 #define DP0TAPS (2 * DP0TAPS + 1) | |
| 445 #define DP0C0 64 | |
| 446 #define DP0C1 40 | |
| 447 #define DP0C3 (-11) | |
| 448 #define DP0C5 4 | |
| 449 #define DP0C7 (-1) | |
| 450 | |
| 451 /* phase = 0.5 */ | |
| 452 #define DP1TAPS2 5 | |
| 453 #define DP1TAPS (2 * DP1TAPS2) | |
| 454 #define DP1C0 57 | |
| 455 #define DP1C1 17 | |
| 456 #define DP1C2 (-8) | |
| 457 #define DP1C3 (-4) | |
| 458 #define DP1C4 2 | |
| 459 | |
| 460 #define DTAPS_MAX 7 | |
| 461 | |
| 462 /* chroma aligned with luma samples */ | |
| 463 static void decimate2p0_simple(PIXEL *dst, PIXEL *src, int n, int bit_depth) | |
| 464 { | |
| 465 int n2, i, pixel_max; | |
| 466 pixel_max = (1 << bit_depth) - 1; | |
| 467 n2 = (n + 1) / 2; | |
| 468 for(i = 0; i < n2; i++) { | |
|
5
524eae707ba4
Cosmetics: Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
469 dst[i] = clamp_pix(((src[-7] + src[7]) * DP0C7 + |
|
524eae707ba4
Cosmetics: Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
470 (src[-5] + src[5]) * DP0C5 + |
|
524eae707ba4
Cosmetics: Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
471 (src[-3] + src[3]) * DP0C3 + |
|
524eae707ba4
Cosmetics: Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
472 (src[-1] + src[1]) * DP0C1 + |
| 0 | 473 src[0] * DP0C0 + 64) >> 7, pixel_max); |
| 474 src += 2; | |
| 475 } | |
| 476 } | |
| 477 | |
| 478 /* same with more precision and no saturation */ | |
| 479 static void decimate2p0_simple16(int16_t *dst, PIXEL *src, int n, int bit_depth) | |
| 480 { | |
| 481 int n2, i, shift, rnd; | |
| 482 shift = bit_depth - 7; | |
| 483 rnd = 1 << (shift - 1); | |
| 484 n2 = (n + 1) / 2; | |
| 485 for(i = 0; i < n2; i++) { | |
|
5
524eae707ba4
Cosmetics: Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
486 dst[i] = ((src[-7] + src[7]) * DP0C7 + |
|
524eae707ba4
Cosmetics: Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
487 (src[-5] + src[5]) * DP0C5 + |
|
524eae707ba4
Cosmetics: Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
488 (src[-3] + src[3]) * DP0C3 + |
|
524eae707ba4
Cosmetics: Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
489 (src[-1] + src[1]) * DP0C1 + |
| 0 | 490 src[0] * DP0C0 + rnd) >> shift; |
| 491 src += 2; | |
| 492 } | |
| 493 } | |
| 494 | |
| 495 | |
| 496 /* chroma half way between luma samples */ | |
| 497 static void decimate2p1_simple(PIXEL *dst, PIXEL *src, int n, int bit_depth) | |
| 498 { | |
| 499 int n2, i, pixel_max; | |
| 500 pixel_max = (1 << bit_depth) - 1; | |
| 501 n2 = (n + 1) / 2; | |
| 502 for(i = 0; i < n2; i++) { | |
|
5
524eae707ba4
Cosmetics: Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
503 dst[i] = clamp_pix(((src[-4] + src[5]) * DP1C4 + |
|
524eae707ba4
Cosmetics: Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
504 (src[-3] + src[4]) * DP1C3 + |
|
524eae707ba4
Cosmetics: Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
505 (src[-2] + src[3]) * DP1C2 + |
|
524eae707ba4
Cosmetics: Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
506 (src[-1] + src[2]) * DP1C1 + |
| 0 | 507 (src[0] + src[1]) * DP1C0 + 64) >> 7, pixel_max); |
| 508 src += 2; | |
| 509 } | |
| 510 } | |
| 511 | |
| 512 /* same with more precision and no saturation */ | |
| 513 static void decimate2p1_simple16(int16_t *dst, PIXEL *src, int n, int bit_depth) | |
| 514 { | |
| 515 int n2, i, shift, rnd; | |
| 516 shift = bit_depth - 7; | |
| 517 rnd = 1 << (shift - 1); | |
| 518 n2 = (n + 1) / 2; | |
| 519 for(i = 0; i < n2; i++) { | |
|
5
524eae707ba4
Cosmetics: Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
520 dst[i] = ((src[-4] + src[5]) * DP1C4 + |
|
524eae707ba4
Cosmetics: Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
521 (src[-3] + src[4]) * DP1C3 + |
|
524eae707ba4
Cosmetics: Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
522 (src[-2] + src[3]) * DP1C2 + |
|
524eae707ba4
Cosmetics: Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
523 (src[-1] + src[2]) * DP1C1 + |
| 0 | 524 (src[0] + src[1]) * DP1C0 + rnd) >> shift; |
| 525 src += 2; | |
| 526 } | |
| 527 } | |
| 528 | |
| 529 static void decimate2_h(PIXEL *dst, PIXEL *src, int n, int bit_depth, int phase) | |
| 530 { | |
| 531 PIXEL *src1, v; | |
| 532 int d, i; | |
| 533 | |
|
5
524eae707ba4
Cosmetics: Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
534 if (phase == 0) |
| 0 | 535 d = DP0TAPS2; |
| 536 else | |
| 537 d = DP1TAPS2; | |
| 538 /* add edge pixels */ | |
| 539 src1 = malloc(sizeof(PIXEL) * (n + 2 * d)); | |
| 540 v = src[0]; | |
| 541 for(i = 0; i < d; i++) | |
| 542 src1[i] = v; | |
| 543 memcpy(src1 + d, src, n * sizeof(PIXEL)); | |
| 544 v = src[n - 1]; | |
| 545 for(i = 0; i < d; i++) | |
| 546 src1[d + n + i] = v; | |
| 547 if (phase == 0) | |
| 548 decimate2p0_simple(dst, src1 + d, n, bit_depth); | |
| 549 else | |
| 550 decimate2p1_simple(dst, src1 + d, n, bit_depth); | |
| 551 free(src1); | |
| 552 } | |
| 553 | |
| 554 /* src1 is a temporary buffer of length n + 2 * DTAPS */ | |
| 555 static void decimate2_h16(int16_t *dst, PIXEL *src, int n, PIXEL *src1, | |
| 556 int bit_depth, int phase) | |
| 557 { | |
| 558 PIXEL v; | |
| 559 int d, i; | |
| 560 | |
|
5
524eae707ba4
Cosmetics: Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
561 if (phase == 0) |
| 0 | 562 d = DP0TAPS2; |
| 563 else | |
| 564 d = DP1TAPS2; | |
| 565 /* add edge pixels */ | |
| 566 v = src[0]; | |
| 567 for(i = 0; i < d; i++) | |
| 568 src1[i] = v; | |
| 569 memcpy(src1 + d, src, n * sizeof(PIXEL)); | |
| 570 v = src[n - 1]; | |
| 571 for(i = 0; i < d; i++) | |
| 572 src1[d + n + i] = v; | |
| 573 if (phase == 0) | |
| 574 decimate2p0_simple16(dst, src1 + d, n, bit_depth); | |
| 575 else | |
| 576 decimate2p1_simple16(dst, src1 + d, n, bit_depth); | |
|
5
524eae707ba4
Cosmetics: Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
577 |
| 0 | 578 } |
| 579 | |
| 580 static void decimate2_v(PIXEL *dst, int16_t **src, int pos, int n, | |
| 581 int bit_depth) | |
| 582 { | |
| 583 int16_t *src0, *src1, *src2, *src3, *src4, *src5, *srcm1, *srcm2, *srcm3, *srcm4; | |
| 584 int i, shift, offset, pixel_max; | |
| 585 | |
| 586 pos = sub_mod_int(pos, 4, DP1TAPS); | |
| 587 srcm4 = src[pos]; | |
| 588 pos = add_mod_int(pos, 1, DP1TAPS); | |
| 589 srcm3 = src[pos]; | |
| 590 pos = add_mod_int(pos, 1, DP1TAPS); | |
| 591 srcm2 = src[pos]; | |
| 592 pos = add_mod_int(pos, 1, DP1TAPS); | |
| 593 srcm1 = src[pos]; | |
| 594 pos = add_mod_int(pos, 1, DP1TAPS); | |
| 595 src0 = src[pos]; | |
| 596 pos = add_mod_int(pos, 1, DP1TAPS); | |
| 597 src1 = src[pos]; | |
| 598 pos = add_mod_int(pos, 1, DP1TAPS); | |
| 599 src2 = src[pos]; | |
| 600 pos = add_mod_int(pos, 1, DP1TAPS); | |
| 601 src3 = src[pos]; | |
| 602 pos = add_mod_int(pos, 1, DP1TAPS); | |
| 603 src4 = src[pos]; | |
| 604 pos = add_mod_int(pos, 1, DP1TAPS); | |
| 605 src5 = src[pos]; | |
|
5
524eae707ba4
Cosmetics: Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
606 |
| 0 | 607 shift = 21 - bit_depth; |
| 608 offset = 1 << (shift - 1); | |
| 609 pixel_max = (1 << bit_depth) - 1; | |
| 610 for(i = 0; i < n; i++) { | |
|
5
524eae707ba4
Cosmetics: Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
611 dst[i] = clamp_pix(((srcm4[i] + src5[i]) * DP1C4 + |
|
524eae707ba4
Cosmetics: Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
612 (srcm3[i] + src4[i]) * DP1C3 + |
|
524eae707ba4
Cosmetics: Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
613 (srcm2[i] + src3[i]) * DP1C2 + |
|
524eae707ba4
Cosmetics: Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
614 (srcm1[i] + src2[i]) * DP1C1 + |
| 0 | 615 (src0[i] + src1[i]) * DP1C0 + offset) >> shift, pixel_max); |
| 616 } | |
| 617 } | |
| 618 | |
| 619 /* Note: we do the horizontal decimation first to use less CPU cache */ | |
| 620 static void decimate2_hv(uint8_t *dst, int dst_linesize, | |
|
5
524eae707ba4
Cosmetics: Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
621 uint8_t *src, int src_linesize, |
| 0 | 622 int w, int h, int bit_depth, int h_phase) |
| 623 { | |
| 624 PIXEL *buf1; | |
| 625 int16_t *buf2[DP1TAPS]; | |
| 626 int w2, pos, i, y, y1, y2; | |
|
5
524eae707ba4
Cosmetics: Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
627 |
| 0 | 628 w2 = (w + 1) / 2; |
| 629 | |
| 630 buf1 = malloc(sizeof(PIXEL) * (w + 2 * DTAPS_MAX)); | |
| 631 /* init line buffer */ | |
| 632 for(i = 0; i < DP1TAPS; i++) { | |
| 633 buf2[i] = malloc(sizeof(int16_t) * w2); | |
| 634 y = i; | |
| 635 if (y > DP1TAPS2) | |
| 636 y -= DP1TAPS; | |
| 637 if (y < 0) { | |
| 638 /* copy from first line */ | |
| 639 memcpy(buf2[i], buf2[0], sizeof(int16_t) * w2); | |
| 640 } else if (y >= h) { | |
| 641 /* copy from last line (only happens for small height) */ | |
| 642 memcpy(buf2[i], buf2[h - 1], sizeof(int16_t) * w2); | |
| 643 } else { | |
| 644 decimate2_h16(buf2[i], (PIXEL *)(src + src_linesize * y), w, | |
| 645 buf1, bit_depth, h_phase); | |
| 646 } | |
| 647 } | |
| 648 | |
| 649 for(y = 0; y < h; y++) { | |
| 650 pos = y % DP1TAPS; | |
| 651 if ((y & 1) == 0) { | |
| 652 /* filter one line */ | |
| 653 y2 = y >> 1; | |
| 654 decimate2_v((PIXEL *)(dst + y2 * dst_linesize), buf2, | |
| 655 pos, w2, bit_depth); | |
| 656 } | |
| 657 /* add a new line in the buffer */ | |
| 658 y1 = y + DP1TAPS2 + 1; | |
| 659 pos = add_mod_int(pos, DP1TAPS2 + 1, DP1TAPS); | |
| 660 if (y1 >= h) { | |
| 661 /* copy last line */ | |
| 662 memcpy(buf2[pos], buf2[sub_mod_int(pos, 1, DP1TAPS)], | |
| 663 sizeof(int16_t) * w2); | |
| 664 } else { | |
| 665 /* horizontally decimate new line */ | |
| 666 decimate2_h16(buf2[pos], (PIXEL *)(src + src_linesize * y1), w, | |
| 667 buf1, bit_depth, h_phase); | |
| 668 } | |
| 669 } | |
| 670 | |
| 671 for(i = 0; i < DP1TAPS; i++) | |
| 672 free(buf2[i]); | |
| 673 free(buf1); | |
| 674 } | |
| 675 | |
| 676 static void get_plane_res(Image *img, int *pw, int *ph, int i) | |
| 677 { | |
| 678 if (img->format == BPG_FORMAT_420 && (i == 1 || i == 2)) { | |
| 679 *pw = (img->w + 1) / 2; | |
| 680 *ph = (img->h + 1) / 2; | |
| 681 } else if (img->format == BPG_FORMAT_422 && (i == 1 || i == 2)) { | |
| 682 *pw = (img->w + 1) / 2; | |
| 683 *ph = img->h; | |
| 684 } else { | |
| 685 *pw = img->w; | |
| 686 *ph = img->h; | |
| 687 } | |
| 688 } | |
| 689 | |
| 690 #define W_PAD 16 | |
| 691 | |
| 692 Image *image_alloc(int w, int h, BPGImageFormatEnum format, int has_alpha, | |
| 693 BPGColorSpaceEnum color_space, int bit_depth) | |
| 694 { | |
| 695 Image *img; | |
|
34
5d51fff843eb
A "commit dump" of random changes I've made, as I probably won't be touching this code anymore.
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
696 int i, c_count; |
|
5d51fff843eb
A "commit dump" of random changes I've made, as I probably won't be touching this code anymore.
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
697 |
|
5d51fff843eb
A "commit dump" of random changes I've made, as I probably won't be touching this code anymore.
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
698 if ((img = malloc(sizeof(Image))) == NULL) |
|
5d51fff843eb
A "commit dump" of random changes I've made, as I probably won't be touching this code anymore.
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
699 return NULL; |
|
5d51fff843eb
A "commit dump" of random changes I've made, as I probably won't be touching this code anymore.
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
700 |
|
5d51fff843eb
A "commit dump" of random changes I've made, as I probably won't be touching this code anymore.
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
701 memset(img, 0, sizeof(Image)); |
|
5
524eae707ba4
Cosmetics: Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
702 |
| 0 | 703 img->w = w; |
| 704 img->h = h; | |
| 705 img->format = format; | |
| 706 img->has_alpha = has_alpha; | |
| 707 img->bit_depth = bit_depth; | |
| 708 img->color_space = color_space; | |
| 709 img->pixel_shift = 1; | |
| 710 img->c_h_phase = 1; | |
| 711 | |
| 712 if (img->format == BPG_FORMAT_GRAY) | |
| 713 c_count = 1; | |
| 714 else | |
| 715 c_count = 3; | |
| 33 | 716 |
| 0 | 717 if (has_alpha) |
| 718 c_count++; | |
| 33 | 719 |
| 0 | 720 for(i = 0; i < c_count; i++) { |
|
34
5d51fff843eb
A "commit dump" of random changes I've made, as I probably won't be touching this code anymore.
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
721 int w1, h1, linesize; |
|
5d51fff843eb
A "commit dump" of random changes I've made, as I probably won't be touching this code anymore.
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
722 |
| 0 | 723 get_plane_res(img, &w1, &h1, i); |
| 33 | 724 |
| 0 | 725 /* multiple of 16 pixels to add borders */ |
| 726 w1 = (w1 + (W_PAD - 1)) & ~(W_PAD - 1); | |
| 727 h1 = (h1 + (W_PAD - 1)) & ~(W_PAD - 1); | |
|
5
524eae707ba4
Cosmetics: Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
728 |
| 0 | 729 linesize = w1 << img->pixel_shift; |
| 730 img->data[i] = malloc(linesize * h1); | |
| 731 img->linesize[i] = linesize; | |
| 732 } | |
| 733 return img; | |
| 734 } | |
| 735 | |
| 736 void image_free(Image *img) | |
| 737 { | |
| 738 int i, c_count; | |
| 739 if (img->format == BPG_FORMAT_GRAY) | |
| 740 c_count = 1; | |
| 741 else | |
| 742 c_count = 3; | |
| 743 if (img->has_alpha) | |
| 744 c_count++; | |
| 745 for(i = 0; i < c_count; i++) | |
| 746 free(img->data[i]); | |
| 747 free(img); | |
| 748 } | |
| 749 | |
| 750 int image_ycc444_to_ycc422(Image *img, int h_phase) | |
| 751 { | |
| 752 uint8_t *data1; | |
| 753 int w1, h1, bpp, linesize1, i, y; | |
| 754 | |
| 755 if (img->format != BPG_FORMAT_444 || img->pixel_shift != 1) | |
| 756 return -1; | |
| 757 bpp = 2; | |
| 758 w1 = (img->w + 1) / 2; | |
| 759 w1 = (w1 + (W_PAD - 1)) & ~(W_PAD - 1); | |
| 760 h1 = (img->h + (W_PAD - 1)) & ~(W_PAD - 1); | |
| 761 linesize1 = bpp * w1; | |
| 762 for(i = 1; i <= 2; i++) { | |
| 763 data1 = malloc(linesize1 * h1); | |
| 764 for(y = 0; y < img->h; y++) { | |
| 765 decimate2_h((PIXEL *)(data1 + y * linesize1), | |
| 766 (PIXEL *)(img->data[i] + y * img->linesize[i]), | |
| 767 img->w, img->bit_depth, h_phase); | |
| 768 } | |
| 769 free(img->data[i]); | |
| 770 img->data[i] = data1; | |
| 771 img->linesize[i] = linesize1; | |
| 772 } | |
| 773 img->format = BPG_FORMAT_422; | |
| 774 img->c_h_phase = h_phase; | |
| 775 return 0; | |
| 776 } | |
| 777 | |
| 778 int image_ycc444_to_ycc420(Image *img, int h_phase) | |
| 779 { | |
| 780 uint8_t *data1; | |
| 781 int w1, h1, bpp, linesize1, i; | |
| 782 | |
| 783 if (img->format != BPG_FORMAT_444 || img->pixel_shift != 1) | |
| 784 return -1; | |
| 785 bpp = 2; | |
| 786 w1 = (img->w + 1) / 2; | |
| 787 h1 = (img->h + 1) / 2; | |
| 788 w1 = (w1 + (W_PAD - 1)) & ~(W_PAD - 1); | |
| 789 h1 = (h1 + (W_PAD - 1)) & ~(W_PAD - 1); | |
| 790 linesize1 = bpp * w1; | |
| 791 for(i = 1; i <= 2; i++) { | |
| 792 data1 = malloc(linesize1 * h1); | |
| 793 decimate2_hv(data1, linesize1, | |
| 794 img->data[i], img->linesize[i], | |
| 795 img->w, img->h, img->bit_depth, h_phase); | |
| 796 free(img->data[i]); | |
| 797 img->data[i] = data1; | |
| 798 img->linesize[i] = linesize1; | |
| 799 } | |
| 800 img->format = BPG_FORMAT_420; | |
| 801 img->c_h_phase = h_phase; | |
| 802 return 0; | |
| 803 } | |
| 804 | |
| 805 /* duplicate right and bottom samples so that the image has a width | |
| 806 and height multiple of cb_size (power of two) */ | |
| 807 void image_pad(Image *img, int cb_size) | |
| 808 { | |
| 809 int w1, h1, x, y, c_count, c_w, c_h, c_w1, c_h1, h_shift, v_shift, c_idx; | |
| 810 PIXEL *ptr, v, *ptr1; | |
| 811 | |
| 812 assert(img->pixel_shift == 1); | |
| 813 if (cb_size <= 1) | |
| 814 return; | |
| 815 w1 = (img->w + cb_size - 1) & ~(cb_size - 1); | |
| 816 h1 = (img->h + cb_size - 1) & ~(cb_size - 1); | |
|
5
524eae707ba4
Cosmetics: Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
817 |
| 0 | 818 if (img->format == BPG_FORMAT_GRAY) |
| 819 c_count = 1; | |
| 820 else | |
| 821 c_count = 3; | |
| 822 if (img->has_alpha) | |
| 823 c_count++; | |
| 824 for(c_idx = 0; c_idx < c_count; c_idx++) { | |
|
5
524eae707ba4
Cosmetics: Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
825 if (img->format == BPG_FORMAT_420 && |
| 0 | 826 (c_idx == 1 || c_idx == 2)) { |
| 827 h_shift = 1; | |
| 828 v_shift = 1; | |
|
5
524eae707ba4
Cosmetics: Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
829 } else if (img->format == BPG_FORMAT_422 && |
| 0 | 830 (c_idx == 1 || c_idx == 2)) { |
| 831 h_shift = 1; | |
| 832 v_shift = 0; | |
| 833 } else { | |
| 834 h_shift = 0; | |
| 835 v_shift = 0; | |
| 836 } | |
| 837 | |
| 838 c_w = (img->w + h_shift) >> h_shift; | |
| 839 c_h = (img->h + v_shift) >> v_shift; | |
| 840 c_w1 = w1 >> h_shift; | |
| 841 c_h1 = h1 >> v_shift; | |
| 842 | |
| 843 /* pad horizontally */ | |
| 844 for(y = 0; y < c_h; y++) { | |
| 845 ptr = (PIXEL *)(img->data[c_idx] + img->linesize[c_idx] * y); | |
| 846 v = ptr[c_w - 1]; | |
| 847 for(x = c_w; x < c_w1; x++) { | |
| 848 ptr[x] = v; | |
| 849 } | |
| 850 } | |
| 851 | |
| 852 /* pad vertically */ | |
| 853 ptr1 = (PIXEL *)(img->data[c_idx] + img->linesize[c_idx] * (c_h - 1)); | |
| 854 for(y = c_h; y < c_h1; y++) { | |
| 855 ptr = (PIXEL *)(img->data[c_idx] + img->linesize[c_idx] * y); | |
| 856 memcpy(ptr, ptr1, c_w1 * sizeof(PIXEL)); | |
| 857 } | |
| 858 } | |
| 859 img->w = w1; | |
| 860 img->h = h1; | |
| 861 } | |
| 862 | |
| 863 /* convert the 16 bit components to 8 bits */ | |
| 864 void image_convert16to8(Image *img) | |
| 865 { | |
| 866 int w, h, stride, y, x, c_count, i; | |
| 867 uint8_t *plane; | |
| 868 | |
| 869 if (img->bit_depth > 8 || img->pixel_shift != 1) | |
| 870 return; | |
| 871 if (img->format == BPG_FORMAT_GRAY) | |
| 872 c_count = 1; | |
| 873 else | |
| 874 c_count = 3; | |
| 875 if (img->has_alpha) | |
| 876 c_count++; | |
| 877 for(i = 0; i < c_count; i++) { | |
| 878 get_plane_res(img, &w, &h, i); | |
| 879 stride = w; | |
| 880 plane = malloc(stride * h); | |
| 881 for(y = 0; y < h; y++) { | |
| 882 const uint16_t *src; | |
| 883 uint8_t *dst; | |
| 884 dst = plane + stride * y; | |
| 885 src = (uint16_t *)(img->data[i] + img->linesize[i] * y); | |
| 886 for(x = 0; x < w; x++) | |
| 887 dst[x] = src[x]; | |
| 888 } | |
| 889 free(img->data[i]); | |
| 890 img->data[i] = plane; | |
| 891 img->linesize[i] = stride; | |
| 892 } | |
| 893 img->pixel_shift = 0; | |
| 894 } | |
| 895 | |
| 896 typedef struct BPGMetaData { | |
| 897 uint32_t tag; | |
| 898 uint8_t *buf; | |
| 899 int buf_len; | |
| 900 struct BPGMetaData *next; | |
| 901 } BPGMetaData; | |
| 902 | |
| 903 BPGMetaData *bpg_md_alloc(uint32_t tag) | |
| 904 { | |
| 905 BPGMetaData *md; | |
| 906 md = malloc(sizeof(BPGMetaData)); | |
| 907 memset(md, 0, sizeof(*md)); | |
| 908 md->tag = tag; | |
| 909 return md; | |
| 910 } | |
| 911 | |
| 912 void bpg_md_free(BPGMetaData *md) | |
| 913 { | |
| 914 BPGMetaData *md_next; | |
| 915 | |
| 916 while (md != NULL) { | |
| 917 md_next = md->next; | |
| 918 free(md->buf); | |
| 919 free(md); | |
| 920 md = md_next; | |
| 921 } | |
| 922 } | |
| 923 | |
|
17
91f27e9fdb60
Rename insert_md() and add_md_contents() to bpg_insert_md() and
Matti Hamalainen <ccr@tnsp.org>
parents:
16
diff
changeset
|
924 void bpg_insert_md(BPGMetaData **list, BPGMetaData *node) |
|
9
bfd933ef38b4
Implement some metadata support in TIFF and clean up meta data handling otherwise.
Matti Hamalainen <ccr@tnsp.org>
parents:
8
diff
changeset
|
925 { |
|
bfd933ef38b4
Implement some metadata support in TIFF and clean up meta data handling otherwise.
Matti Hamalainen <ccr@tnsp.org>
parents:
8
diff
changeset
|
926 if (*list == NULL) |
|
bfd933ef38b4
Implement some metadata support in TIFF and clean up meta data handling otherwise.
Matti Hamalainen <ccr@tnsp.org>
parents:
8
diff
changeset
|
927 { |
|
bfd933ef38b4
Implement some metadata support in TIFF and clean up meta data handling otherwise.
Matti Hamalainen <ccr@tnsp.org>
parents:
8
diff
changeset
|
928 *list = node; |
|
bfd933ef38b4
Implement some metadata support in TIFF and clean up meta data handling otherwise.
Matti Hamalainen <ccr@tnsp.org>
parents:
8
diff
changeset
|
929 node->next = NULL; |
|
bfd933ef38b4
Implement some metadata support in TIFF and clean up meta data handling otherwise.
Matti Hamalainen <ccr@tnsp.org>
parents:
8
diff
changeset
|
930 } |
|
bfd933ef38b4
Implement some metadata support in TIFF and clean up meta data handling otherwise.
Matti Hamalainen <ccr@tnsp.org>
parents:
8
diff
changeset
|
931 else |
|
bfd933ef38b4
Implement some metadata support in TIFF and clean up meta data handling otherwise.
Matti Hamalainen <ccr@tnsp.org>
parents:
8
diff
changeset
|
932 { |
|
bfd933ef38b4
Implement some metadata support in TIFF and clean up meta data handling otherwise.
Matti Hamalainen <ccr@tnsp.org>
parents:
8
diff
changeset
|
933 node->next = *list; |
|
bfd933ef38b4
Implement some metadata support in TIFF and clean up meta data handling otherwise.
Matti Hamalainen <ccr@tnsp.org>
parents:
8
diff
changeset
|
934 *list = node; |
|
bfd933ef38b4
Implement some metadata support in TIFF and clean up meta data handling otherwise.
Matti Hamalainen <ccr@tnsp.org>
parents:
8
diff
changeset
|
935 } |
|
bfd933ef38b4
Implement some metadata support in TIFF and clean up meta data handling otherwise.
Matti Hamalainen <ccr@tnsp.org>
parents:
8
diff
changeset
|
936 } |
|
bfd933ef38b4
Implement some metadata support in TIFF and clean up meta data handling otherwise.
Matti Hamalainen <ccr@tnsp.org>
parents:
8
diff
changeset
|
937 |
|
17
91f27e9fdb60
Rename insert_md() and add_md_contents() to bpg_insert_md() and
Matti Hamalainen <ccr@tnsp.org>
parents:
16
diff
changeset
|
938 int bpg_add_md_contents(BPGMetaData **list, const int tag, const size_t len, const void *buf) |
|
9
bfd933ef38b4
Implement some metadata support in TIFF and clean up meta data handling otherwise.
Matti Hamalainen <ccr@tnsp.org>
parents:
8
diff
changeset
|
939 { |
|
bfd933ef38b4
Implement some metadata support in TIFF and clean up meta data handling otherwise.
Matti Hamalainen <ccr@tnsp.org>
parents:
8
diff
changeset
|
940 BPGMetaData *md; |
|
bfd933ef38b4
Implement some metadata support in TIFF and clean up meta data handling otherwise.
Matti Hamalainen <ccr@tnsp.org>
parents:
8
diff
changeset
|
941 |
|
19
a9a60da06ae3
Check for NULL buffer and 0 length of data in bpg_add_md_contents().
Matti Hamalainen <ccr@tnsp.org>
parents:
18
diff
changeset
|
942 if (buf == NULL || len == 0) |
|
a9a60da06ae3
Check for NULL buffer and 0 length of data in bpg_add_md_contents().
Matti Hamalainen <ccr@tnsp.org>
parents:
18
diff
changeset
|
943 return -2; |
|
a9a60da06ae3
Check for NULL buffer and 0 length of data in bpg_add_md_contents().
Matti Hamalainen <ccr@tnsp.org>
parents:
18
diff
changeset
|
944 |
|
34
5d51fff843eb
A "commit dump" of random changes I've made, as I probably won't be touching this code anymore.
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
945 #ifdef TIFF_DEBUG |
|
5d51fff843eb
A "commit dump" of random changes I've made, as I probably won't be touching this code anymore.
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
946 char *filename = NULL, *mtype = NULL; |
|
5d51fff843eb
A "commit dump" of random changes I've made, as I probably won't be touching this code anymore.
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
947 FILE *fh; |
|
5d51fff843eb
A "commit dump" of random changes I've made, as I probably won't be touching this code anymore.
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
948 |
|
5d51fff843eb
A "commit dump" of random changes I've made, as I probably won't be touching this code anymore.
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
949 switch (tag) |
|
5d51fff843eb
A "commit dump" of random changes I've made, as I probably won't be touching this code anymore.
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
950 { |
|
5d51fff843eb
A "commit dump" of random changes I've made, as I probably won't be touching this code anymore.
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
951 case BPG_EXTENSION_TAG_XMP: filename = "paska.xmp"; mtype = "XMP"; break; |
|
5d51fff843eb
A "commit dump" of random changes I've made, as I probably won't be touching this code anymore.
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
952 case BPG_EXTENSION_TAG_EXIF: filename = "paska.exif"; mtype = "EXIF"; break; |
|
5d51fff843eb
A "commit dump" of random changes I've made, as I probably won't be touching this code anymore.
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
953 case BPG_EXTENSION_TAG_ICCP: filename = "paska.iccp"; mtype = "ICCP"; break; |
|
5d51fff843eb
A "commit dump" of random changes I've made, as I probably won't be touching this code anymore.
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
954 default: mtype = "???"; |
|
5d51fff843eb
A "commit dump" of random changes I've made, as I probably won't be touching this code anymore.
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
955 } |
|
5d51fff843eb
A "commit dump" of random changes I've made, as I probably won't be touching this code anymore.
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
956 printf("bpg_add_md_contents(%p, %s (%d), %d, %p)\n", list, mtype, tag, len, buf); |
|
5d51fff843eb
A "commit dump" of random changes I've made, as I probably won't be touching this code anymore.
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
957 if (filename != NULL && (fh = fopen(filename, "wb")) != NULL) |
|
5d51fff843eb
A "commit dump" of random changes I've made, as I probably won't be touching this code anymore.
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
958 { |
|
5d51fff843eb
A "commit dump" of random changes I've made, as I probably won't be touching this code anymore.
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
959 printf("bpg_add_md_contents() writing to file '%s' ..\n", filename); |
|
5d51fff843eb
A "commit dump" of random changes I've made, as I probably won't be touching this code anymore.
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
960 fwrite(buf, len, 1, fh); |
|
5d51fff843eb
A "commit dump" of random changes I've made, as I probably won't be touching this code anymore.
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
961 fclose(fh); |
|
5d51fff843eb
A "commit dump" of random changes I've made, as I probably won't be touching this code anymore.
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
962 } |
|
5d51fff843eb
A "commit dump" of random changes I've made, as I probably won't be touching this code anymore.
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
963 #endif |
|
5d51fff843eb
A "commit dump" of random changes I've made, as I probably won't be touching this code anymore.
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
964 |
|
9
bfd933ef38b4
Implement some metadata support in TIFF and clean up meta data handling otherwise.
Matti Hamalainen <ccr@tnsp.org>
parents:
8
diff
changeset
|
965 if ((md = bpg_md_alloc(tag)) == NULL) |
|
bfd933ef38b4
Implement some metadata support in TIFF and clean up meta data handling otherwise.
Matti Hamalainen <ccr@tnsp.org>
parents:
8
diff
changeset
|
966 goto err; |
|
bfd933ef38b4
Implement some metadata support in TIFF and clean up meta data handling otherwise.
Matti Hamalainen <ccr@tnsp.org>
parents:
8
diff
changeset
|
967 |
|
bfd933ef38b4
Implement some metadata support in TIFF and clean up meta data handling otherwise.
Matti Hamalainen <ccr@tnsp.org>
parents:
8
diff
changeset
|
968 if ((md->buf = malloc(len)) == NULL) |
|
bfd933ef38b4
Implement some metadata support in TIFF and clean up meta data handling otherwise.
Matti Hamalainen <ccr@tnsp.org>
parents:
8
diff
changeset
|
969 goto err; |
|
bfd933ef38b4
Implement some metadata support in TIFF and clean up meta data handling otherwise.
Matti Hamalainen <ccr@tnsp.org>
parents:
8
diff
changeset
|
970 |
|
bfd933ef38b4
Implement some metadata support in TIFF and clean up meta data handling otherwise.
Matti Hamalainen <ccr@tnsp.org>
parents:
8
diff
changeset
|
971 md->buf_len = len; |
|
bfd933ef38b4
Implement some metadata support in TIFF and clean up meta data handling otherwise.
Matti Hamalainen <ccr@tnsp.org>
parents:
8
diff
changeset
|
972 memcpy(md->buf, buf, len); |
|
17
91f27e9fdb60
Rename insert_md() and add_md_contents() to bpg_insert_md() and
Matti Hamalainen <ccr@tnsp.org>
parents:
16
diff
changeset
|
973 bpg_insert_md(list, md); |
|
9
bfd933ef38b4
Implement some metadata support in TIFF and clean up meta data handling otherwise.
Matti Hamalainen <ccr@tnsp.org>
parents:
8
diff
changeset
|
974 return 0; |
|
bfd933ef38b4
Implement some metadata support in TIFF and clean up meta data handling otherwise.
Matti Hamalainen <ccr@tnsp.org>
parents:
8
diff
changeset
|
975 |
|
bfd933ef38b4
Implement some metadata support in TIFF and clean up meta data handling otherwise.
Matti Hamalainen <ccr@tnsp.org>
parents:
8
diff
changeset
|
976 err: |
|
bfd933ef38b4
Implement some metadata support in TIFF and clean up meta data handling otherwise.
Matti Hamalainen <ccr@tnsp.org>
parents:
8
diff
changeset
|
977 bpg_md_free(md); |
|
bfd933ef38b4
Implement some metadata support in TIFF and clean up meta data handling otherwise.
Matti Hamalainen <ccr@tnsp.org>
parents:
8
diff
changeset
|
978 return -1; |
|
bfd933ef38b4
Implement some metadata support in TIFF and clean up meta data handling otherwise.
Matti Hamalainen <ccr@tnsp.org>
parents:
8
diff
changeset
|
979 } |
|
bfd933ef38b4
Implement some metadata support in TIFF and clean up meta data handling otherwise.
Matti Hamalainen <ccr@tnsp.org>
parents:
8
diff
changeset
|
980 |
|
bfd933ef38b4
Implement some metadata support in TIFF and clean up meta data handling otherwise.
Matti Hamalainen <ccr@tnsp.org>
parents:
8
diff
changeset
|
981 |
|
24
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
982 #ifdef HAVE_LIBEXIF |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
983 typedef struct |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
984 { |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
985 int tag; // Note: libtiff TIFF tags for EXIF are same as EXIF tags themselves |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
986 char *name; |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
987 int ifd; |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
988 } TIFFTagConvertInfo; |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
989 |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
990 |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
991 static const TIFFTagConvertInfo tiff_tag_convert_table[] = |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
992 { |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
993 { TIFFTAG_ORIENTATION , "Orientation" , EXIF_IFD_0 }, |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
994 { TIFFTAG_XRESOLUTION , "XResolution" , EXIF_IFD_0 }, |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
995 { TIFFTAG_YRESOLUTION , "YResolution" , EXIF_IFD_0 }, |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
996 { TIFFTAG_RESOLUTIONUNIT , "ResolutionUnit" , EXIF_IFD_0 }, |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
997 { TIFFTAG_IMAGEDESCRIPTION , "ImageDescription" , EXIF_IFD_0 }, |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
998 { TIFFTAG_MAKE , "Make" , EXIF_IFD_0 }, |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
999 { TIFFTAG_MODEL , "Model" , EXIF_IFD_0 }, |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1000 { TIFFTAG_SOFTWARE , "Software" , EXIF_IFD_0 }, |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1001 { TIFFTAG_ARTIST , "Artist" , EXIF_IFD_0 }, |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1002 { TIFFTAG_COPYRIGHT , "Copyright" , EXIF_IFD_0 }, |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1003 { TIFFTAG_DATETIME , "DateTime" , EXIF_IFD_0 }, |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1004 { 0 , NULL , 0 }, |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1005 }; |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1006 |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1007 |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1008 static const TIFFTagConvertInfo exif_tag_convert_table[] = |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1009 { |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1010 { EXIFTAG_EXPOSURETIME , "ExposureTime" , EXIF_IFD_EXIF }, |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1011 { EXIFTAG_FNUMBER , "FNumber" , EXIF_IFD_EXIF }, |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1012 { EXIFTAG_EXPOSUREPROGRAM , "ExposureProgram" , EXIF_IFD_EXIF }, |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1013 { EXIFTAG_SPECTRALSENSITIVITY , "Spectralsensitivity" , EXIF_IFD_EXIF }, |
|
34
5d51fff843eb
A "commit dump" of random changes I've made, as I probably won't be touching this code anymore.
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
1014 // { EXIFTAG_ISOSPEEDRATINGS , "ISOSpeed" , EXIF_IFD_EXIF }, |
|
5d51fff843eb
A "commit dump" of random changes I've made, as I probably won't be touching this code anymore.
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
1015 // { EXIFTAG_OECF , "OptoElectricConversion" , EXIF_IFD_EXIF }, |
|
5d51fff843eb
A "commit dump" of random changes I've made, as I probably won't be touching this code anymore.
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
1016 // { EXIFTAG_EXIFVERSION , "ExifVersion" , EXIF_IFD_EXIF }, |
|
24
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1017 { EXIFTAG_DATETIMEORIGINAL , "DateTimeOriginal" , EXIF_IFD_EXIF }, |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1018 { EXIFTAG_DATETIMEDIGITIZED , "DateTimeDigitized" , EXIF_IFD_EXIF }, |
|
34
5d51fff843eb
A "commit dump" of random changes I've made, as I probably won't be touching this code anymore.
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
1019 // { EXIFTAG_COMPONENTSCONFIGURATION , "ComponentsConfiguration" , EXIF_IFD_EXIF }, |
|
5d51fff843eb
A "commit dump" of random changes I've made, as I probably won't be touching this code anymore.
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
1020 // { EXIFTAG_COMPRESSEDBITSPERPIXEL , "ImageCompression" , EXIF_IFD_EXIF }, |
|
24
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1021 { EXIFTAG_SHUTTERSPEEDVALUE , "ShutterSpeed" , EXIF_IFD_EXIF }, |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1022 { EXIFTAG_APERTUREVALUE , "Aperture" , EXIF_IFD_EXIF }, |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1023 { EXIFTAG_BRIGHTNESSVALUE , "Brightness" , EXIF_IFD_EXIF }, |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1024 { EXIFTAG_EXPOSUREBIASVALUE , "ExposureBias" , EXIF_IFD_EXIF }, |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1025 { EXIFTAG_MAXAPERTUREVALUE , "MaxAperture" , EXIF_IFD_EXIF }, |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1026 { EXIFTAG_SUBJECTDISTANCE , "SubjectDistance" , EXIF_IFD_EXIF }, |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1027 |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1028 { EXIFTAG_METERINGMODE , "MeteringMode" , EXIF_IFD_EXIF }, |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1029 { EXIFTAG_LIGHTSOURCE , "Lightsource" , EXIF_IFD_EXIF }, |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1030 { EXIFTAG_FLASH , "Flash" , EXIF_IFD_EXIF }, |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1031 { EXIFTAG_FOCALLENGTH , "FocalLength" , EXIF_IFD_EXIF }, |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1032 { EXIFTAG_SUBJECTAREA , "SubjectArea" , EXIF_IFD_EXIF }, |
|
34
5d51fff843eb
A "commit dump" of random changes I've made, as I probably won't be touching this code anymore.
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
1033 // { EXIFTAG_MAKERNOTE , "MakerNote" , EXIF_IFD_EXIF }, |
|
24
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1034 { EXIFTAG_USERCOMMENT , "UserComment" , EXIF_IFD_EXIF }, |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1035 { EXIFTAG_SUBSECTIME , "SubSecTime" , EXIF_IFD_EXIF }, |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1036 { EXIFTAG_SUBSECTIMEORIGINAL , "SubSecTimeOriginal" , EXIF_IFD_EXIF }, |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1037 { EXIFTAG_SUBSECTIMEDIGITIZED , "SubSecTimeDigitized" , EXIF_IFD_EXIF }, |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1038 |
|
34
5d51fff843eb
A "commit dump" of random changes I've made, as I probably won't be touching this code anymore.
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
1039 // { EXIFTAG_FLASHPIXVERSION , "FlashpixVersion" , EXIF_IFD_EXIF }, |
|
24
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1040 { EXIFTAG_COLORSPACE , "Colorspace" , EXIF_IFD_EXIF }, |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1041 { EXIFTAG_PIXELXDIMENSION , "Validimage" , EXIF_IFD_EXIF }, |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1042 { EXIFTAG_PIXELYDIMENSION , "Validimage" , EXIF_IFD_EXIF }, |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1043 { EXIFTAG_RELATEDSOUNDFILE , "Relatedaudio" , EXIF_IFD_EXIF }, |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1044 { EXIFTAG_FLASHENERGY , "Flashenergy" , EXIF_IFD_EXIF }, |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1045 { EXIFTAG_SPATIALFREQUENCYRESPONSE , "SpatialFrequency" , EXIF_IFD_EXIF }, |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1046 { EXIFTAG_FOCALPLANEXRESOLUTION , "XResolution" , EXIF_IFD_EXIF }, |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1047 { EXIFTAG_FOCALPLANEYRESOLUTION , "YResolution" , EXIF_IFD_EXIF }, |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1048 { EXIFTAG_FOCALPLANERESOLUTIONUNIT , "ResolutionUnit" , EXIF_IFD_EXIF }, |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1049 { EXIFTAG_SUBJECTLOCATION , "SubjectLocation" , EXIF_IFD_EXIF }, |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1050 { EXIFTAG_EXPOSUREINDEX , "ExposureIndex" , EXIF_IFD_EXIF }, |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1051 { EXIFTAG_SENSINGMETHOD , "SensingMethod" , EXIF_IFD_EXIF }, |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1052 { EXIFTAG_FILESOURCE , "FileSource" , EXIF_IFD_EXIF }, |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1053 { EXIFTAG_SCENETYPE , "SceneType" , EXIF_IFD_EXIF }, |
|
34
5d51fff843eb
A "commit dump" of random changes I've made, as I probably won't be touching this code anymore.
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
1054 // { EXIFTAG_CFAPATTERN , "CFApattern" , EXIF_IFD_EXIF }, |
|
24
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1055 { EXIFTAG_CUSTOMRENDERED , "CustomRendered" , EXIF_IFD_EXIF }, |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1056 { EXIFTAG_EXPOSUREMODE , "ExposureMode" , EXIF_IFD_EXIF }, |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1057 { EXIFTAG_WHITEBALANCE , "WhiteBalance" , EXIF_IFD_EXIF }, |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1058 { EXIFTAG_DIGITALZOOMRATIO , "DigitalZoom" , EXIF_IFD_EXIF }, |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1059 { EXIFTAG_FOCALLENGTHIN35MMFILM , "FocalLength35mm" , EXIF_IFD_EXIF }, |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1060 { EXIFTAG_SCENECAPTURETYPE , "SceneCapture" , EXIF_IFD_EXIF }, |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1061 { EXIFTAG_GAINCONTROL , "GainControl" , EXIF_IFD_EXIF }, |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1062 { EXIFTAG_CONTRAST , "Contrast" , EXIF_IFD_EXIF }, |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1063 { EXIFTAG_SATURATION , "Saturation" , EXIF_IFD_EXIF }, |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1064 { EXIFTAG_SHARPNESS , "Sharpness" , EXIF_IFD_EXIF }, |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1065 { EXIFTAG_DEVICESETTINGDESCRIPTION , "DeviceSettings" , EXIF_IFD_EXIF }, |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1066 { EXIFTAG_SUBJECTDISTANCERANGE , "SubjectDistance" , EXIF_IFD_EXIF }, |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1067 { EXIFTAG_IMAGEUNIQUEID , "ImageUniqueID" , EXIF_IFD_EXIF }, |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1068 |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1069 { 0 , NULL , 0 }, |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1070 }; |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1071 |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1072 |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1073 static void tiff_tags_convert(TIFF *tif, const TIFFTagConvertInfo *table, |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1074 ExifMem *mem, ExifData *exif, int *added) |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1075 { |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1076 const TIFFTagConvertInfo *conv; |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1077 |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1078 for (conv = table; conv->tag != 0 && conv->name != NULL; conv++) |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1079 { |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1080 const TIFFField *tfd = TIFFFieldWithTag(tif, conv->tag); |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1081 TIFFDataType type = TIFFFieldDataType(tfd); |
|
30
6fec76de9a8d
Fix some EXIF conversion memory allocation handling.
Matti Hamalainen <ccr@tnsp.org>
parents:
29
diff
changeset
|
1082 int len = TIFFDataWidth(type), components; |
|
24
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1083 uint8_t tmp_buf[256], *data; |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1084 char *tmp_str; |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1085 int have; |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1086 |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1087 switch (type) |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1088 { |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1089 case TIFF_ASCII: |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1090 have = TIFFGetField(tif, conv->tag, &tmp_str) && tmp_str != NULL; |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1091 if (have) |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1092 { |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1093 data = (uint8_t *) tmp_str; |
|
30
6fec76de9a8d
Fix some EXIF conversion memory allocation handling.
Matti Hamalainen <ccr@tnsp.org>
parents:
29
diff
changeset
|
1094 components = strlen(tmp_str) + 1; |
|
24
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1095 } |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1096 break; |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1097 |
|
30
6fec76de9a8d
Fix some EXIF conversion memory allocation handling.
Matti Hamalainen <ccr@tnsp.org>
parents:
29
diff
changeset
|
1098 case TIFF_UNDEFINED: |
|
6fec76de9a8d
Fix some EXIF conversion memory allocation handling.
Matti Hamalainen <ccr@tnsp.org>
parents:
29
diff
changeset
|
1099 have = 0; |
|
6fec76de9a8d
Fix some EXIF conversion memory allocation handling.
Matti Hamalainen <ccr@tnsp.org>
parents:
29
diff
changeset
|
1100 break; |
|
6fec76de9a8d
Fix some EXIF conversion memory allocation handling.
Matti Hamalainen <ccr@tnsp.org>
parents:
29
diff
changeset
|
1101 |
|
24
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1102 default: |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1103 have = TIFFGetField(tif, conv->tag, &tmp_buf); |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1104 data = tmp_buf; |
|
30
6fec76de9a8d
Fix some EXIF conversion memory allocation handling.
Matti Hamalainen <ccr@tnsp.org>
parents:
29
diff
changeset
|
1105 components = 1; |
|
24
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1106 } |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1107 |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1108 if (have) |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1109 { |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1110 ExifEntry *entry = exif_entry_new_mem(mem); |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1111 if (entry == NULL) |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1112 return; |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1113 |
|
30
6fec76de9a8d
Fix some EXIF conversion memory allocation handling.
Matti Hamalainen <ccr@tnsp.org>
parents:
29
diff
changeset
|
1114 entry->data = exif_mem_alloc(mem, len * components); |
|
24
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1115 if (entry->data == NULL) |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1116 return; |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1117 |
|
30
6fec76de9a8d
Fix some EXIF conversion memory allocation handling.
Matti Hamalainen <ccr@tnsp.org>
parents:
29
diff
changeset
|
1118 memcpy(entry->data, data, len * components); |
|
24
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1119 entry->size = len; |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1120 entry->tag = conv->tag; |
|
30
6fec76de9a8d
Fix some EXIF conversion memory allocation handling.
Matti Hamalainen <ccr@tnsp.org>
parents:
29
diff
changeset
|
1121 entry->components = components; |
|
24
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1122 entry->format = type; |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1123 |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1124 exif_content_add_entry(exif->ifd[conv->ifd], entry); |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1125 (*added)++; |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1126 } |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1127 } |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1128 } |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1129 #endif |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1130 |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1131 |
|
34
5d51fff843eb
A "commit dump" of random changes I've made, as I probably won't be touching this code anymore.
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
1132 #ifdef TIFF_DEBUG |
|
5d51fff843eb
A "commit dump" of random changes I've made, as I probably won't be touching this code anymore.
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
1133 static void tiff_tags_dump(TIFF *tif, const TIFFTagConvertInfo *table) |
|
5d51fff843eb
A "commit dump" of random changes I've made, as I probably won't be touching this code anymore.
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
1134 { |
|
5d51fff843eb
A "commit dump" of random changes I've made, as I probably won't be touching this code anymore.
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
1135 const TIFFTagConvertInfo *conv; |
|
5d51fff843eb
A "commit dump" of random changes I've made, as I probably won't be touching this code anymore.
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
1136 |
|
5d51fff843eb
A "commit dump" of random changes I've made, as I probably won't be touching this code anymore.
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
1137 for (conv = table; conv->tag != 0 && conv->name != NULL; conv++) |
|
5d51fff843eb
A "commit dump" of random changes I've made, as I probably won't be touching this code anymore.
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
1138 { |
|
5d51fff843eb
A "commit dump" of random changes I've made, as I probably won't be touching this code anymore.
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
1139 const TIFFField *tfd = TIFFFieldWithTag(tif, conv->tag); |
|
5d51fff843eb
A "commit dump" of random changes I've made, as I probably won't be touching this code anymore.
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
1140 TIFFDataType type = TIFFFieldDataType(tfd); |
|
5d51fff843eb
A "commit dump" of random changes I've made, as I probably won't be touching this code anymore.
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
1141 uint16_t tmp_short; |
|
5d51fff843eb
A "commit dump" of random changes I've made, as I probably won't be touching this code anymore.
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
1142 float tmp_rat; |
|
5d51fff843eb
A "commit dump" of random changes I've made, as I probably won't be touching this code anymore.
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
1143 char *tmp_str, *name = "?"; |
|
5d51fff843eb
A "commit dump" of random changes I've made, as I probably won't be touching this code anymore.
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
1144 char tmp_buf[128] = "-"; |
|
5d51fff843eb
A "commit dump" of random changes I've made, as I probably won't be touching this code anymore.
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
1145 int have; |
|
5d51fff843eb
A "commit dump" of random changes I've made, as I probably won't be touching this code anymore.
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
1146 |
|
5d51fff843eb
A "commit dump" of random changes I've made, as I probably won't be touching this code anymore.
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
1147 switch (type) |
|
5d51fff843eb
A "commit dump" of random changes I've made, as I probably won't be touching this code anymore.
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
1148 { |
|
5d51fff843eb
A "commit dump" of random changes I've made, as I probably won't be touching this code anymore.
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
1149 case TIFF_SHORT: |
|
5d51fff843eb
A "commit dump" of random changes I've made, as I probably won't be touching this code anymore.
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
1150 name = "short"; |
|
5d51fff843eb
A "commit dump" of random changes I've made, as I probably won't be touching this code anymore.
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
1151 if ((have = TIFFGetField(tif, conv->tag, &tmp_short))) |
|
5d51fff843eb
A "commit dump" of random changes I've made, as I probably won't be touching this code anymore.
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
1152 snprintf(tmp_buf, sizeof(tmp_buf), "%d", tmp_short); |
|
5d51fff843eb
A "commit dump" of random changes I've made, as I probably won't be touching this code anymore.
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
1153 break; |
|
5d51fff843eb
A "commit dump" of random changes I've made, as I probably won't be touching this code anymore.
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
1154 case TIFF_RATIONAL: |
|
5d51fff843eb
A "commit dump" of random changes I've made, as I probably won't be touching this code anymore.
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
1155 name = "rational"; |
|
5d51fff843eb
A "commit dump" of random changes I've made, as I probably won't be touching this code anymore.
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
1156 if ((have = TIFFGetField(tif, conv->tag, &tmp_rat))) |
|
5d51fff843eb
A "commit dump" of random changes I've made, as I probably won't be touching this code anymore.
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
1157 snprintf(tmp_buf, sizeof(tmp_buf), "%1.2f", tmp_rat); |
|
5d51fff843eb
A "commit dump" of random changes I've made, as I probably won't be touching this code anymore.
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
1158 break; |
|
5d51fff843eb
A "commit dump" of random changes I've made, as I probably won't be touching this code anymore.
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
1159 case TIFF_ASCII: |
|
5d51fff843eb
A "commit dump" of random changes I've made, as I probably won't be touching this code anymore.
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
1160 name = "ascii"; |
|
5d51fff843eb
A "commit dump" of random changes I've made, as I probably won't be touching this code anymore.
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
1161 if ((have = (TIFFGetField(tif, conv->tag, &tmp_str) && tmp_str != NULL))) |
|
5d51fff843eb
A "commit dump" of random changes I've made, as I probably won't be touching this code anymore.
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
1162 snprintf(tmp_buf, sizeof(tmp_buf), "'%s'", tmp_str); |
|
5d51fff843eb
A "commit dump" of random changes I've made, as I probably won't be touching this code anymore.
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
1163 break; |
|
5d51fff843eb
A "commit dump" of random changes I've made, as I probably won't be touching this code anymore.
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
1164 |
|
5d51fff843eb
A "commit dump" of random changes I've made, as I probably won't be touching this code anymore.
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
1165 default: |
|
5d51fff843eb
A "commit dump" of random changes I've made, as I probably won't be touching this code anymore.
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
1166 have = 0; |
|
5d51fff843eb
A "commit dump" of random changes I've made, as I probably won't be touching this code anymore.
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
1167 } |
|
5d51fff843eb
A "commit dump" of random changes I've made, as I probably won't be touching this code anymore.
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
1168 if (have) |
|
5d51fff843eb
A "commit dump" of random changes I've made, as I probably won't be touching this code anymore.
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
1169 printf("%-20s [%-10s]: %s\n", conv->name, name, tmp_buf); |
|
5d51fff843eb
A "commit dump" of random changes I've made, as I probably won't be touching this code anymore.
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
1170 } |
|
5d51fff843eb
A "commit dump" of random changes I've made, as I probably won't be touching this code anymore.
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
1171 } |
|
5d51fff843eb
A "commit dump" of random changes I've made, as I probably won't be touching this code anymore.
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
1172 #endif |
|
5d51fff843eb
A "commit dump" of random changes I've made, as I probably won't be touching this code anymore.
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
1173 |
|
5d51fff843eb
A "commit dump" of random changes I've made, as I probably won't be touching this code anymore.
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
1174 |
|
22
69089d946a14
Set a dummy libtiff warning handler to silence useless warnings about
Matti Hamalainen <ccr@tnsp.org>
parents:
19
diff
changeset
|
1175 void tiff_warning_handler(const char *module, const char *fmt, va_list ap) |
|
69089d946a14
Set a dummy libtiff warning handler to silence useless warnings about
Matti Hamalainen <ccr@tnsp.org>
parents:
19
diff
changeset
|
1176 { |
|
69089d946a14
Set a dummy libtiff warning handler to silence useless warnings about
Matti Hamalainen <ccr@tnsp.org>
parents:
19
diff
changeset
|
1177 (void) module; |
|
69089d946a14
Set a dummy libtiff warning handler to silence useless warnings about
Matti Hamalainen <ccr@tnsp.org>
parents:
19
diff
changeset
|
1178 (void) fmt; |
|
69089d946a14
Set a dummy libtiff warning handler to silence useless warnings about
Matti Hamalainen <ccr@tnsp.org>
parents:
19
diff
changeset
|
1179 (void) ap; |
|
69089d946a14
Set a dummy libtiff warning handler to silence useless warnings about
Matti Hamalainen <ccr@tnsp.org>
parents:
19
diff
changeset
|
1180 // ignore errors and warnings |
|
69089d946a14
Set a dummy libtiff warning handler to silence useless warnings about
Matti Hamalainen <ccr@tnsp.org>
parents:
19
diff
changeset
|
1181 } |
|
69089d946a14
Set a dummy libtiff warning handler to silence useless warnings about
Matti Hamalainen <ccr@tnsp.org>
parents:
19
diff
changeset
|
1182 |
|
69089d946a14
Set a dummy libtiff warning handler to silence useless warnings about
Matti Hamalainen <ccr@tnsp.org>
parents:
19
diff
changeset
|
1183 |
|
4
bbd61622856a
Initial implementation of TIFF format read support via libtiff.
Matti Hamalainen <ccr@tnsp.org>
parents:
3
diff
changeset
|
1184 Image *read_tiff(BPGMetaData **pmd, const char *filename, |
|
bbd61622856a
Initial implementation of TIFF format read support via libtiff.
Matti Hamalainen <ccr@tnsp.org>
parents:
3
diff
changeset
|
1185 BPGColorSpaceEnum color_space, int out_bit_depth, |
|
bbd61622856a
Initial implementation of TIFF format read support via libtiff.
Matti Hamalainen <ccr@tnsp.org>
parents:
3
diff
changeset
|
1186 int limited_range, int premultiplied_alpha) |
|
bbd61622856a
Initial implementation of TIFF format read support via libtiff.
Matti Hamalainen <ccr@tnsp.org>
parents:
3
diff
changeset
|
1187 { |
|
bbd61622856a
Initial implementation of TIFF format read support via libtiff.
Matti Hamalainen <ccr@tnsp.org>
parents:
3
diff
changeset
|
1188 TIFF *tif; |
|
bbd61622856a
Initial implementation of TIFF format read support via libtiff.
Matti Hamalainen <ccr@tnsp.org>
parents:
3
diff
changeset
|
1189 Image *img = NULL; |
|
bbd61622856a
Initial implementation of TIFF format read support via libtiff.
Matti Hamalainen <ccr@tnsp.org>
parents:
3
diff
changeset
|
1190 BPGImageFormatEnum img_format; |
|
9
bfd933ef38b4
Implement some metadata support in TIFF and clean up meta data handling otherwise.
Matti Hamalainen <ccr@tnsp.org>
parents:
8
diff
changeset
|
1191 uint8_t *buf = NULL, *tmp_buf = NULL; |
|
bfd933ef38b4
Implement some metadata support in TIFF and clean up meta data handling otherwise.
Matti Hamalainen <ccr@tnsp.org>
parents:
8
diff
changeset
|
1192 uint32_t img_width, img_height, tmp_len; |
|
11
e70eb0e6acd5
Add support for indexed palette TIFFs, at least some of them.
Matti Hamalainen <ccr@tnsp.org>
parents:
10
diff
changeset
|
1193 uint16_t img_depth, img_spp, img_pconfig, img_pmetric, |
|
e70eb0e6acd5
Add support for indexed palette TIFFs, at least some of them.
Matti Hamalainen <ccr@tnsp.org>
parents:
10
diff
changeset
|
1194 *buf2 = NULL, *img_colormap_r, *img_colormap_g, *img_colormap_b; |
|
14
b0b1d299aa5d
Don't use C99 style declarations here for no reason.
Matti Hamalainen <ccr@tnsp.org>
parents:
13
diff
changeset
|
1195 int img_alpha, err_spp, offs, x, y, idx; |
|
b0b1d299aa5d
Don't use C99 style declarations here for no reason.
Matti Hamalainen <ccr@tnsp.org>
parents:
13
diff
changeset
|
1196 size_t img_linesize; |
|
4
bbd61622856a
Initial implementation of TIFF format read support via libtiff.
Matti Hamalainen <ccr@tnsp.org>
parents:
3
diff
changeset
|
1197 ColorConvertState cvt; |
|
bbd61622856a
Initial implementation of TIFF format read support via libtiff.
Matti Hamalainen <ccr@tnsp.org>
parents:
3
diff
changeset
|
1198 RGBConvertFunc *convert_func; |
|
27
4aa0611ad85a
Some adjustments to EXIF support in TIFF input.
Matti Hamalainen <ccr@tnsp.org>
parents:
26
diff
changeset
|
1199 #ifdef HAVE_LIBEXIF |
|
4aa0611ad85a
Some adjustments to EXIF support in TIFF input.
Matti Hamalainen <ccr@tnsp.org>
parents:
26
diff
changeset
|
1200 toff_t tmp_offs; |
|
4aa0611ad85a
Some adjustments to EXIF support in TIFF input.
Matti Hamalainen <ccr@tnsp.org>
parents:
26
diff
changeset
|
1201 ExifMem *exif_mem = NULL; |
|
4aa0611ad85a
Some adjustments to EXIF support in TIFF input.
Matti Hamalainen <ccr@tnsp.org>
parents:
26
diff
changeset
|
1202 ExifData *exif = NULL; |
|
30
6fec76de9a8d
Fix some EXIF conversion memory allocation handling.
Matti Hamalainen <ccr@tnsp.org>
parents:
29
diff
changeset
|
1203 int added = 0; |
|
27
4aa0611ad85a
Some adjustments to EXIF support in TIFF input.
Matti Hamalainen <ccr@tnsp.org>
parents:
26
diff
changeset
|
1204 #endif |
|
4
bbd61622856a
Initial implementation of TIFF format read support via libtiff.
Matti Hamalainen <ccr@tnsp.org>
parents:
3
diff
changeset
|
1205 |
|
22
69089d946a14
Set a dummy libtiff warning handler to silence useless warnings about
Matti Hamalainen <ccr@tnsp.org>
parents:
19
diff
changeset
|
1206 // Set warning handler to silence dubious warnings about unknown fields |
|
69089d946a14
Set a dummy libtiff warning handler to silence useless warnings about
Matti Hamalainen <ccr@tnsp.org>
parents:
19
diff
changeset
|
1207 TIFFSetWarningHandler(tiff_warning_handler); |
|
69089d946a14
Set a dummy libtiff warning handler to silence useless warnings about
Matti Hamalainen <ccr@tnsp.org>
parents:
19
diff
changeset
|
1208 |
|
4
bbd61622856a
Initial implementation of TIFF format read support via libtiff.
Matti Hamalainen <ccr@tnsp.org>
parents:
3
diff
changeset
|
1209 // Open and read TIFF header etc. |
|
bbd61622856a
Initial implementation of TIFF format read support via libtiff.
Matti Hamalainen <ccr@tnsp.org>
parents:
3
diff
changeset
|
1210 if ((tif = TIFFOpen(filename, "rb")) == NULL) |
| 7 | 1211 { |
| 1212 fprintf(stderr, "Could not open TIFF image '%s'\n", filename); | |
|
4
bbd61622856a
Initial implementation of TIFF format read support via libtiff.
Matti Hamalainen <ccr@tnsp.org>
parents:
3
diff
changeset
|
1213 return NULL; |
| 7 | 1214 } |
|
4
bbd61622856a
Initial implementation of TIFF format read support via libtiff.
Matti Hamalainen <ccr@tnsp.org>
parents:
3
diff
changeset
|
1215 |
| 7 | 1216 if (!TIFFGetField(tif, TIFFTAG_IMAGEWIDTH, &img_width) || |
| 1217 !TIFFGetField(tif, TIFFTAG_IMAGELENGTH, &img_height) || | |
| 1218 !TIFFGetField(tif, TIFFTAG_SAMPLESPERPIXEL, &img_spp) || | |
| 1219 !TIFFGetField(tif, TIFFTAG_BITSPERSAMPLE, &img_depth)) | |
| 1220 { | |
| 25 | 1221 fprintf(stderr, "TIFF file '%s' lacks basic fields!\n", filename); |
| 7 | 1222 goto err; |
| 1223 } | |
| 1224 | |
|
4
bbd61622856a
Initial implementation of TIFF format read support via libtiff.
Matti Hamalainen <ccr@tnsp.org>
parents:
3
diff
changeset
|
1225 TIFFGetField(tif, TIFFTAG_PLANARCONFIG, &img_pconfig); |
|
10
d04d9e3a77d0
Add checking TIFF photometric interpretation tag data.
Matti Hamalainen <ccr@tnsp.org>
parents:
9
diff
changeset
|
1226 TIFFGetField(tif, TIFFTAG_PHOTOMETRIC, &img_pmetric); |
|
4
bbd61622856a
Initial implementation of TIFF format read support via libtiff.
Matti Hamalainen <ccr@tnsp.org>
parents:
3
diff
changeset
|
1227 |
|
bbd61622856a
Initial implementation of TIFF format read support via libtiff.
Matti Hamalainen <ccr@tnsp.org>
parents:
3
diff
changeset
|
1228 // Check basics |
|
14
b0b1d299aa5d
Don't use C99 style declarations here for no reason.
Matti Hamalainen <ccr@tnsp.org>
parents:
13
diff
changeset
|
1229 err_spp = 0; |
|
10
d04d9e3a77d0
Add checking TIFF photometric interpretation tag data.
Matti Hamalainen <ccr@tnsp.org>
parents:
9
diff
changeset
|
1230 switch (img_pmetric) |
|
d04d9e3a77d0
Add checking TIFF photometric interpretation tag data.
Matti Hamalainen <ccr@tnsp.org>
parents:
9
diff
changeset
|
1231 { |
|
12
9b00d4206f99
Implement support for one type of grayscale TIFF.
Matti Hamalainen <ccr@tnsp.org>
parents:
11
diff
changeset
|
1232 case PHOTOMETRIC_MINISBLACK: |
|
34
5d51fff843eb
A "commit dump" of random changes I've made, as I probably won't be touching this code anymore.
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
1233 case PHOTOMETRIC_MINISWHITE: |
|
12
9b00d4206f99
Implement support for one type of grayscale TIFF.
Matti Hamalainen <ccr@tnsp.org>
parents:
11
diff
changeset
|
1234 img_format = BPG_FORMAT_GRAY; |
|
9b00d4206f99
Implement support for one type of grayscale TIFF.
Matti Hamalainen <ccr@tnsp.org>
parents:
11
diff
changeset
|
1235 color_space = BPG_CS_YCbCr; |
|
9b00d4206f99
Implement support for one type of grayscale TIFF.
Matti Hamalainen <ccr@tnsp.org>
parents:
11
diff
changeset
|
1236 if (img_spp != 1) |
|
9b00d4206f99
Implement support for one type of grayscale TIFF.
Matti Hamalainen <ccr@tnsp.org>
parents:
11
diff
changeset
|
1237 err_spp = 1; |
|
9b00d4206f99
Implement support for one type of grayscale TIFF.
Matti Hamalainen <ccr@tnsp.org>
parents:
11
diff
changeset
|
1238 break; |
|
9b00d4206f99
Implement support for one type of grayscale TIFF.
Matti Hamalainen <ccr@tnsp.org>
parents:
11
diff
changeset
|
1239 |
|
10
d04d9e3a77d0
Add checking TIFF photometric interpretation tag data.
Matti Hamalainen <ccr@tnsp.org>
parents:
9
diff
changeset
|
1240 case PHOTOMETRIC_RGB: |
|
d04d9e3a77d0
Add checking TIFF photometric interpretation tag data.
Matti Hamalainen <ccr@tnsp.org>
parents:
9
diff
changeset
|
1241 img_format = BPG_FORMAT_444; |
|
d04d9e3a77d0
Add checking TIFF photometric interpretation tag data.
Matti Hamalainen <ccr@tnsp.org>
parents:
9
diff
changeset
|
1242 if (img_spp < 3) |
|
d04d9e3a77d0
Add checking TIFF photometric interpretation tag data.
Matti Hamalainen <ccr@tnsp.org>
parents:
9
diff
changeset
|
1243 err_spp = 1; |
|
d04d9e3a77d0
Add checking TIFF photometric interpretation tag data.
Matti Hamalainen <ccr@tnsp.org>
parents:
9
diff
changeset
|
1244 break; |
|
d04d9e3a77d0
Add checking TIFF photometric interpretation tag data.
Matti Hamalainen <ccr@tnsp.org>
parents:
9
diff
changeset
|
1245 |
|
11
e70eb0e6acd5
Add support for indexed palette TIFFs, at least some of them.
Matti Hamalainen <ccr@tnsp.org>
parents:
10
diff
changeset
|
1246 case PHOTOMETRIC_PALETTE: |
|
e70eb0e6acd5
Add support for indexed palette TIFFs, at least some of them.
Matti Hamalainen <ccr@tnsp.org>
parents:
10
diff
changeset
|
1247 img_format = BPG_FORMAT_444; |
|
e70eb0e6acd5
Add support for indexed palette TIFFs, at least some of them.
Matti Hamalainen <ccr@tnsp.org>
parents:
10
diff
changeset
|
1248 if (img_spp != 1) |
|
e70eb0e6acd5
Add support for indexed palette TIFFs, at least some of them.
Matti Hamalainen <ccr@tnsp.org>
parents:
10
diff
changeset
|
1249 err_spp = 1; |
|
e70eb0e6acd5
Add support for indexed palette TIFFs, at least some of them.
Matti Hamalainen <ccr@tnsp.org>
parents:
10
diff
changeset
|
1250 |
|
e70eb0e6acd5
Add support for indexed palette TIFFs, at least some of them.
Matti Hamalainen <ccr@tnsp.org>
parents:
10
diff
changeset
|
1251 if (!TIFFGetField(tif, TIFFTAG_COLORMAP, &img_colormap_r, &img_colormap_g, &img_colormap_b)) |
|
e70eb0e6acd5
Add support for indexed palette TIFFs, at least some of them.
Matti Hamalainen <ccr@tnsp.org>
parents:
10
diff
changeset
|
1252 { |
|
e70eb0e6acd5
Add support for indexed palette TIFFs, at least some of them.
Matti Hamalainen <ccr@tnsp.org>
parents:
10
diff
changeset
|
1253 fprintf(stderr, "TIFF with palette is missing colormap entry!\n"); |
|
e70eb0e6acd5
Add support for indexed palette TIFFs, at least some of them.
Matti Hamalainen <ccr@tnsp.org>
parents:
10
diff
changeset
|
1254 goto err; |
|
e70eb0e6acd5
Add support for indexed palette TIFFs, at least some of them.
Matti Hamalainen <ccr@tnsp.org>
parents:
10
diff
changeset
|
1255 } |
|
e70eb0e6acd5
Add support for indexed palette TIFFs, at least some of them.
Matti Hamalainen <ccr@tnsp.org>
parents:
10
diff
changeset
|
1256 break; |
|
e70eb0e6acd5
Add support for indexed palette TIFFs, at least some of them.
Matti Hamalainen <ccr@tnsp.org>
parents:
10
diff
changeset
|
1257 |
|
10
d04d9e3a77d0
Add checking TIFF photometric interpretation tag data.
Matti Hamalainen <ccr@tnsp.org>
parents:
9
diff
changeset
|
1258 default: |
|
d04d9e3a77d0
Add checking TIFF photometric interpretation tag data.
Matti Hamalainen <ccr@tnsp.org>
parents:
9
diff
changeset
|
1259 fprintf(stderr, "TIFF file has unsupported photometric interpretation %d!\n", img_pmetric); |
|
d04d9e3a77d0
Add checking TIFF photometric interpretation tag data.
Matti Hamalainen <ccr@tnsp.org>
parents:
9
diff
changeset
|
1260 goto err; |
|
d04d9e3a77d0
Add checking TIFF photometric interpretation tag data.
Matti Hamalainen <ccr@tnsp.org>
parents:
9
diff
changeset
|
1261 } |
|
d04d9e3a77d0
Add checking TIFF photometric interpretation tag data.
Matti Hamalainen <ccr@tnsp.org>
parents:
9
diff
changeset
|
1262 |
|
d04d9e3a77d0
Add checking TIFF photometric interpretation tag data.
Matti Hamalainen <ccr@tnsp.org>
parents:
9
diff
changeset
|
1263 if (err_spp) |
|
d04d9e3a77d0
Add checking TIFF photometric interpretation tag data.
Matti Hamalainen <ccr@tnsp.org>
parents:
9
diff
changeset
|
1264 { |
|
d04d9e3a77d0
Add checking TIFF photometric interpretation tag data.
Matti Hamalainen <ccr@tnsp.org>
parents:
9
diff
changeset
|
1265 fprintf(stderr, "TIFF file has unsupported samples per pixel %d for format %d.\n", img_spp, img_pmetric); |
|
d04d9e3a77d0
Add checking TIFF photometric interpretation tag data.
Matti Hamalainen <ccr@tnsp.org>
parents:
9
diff
changeset
|
1266 goto err; |
|
d04d9e3a77d0
Add checking TIFF photometric interpretation tag data.
Matti Hamalainen <ccr@tnsp.org>
parents:
9
diff
changeset
|
1267 } |
|
d04d9e3a77d0
Add checking TIFF photometric interpretation tag data.
Matti Hamalainen <ccr@tnsp.org>
parents:
9
diff
changeset
|
1268 |
|
d04d9e3a77d0
Add checking TIFF photometric interpretation tag data.
Matti Hamalainen <ccr@tnsp.org>
parents:
9
diff
changeset
|
1269 if (img_depth != 8 && img_depth != 16) |
|
d04d9e3a77d0
Add checking TIFF photometric interpretation tag data.
Matti Hamalainen <ccr@tnsp.org>
parents:
9
diff
changeset
|
1270 { |
|
d04d9e3a77d0
Add checking TIFF photometric interpretation tag data.
Matti Hamalainen <ccr@tnsp.org>
parents:
9
diff
changeset
|
1271 fprintf(stderr, "TIFF file has unsupported depth %d (not 8 or 16)!\n", img_depth); |
|
4
bbd61622856a
Initial implementation of TIFF format read support via libtiff.
Matti Hamalainen <ccr@tnsp.org>
parents:
3
diff
changeset
|
1272 goto err; |
|
10
d04d9e3a77d0
Add checking TIFF photometric interpretation tag data.
Matti Hamalainen <ccr@tnsp.org>
parents:
9
diff
changeset
|
1273 } |
|
4
bbd61622856a
Initial implementation of TIFF format read support via libtiff.
Matti Hamalainen <ccr@tnsp.org>
parents:
3
diff
changeset
|
1274 |
|
bbd61622856a
Initial implementation of TIFF format read support via libtiff.
Matti Hamalainen <ccr@tnsp.org>
parents:
3
diff
changeset
|
1275 img_linesize = TIFFScanlineSize(tif); |
|
bbd61622856a
Initial implementation of TIFF format read support via libtiff.
Matti Hamalainen <ccr@tnsp.org>
parents:
3
diff
changeset
|
1276 |
|
34
5d51fff843eb
A "commit dump" of random changes I've made, as I probably won't be touching this code anymore.
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
1277 #ifdef TIFF_DEBUG |
|
5d51fff843eb
A "commit dump" of random changes I've made, as I probably won't be touching this code anymore.
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
1278 int img_bpp = sizeof(uint32_t) * img_depth / 8; |
|
5d51fff843eb
A "commit dump" of random changes I've made, as I probably won't be touching this code anymore.
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
1279 printf( |
|
5d51fff843eb
A "commit dump" of random changes I've made, as I probably won't be touching this code anymore.
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
1280 "\nTIFF '%s'\n" |
|
5d51fff843eb
A "commit dump" of random changes I've made, as I probably won't be touching this code anymore.
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
1281 " %d x %d, spp=%d, bpp=%d, depth=%d, pmet=%d\n" |
|
5d51fff843eb
A "commit dump" of random changes I've made, as I probably won't be touching this code anymore.
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
1282 " pconfig=%d, line_size=%d, cbps=%d\n", |
|
5d51fff843eb
A "commit dump" of random changes I've made, as I probably won't be touching this code anymore.
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
1283 filename, |
|
5d51fff843eb
A "commit dump" of random changes I've made, as I probably won't be touching this code anymore.
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
1284 img_width, img_height, img_spp, img_bpp, img_depth, img_pmetric, |
|
5d51fff843eb
A "commit dump" of random changes I've made, as I probably won't be touching this code anymore.
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
1285 img_pconfig, img_linesize, img_width * img_bpp); |
|
5d51fff843eb
A "commit dump" of random changes I've made, as I probably won't be touching this code anymore.
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
1286 #endif |
|
5d51fff843eb
A "commit dump" of random changes I've made, as I probably won't be touching this code anymore.
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
1287 |
|
4
bbd61622856a
Initial implementation of TIFF format read support via libtiff.
Matti Hamalainen <ccr@tnsp.org>
parents:
3
diff
changeset
|
1288 if (img_spp > 3) |
|
bbd61622856a
Initial implementation of TIFF format read support via libtiff.
Matti Hamalainen <ccr@tnsp.org>
parents:
3
diff
changeset
|
1289 { |
|
bbd61622856a
Initial implementation of TIFF format read support via libtiff.
Matti Hamalainen <ccr@tnsp.org>
parents:
3
diff
changeset
|
1290 uint16_t img_esmp, *img_esmp_types; |
|
bbd61622856a
Initial implementation of TIFF format read support via libtiff.
Matti Hamalainen <ccr@tnsp.org>
parents:
3
diff
changeset
|
1291 |
|
bbd61622856a
Initial implementation of TIFF format read support via libtiff.
Matti Hamalainen <ccr@tnsp.org>
parents:
3
diff
changeset
|
1292 TIFFGetField(tif, TIFFTAG_EXTRASAMPLES, &img_esmp, &img_esmp_types); |
|
6
690bf78c1ce9
Initial implementation of alpha channel support for TIFF images.
Matti Hamalainen <ccr@tnsp.org>
parents:
5
diff
changeset
|
1293 img_alpha = img_esmp == 1 && img_esmp_types[0] == EXTRASAMPLE_ASSOCALPHA; |
|
34
5d51fff843eb
A "commit dump" of random changes I've made, as I probably won't be touching this code anymore.
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
1294 #ifdef TIFF_DEBUG |
|
5d51fff843eb
A "commit dump" of random changes I've made, as I probably won't be touching this code anymore.
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
1295 printf(" esmp=%d: ", img_esmp); |
|
5d51fff843eb
A "commit dump" of random changes I've made, as I probably won't be touching this code anymore.
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
1296 for (int n = 0; n < img_esmp; n++) |
|
5d51fff843eb
A "commit dump" of random changes I've made, as I probably won't be touching this code anymore.
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
1297 printf("#%d=%d%s", n + 1, img_esmp_types[n], (n < img_esmp - 1) ? ", " : ""); |
|
5d51fff843eb
A "commit dump" of random changes I've made, as I probably won't be touching this code anymore.
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
1298 printf("\n"); |
|
5d51fff843eb
A "commit dump" of random changes I've made, as I probably won't be touching this code anymore.
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
1299 #endif |
|
4
bbd61622856a
Initial implementation of TIFF format read support via libtiff.
Matti Hamalainen <ccr@tnsp.org>
parents:
3
diff
changeset
|
1300 } |
|
bbd61622856a
Initial implementation of TIFF format read support via libtiff.
Matti Hamalainen <ccr@tnsp.org>
parents:
3
diff
changeset
|
1301 else |
|
bbd61622856a
Initial implementation of TIFF format read support via libtiff.
Matti Hamalainen <ccr@tnsp.org>
parents:
3
diff
changeset
|
1302 img_alpha = 0; |
|
bbd61622856a
Initial implementation of TIFF format read support via libtiff.
Matti Hamalainen <ccr@tnsp.org>
parents:
3
diff
changeset
|
1303 |
|
34
5d51fff843eb
A "commit dump" of random changes I've made, as I probably won't be touching this code anymore.
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
1304 #ifdef TIFF_DEBUG |
|
5d51fff843eb
A "commit dump" of random changes I've made, as I probably won't be touching this code anymore.
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
1305 printf(" alpha: %s\n\n", img_alpha ? "yes" : "no"); |
|
5d51fff843eb
A "commit dump" of random changes I've made, as I probably won't be touching this code anymore.
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
1306 #endif |
|
5d51fff843eb
A "commit dump" of random changes I've made, as I probably won't be touching this code anymore.
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
1307 |
|
4
bbd61622856a
Initial implementation of TIFF format read support via libtiff.
Matti Hamalainen <ccr@tnsp.org>
parents:
3
diff
changeset
|
1308 // Allocate temporary image space |
|
bbd61622856a
Initial implementation of TIFF format read support via libtiff.
Matti Hamalainen <ccr@tnsp.org>
parents:
3
diff
changeset
|
1309 buf = (uint8_t *) _TIFFmalloc(img_linesize * img_spp); |
|
bbd61622856a
Initial implementation of TIFF format read support via libtiff.
Matti Hamalainen <ccr@tnsp.org>
parents:
3
diff
changeset
|
1310 if (buf == NULL) |
|
bbd61622856a
Initial implementation of TIFF format read support via libtiff.
Matti Hamalainen <ccr@tnsp.org>
parents:
3
diff
changeset
|
1311 goto err; |
|
bbd61622856a
Initial implementation of TIFF format read support via libtiff.
Matti Hamalainen <ccr@tnsp.org>
parents:
3
diff
changeset
|
1312 |
|
11
e70eb0e6acd5
Add support for indexed palette TIFFs, at least some of them.
Matti Hamalainen <ccr@tnsp.org>
parents:
10
diff
changeset
|
1313 if (img_pmetric == PHOTOMETRIC_PALETTE) |
|
e70eb0e6acd5
Add support for indexed palette TIFFs, at least some of them.
Matti Hamalainen <ccr@tnsp.org>
parents:
10
diff
changeset
|
1314 { |
|
e70eb0e6acd5
Add support for indexed palette TIFFs, at least some of them.
Matti Hamalainen <ccr@tnsp.org>
parents:
10
diff
changeset
|
1315 // For indexed palette images we need a secondary RGB conversion buffer |
|
e70eb0e6acd5
Add support for indexed palette TIFFs, at least some of them.
Matti Hamalainen <ccr@tnsp.org>
parents:
10
diff
changeset
|
1316 buf2 = (uint16_t *) malloc(img_width * 3 * sizeof(uint16_t)); |
|
e70eb0e6acd5
Add support for indexed palette TIFFs, at least some of them.
Matti Hamalainen <ccr@tnsp.org>
parents:
10
diff
changeset
|
1317 if (buf2 == NULL) |
|
e70eb0e6acd5
Add support for indexed palette TIFFs, at least some of them.
Matti Hamalainen <ccr@tnsp.org>
parents:
10
diff
changeset
|
1318 goto err; |
|
e70eb0e6acd5
Add support for indexed palette TIFFs, at least some of them.
Matti Hamalainen <ccr@tnsp.org>
parents:
10
diff
changeset
|
1319 |
|
e70eb0e6acd5
Add support for indexed palette TIFFs, at least some of them.
Matti Hamalainen <ccr@tnsp.org>
parents:
10
diff
changeset
|
1320 // Force 16bit depth and samples per pixel 3 as the |
|
e70eb0e6acd5
Add support for indexed palette TIFFs, at least some of them.
Matti Hamalainen <ccr@tnsp.org>
parents:
10
diff
changeset
|
1321 // TIFF colormap/palette has 16bit R, G, B entries. |
|
e70eb0e6acd5
Add support for indexed palette TIFFs, at least some of them.
Matti Hamalainen <ccr@tnsp.org>
parents:
10
diff
changeset
|
1322 img_spp = 3; |
|
e70eb0e6acd5
Add support for indexed palette TIFFs, at least some of them.
Matti Hamalainen <ccr@tnsp.org>
parents:
10
diff
changeset
|
1323 img_depth = 16; |
|
e70eb0e6acd5
Add support for indexed palette TIFFs, at least some of them.
Matti Hamalainen <ccr@tnsp.org>
parents:
10
diff
changeset
|
1324 } |
|
e70eb0e6acd5
Add support for indexed palette TIFFs, at least some of them.
Matti Hamalainen <ccr@tnsp.org>
parents:
10
diff
changeset
|
1325 |
|
4
bbd61622856a
Initial implementation of TIFF format read support via libtiff.
Matti Hamalainen <ccr@tnsp.org>
parents:
3
diff
changeset
|
1326 // Allocate target image |
|
bbd61622856a
Initial implementation of TIFF format read support via libtiff.
Matti Hamalainen <ccr@tnsp.org>
parents:
3
diff
changeset
|
1327 img = image_alloc(img_width, img_height, img_format, img_alpha, color_space, out_bit_depth); |
|
bbd61622856a
Initial implementation of TIFF format read support via libtiff.
Matti Hamalainen <ccr@tnsp.org>
parents:
3
diff
changeset
|
1328 if (img == NULL) |
|
bbd61622856a
Initial implementation of TIFF format read support via libtiff.
Matti Hamalainen <ccr@tnsp.org>
parents:
3
diff
changeset
|
1329 goto err; |
|
bbd61622856a
Initial implementation of TIFF format read support via libtiff.
Matti Hamalainen <ccr@tnsp.org>
parents:
3
diff
changeset
|
1330 |
|
bbd61622856a
Initial implementation of TIFF format read support via libtiff.
Matti Hamalainen <ccr@tnsp.org>
parents:
3
diff
changeset
|
1331 img->limited_range = limited_range; |
|
bbd61622856a
Initial implementation of TIFF format read support via libtiff.
Matti Hamalainen <ccr@tnsp.org>
parents:
3
diff
changeset
|
1332 img->premultiplied_alpha = premultiplied_alpha; |
|
bbd61622856a
Initial implementation of TIFF format read support via libtiff.
Matti Hamalainen <ccr@tnsp.org>
parents:
3
diff
changeset
|
1333 |
|
bbd61622856a
Initial implementation of TIFF format read support via libtiff.
Matti Hamalainen <ccr@tnsp.org>
parents:
3
diff
changeset
|
1334 convert_init(&cvt, img_depth, out_bit_depth, color_space, limited_range); |
|
bbd61622856a
Initial implementation of TIFF format read support via libtiff.
Matti Hamalainen <ccr@tnsp.org>
parents:
3
diff
changeset
|
1335 |
|
14
b0b1d299aa5d
Don't use C99 style declarations here for no reason.
Matti Hamalainen <ccr@tnsp.org>
parents:
13
diff
changeset
|
1336 idx = img_depth == 16; |
|
4
bbd61622856a
Initial implementation of TIFF format read support via libtiff.
Matti Hamalainen <ccr@tnsp.org>
parents:
3
diff
changeset
|
1337 convert_func = rgb_to_cs[idx][color_space]; |
|
bbd61622856a
Initial implementation of TIFF format read support via libtiff.
Matti Hamalainen <ccr@tnsp.org>
parents:
3
diff
changeset
|
1338 |
|
14
b0b1d299aa5d
Don't use C99 style declarations here for no reason.
Matti Hamalainen <ccr@tnsp.org>
parents:
13
diff
changeset
|
1339 for (y = 0; y < img->h; y++) |
|
4
bbd61622856a
Initial implementation of TIFF format read support via libtiff.
Matti Hamalainen <ccr@tnsp.org>
parents:
3
diff
changeset
|
1340 { |
|
bbd61622856a
Initial implementation of TIFF format read support via libtiff.
Matti Hamalainen <ccr@tnsp.org>
parents:
3
diff
changeset
|
1341 // Read TIFF image to raster |
|
34
5d51fff843eb
A "commit dump" of random changes I've made, as I probably won't be touching this code anymore.
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
1342 /* |
|
5d51fff843eb
A "commit dump" of random changes I've made, as I probably won't be touching this code anymore.
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
1343 for (int n = 0; n < img_spp; n++) |
|
5d51fff843eb
A "commit dump" of random changes I've made, as I probably won't be touching this code anymore.
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
1344 if (!TIFFReadScanline(tif, buf + (img_linesize * n), y, n)) |
|
5d51fff843eb
A "commit dump" of random changes I've made, as I probably won't be touching this code anymore.
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
1345 goto err; |
|
5d51fff843eb
A "commit dump" of random changes I've made, as I probably won't be touching this code anymore.
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
1346 */ |
|
4
bbd61622856a
Initial implementation of TIFF format read support via libtiff.
Matti Hamalainen <ccr@tnsp.org>
parents:
3
diff
changeset
|
1347 if (!TIFFReadScanline(tif, buf, y, 0)) |
|
bbd61622856a
Initial implementation of TIFF format read support via libtiff.
Matti Hamalainen <ccr@tnsp.org>
parents:
3
diff
changeset
|
1348 goto err; |
|
bbd61622856a
Initial implementation of TIFF format read support via libtiff.
Matti Hamalainen <ccr@tnsp.org>
parents:
3
diff
changeset
|
1349 |
|
11
e70eb0e6acd5
Add support for indexed palette TIFFs, at least some of them.
Matti Hamalainen <ccr@tnsp.org>
parents:
10
diff
changeset
|
1350 // Convert the scanline data |
|
e70eb0e6acd5
Add support for indexed palette TIFFs, at least some of them.
Matti Hamalainen <ccr@tnsp.org>
parents:
10
diff
changeset
|
1351 switch (img_pmetric) |
|
6
690bf78c1ce9
Initial implementation of alpha channel support for TIFF images.
Matti Hamalainen <ccr@tnsp.org>
parents:
5
diff
changeset
|
1352 { |
|
11
e70eb0e6acd5
Add support for indexed palette TIFFs, at least some of them.
Matti Hamalainen <ccr@tnsp.org>
parents:
10
diff
changeset
|
1353 case PHOTOMETRIC_PALETTE: |
|
14
b0b1d299aa5d
Don't use C99 style declarations here for no reason.
Matti Hamalainen <ccr@tnsp.org>
parents:
13
diff
changeset
|
1354 for (x = 0, offs = 0; x < img->w; x++) |
|
11
e70eb0e6acd5
Add support for indexed palette TIFFs, at least some of them.
Matti Hamalainen <ccr@tnsp.org>
parents:
10
diff
changeset
|
1355 { |
|
e70eb0e6acd5
Add support for indexed palette TIFFs, at least some of them.
Matti Hamalainen <ccr@tnsp.org>
parents:
10
diff
changeset
|
1356 buf2[offs++] = img_colormap_r[buf[x]]; |
|
e70eb0e6acd5
Add support for indexed palette TIFFs, at least some of them.
Matti Hamalainen <ccr@tnsp.org>
parents:
10
diff
changeset
|
1357 buf2[offs++] = img_colormap_g[buf[x]]; |
|
e70eb0e6acd5
Add support for indexed palette TIFFs, at least some of them.
Matti Hamalainen <ccr@tnsp.org>
parents:
10
diff
changeset
|
1358 buf2[offs++] = img_colormap_b[buf[x]]; |
|
e70eb0e6acd5
Add support for indexed palette TIFFs, at least some of them.
Matti Hamalainen <ccr@tnsp.org>
parents:
10
diff
changeset
|
1359 } |
|
e70eb0e6acd5
Add support for indexed palette TIFFs, at least some of them.
Matti Hamalainen <ccr@tnsp.org>
parents:
10
diff
changeset
|
1360 convert_func(&cvt, |
|
e70eb0e6acd5
Add support for indexed palette TIFFs, at least some of them.
Matti Hamalainen <ccr@tnsp.org>
parents:
10
diff
changeset
|
1361 (PIXEL *)(img->data[0] + y * img->linesize[0]), |
|
e70eb0e6acd5
Add support for indexed palette TIFFs, at least some of them.
Matti Hamalainen <ccr@tnsp.org>
parents:
10
diff
changeset
|
1362 (PIXEL *)(img->data[1] + y * img->linesize[1]), |
|
e70eb0e6acd5
Add support for indexed palette TIFFs, at least some of them.
Matti Hamalainen <ccr@tnsp.org>
parents:
10
diff
changeset
|
1363 (PIXEL *)(img->data[2] + y * img->linesize[2]), |
|
e70eb0e6acd5
Add support for indexed palette TIFFs, at least some of them.
Matti Hamalainen <ccr@tnsp.org>
parents:
10
diff
changeset
|
1364 buf2, img->w, img_spp); |
|
e70eb0e6acd5
Add support for indexed palette TIFFs, at least some of them.
Matti Hamalainen <ccr@tnsp.org>
parents:
10
diff
changeset
|
1365 break; |
|
e70eb0e6acd5
Add support for indexed palette TIFFs, at least some of them.
Matti Hamalainen <ccr@tnsp.org>
parents:
10
diff
changeset
|
1366 |
|
e70eb0e6acd5
Add support for indexed palette TIFFs, at least some of them.
Matti Hamalainen <ccr@tnsp.org>
parents:
10
diff
changeset
|
1367 case PHOTOMETRIC_RGB: |
|
e70eb0e6acd5
Add support for indexed palette TIFFs, at least some of them.
Matti Hamalainen <ccr@tnsp.org>
parents:
10
diff
changeset
|
1368 convert_func(&cvt, |
|
e70eb0e6acd5
Add support for indexed palette TIFFs, at least some of them.
Matti Hamalainen <ccr@tnsp.org>
parents:
10
diff
changeset
|
1369 (PIXEL *)(img->data[0] + y * img->linesize[0]), |
|
e70eb0e6acd5
Add support for indexed palette TIFFs, at least some of them.
Matti Hamalainen <ccr@tnsp.org>
parents:
10
diff
changeset
|
1370 (PIXEL *)(img->data[1] + y * img->linesize[1]), |
|
e70eb0e6acd5
Add support for indexed palette TIFFs, at least some of them.
Matti Hamalainen <ccr@tnsp.org>
parents:
10
diff
changeset
|
1371 (PIXEL *)(img->data[2] + y * img->linesize[2]), |
|
e70eb0e6acd5
Add support for indexed palette TIFFs, at least some of them.
Matti Hamalainen <ccr@tnsp.org>
parents:
10
diff
changeset
|
1372 buf, img->w, img_spp); |
|
e70eb0e6acd5
Add support for indexed palette TIFFs, at least some of them.
Matti Hamalainen <ccr@tnsp.org>
parents:
10
diff
changeset
|
1373 |
|
e70eb0e6acd5
Add support for indexed palette TIFFs, at least some of them.
Matti Hamalainen <ccr@tnsp.org>
parents:
10
diff
changeset
|
1374 if (img_alpha) |
|
e70eb0e6acd5
Add support for indexed palette TIFFs, at least some of them.
Matti Hamalainen <ccr@tnsp.org>
parents:
10
diff
changeset
|
1375 { |
|
e70eb0e6acd5
Add support for indexed palette TIFFs, at least some of them.
Matti Hamalainen <ccr@tnsp.org>
parents:
10
diff
changeset
|
1376 if (idx) |
|
e70eb0e6acd5
Add support for indexed palette TIFFs, at least some of them.
Matti Hamalainen <ccr@tnsp.org>
parents:
10
diff
changeset
|
1377 { |
|
e70eb0e6acd5
Add support for indexed palette TIFFs, at least some of them.
Matti Hamalainen <ccr@tnsp.org>
parents:
10
diff
changeset
|
1378 gray16_to_gray(&cvt, |
|
e70eb0e6acd5
Add support for indexed palette TIFFs, at least some of them.
Matti Hamalainen <ccr@tnsp.org>
parents:
10
diff
changeset
|
1379 (PIXEL *)(img->data[3] + y * img->linesize[3]), |
|
e70eb0e6acd5
Add support for indexed palette TIFFs, at least some of them.
Matti Hamalainen <ccr@tnsp.org>
parents:
10
diff
changeset
|
1380 ((uint16_t *) buf) + 3, img->w, 4); |
|
e70eb0e6acd5
Add support for indexed palette TIFFs, at least some of them.
Matti Hamalainen <ccr@tnsp.org>
parents:
10
diff
changeset
|
1381 } |
|
e70eb0e6acd5
Add support for indexed palette TIFFs, at least some of them.
Matti Hamalainen <ccr@tnsp.org>
parents:
10
diff
changeset
|
1382 else |
|
e70eb0e6acd5
Add support for indexed palette TIFFs, at least some of them.
Matti Hamalainen <ccr@tnsp.org>
parents:
10
diff
changeset
|
1383 { |
|
e70eb0e6acd5
Add support for indexed palette TIFFs, at least some of them.
Matti Hamalainen <ccr@tnsp.org>
parents:
10
diff
changeset
|
1384 gray8_to_gray(&cvt, |
|
e70eb0e6acd5
Add support for indexed palette TIFFs, at least some of them.
Matti Hamalainen <ccr@tnsp.org>
parents:
10
diff
changeset
|
1385 (PIXEL *)(img->data[3] + y * img->linesize[3]), |
|
e70eb0e6acd5
Add support for indexed palette TIFFs, at least some of them.
Matti Hamalainen <ccr@tnsp.org>
parents:
10
diff
changeset
|
1386 ((uint8_t *) buf) + 3, img->w, 4); |
|
e70eb0e6acd5
Add support for indexed palette TIFFs, at least some of them.
Matti Hamalainen <ccr@tnsp.org>
parents:
10
diff
changeset
|
1387 } |
|
e70eb0e6acd5
Add support for indexed palette TIFFs, at least some of them.
Matti Hamalainen <ccr@tnsp.org>
parents:
10
diff
changeset
|
1388 } |
|
e70eb0e6acd5
Add support for indexed palette TIFFs, at least some of them.
Matti Hamalainen <ccr@tnsp.org>
parents:
10
diff
changeset
|
1389 break; |
|
12
9b00d4206f99
Implement support for one type of grayscale TIFF.
Matti Hamalainen <ccr@tnsp.org>
parents:
11
diff
changeset
|
1390 |
|
34
5d51fff843eb
A "commit dump" of random changes I've made, as I probably won't be touching this code anymore.
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
1391 case PHOTOMETRIC_MINISWHITE: |
|
12
9b00d4206f99
Implement support for one type of grayscale TIFF.
Matti Hamalainen <ccr@tnsp.org>
parents:
11
diff
changeset
|
1392 case PHOTOMETRIC_MINISBLACK: |
|
9b00d4206f99
Implement support for one type of grayscale TIFF.
Matti Hamalainen <ccr@tnsp.org>
parents:
11
diff
changeset
|
1393 if (img_depth == 16) |
|
9b00d4206f99
Implement support for one type of grayscale TIFF.
Matti Hamalainen <ccr@tnsp.org>
parents:
11
diff
changeset
|
1394 { |
|
9b00d4206f99
Implement support for one type of grayscale TIFF.
Matti Hamalainen <ccr@tnsp.org>
parents:
11
diff
changeset
|
1395 luma16_to_gray(&cvt, |
|
9b00d4206f99
Implement support for one type of grayscale TIFF.
Matti Hamalainen <ccr@tnsp.org>
parents:
11
diff
changeset
|
1396 (PIXEL *)(img->data[0] + y * img->linesize[0]), |
|
9b00d4206f99
Implement support for one type of grayscale TIFF.
Matti Hamalainen <ccr@tnsp.org>
parents:
11
diff
changeset
|
1397 (uint16_t *) buf, img->w, img_spp); |
|
9b00d4206f99
Implement support for one type of grayscale TIFF.
Matti Hamalainen <ccr@tnsp.org>
parents:
11
diff
changeset
|
1398 |
|
9b00d4206f99
Implement support for one type of grayscale TIFF.
Matti Hamalainen <ccr@tnsp.org>
parents:
11
diff
changeset
|
1399 if (img_alpha) |
|
9b00d4206f99
Implement support for one type of grayscale TIFF.
Matti Hamalainen <ccr@tnsp.org>
parents:
11
diff
changeset
|
1400 { |
|
9b00d4206f99
Implement support for one type of grayscale TIFF.
Matti Hamalainen <ccr@tnsp.org>
parents:
11
diff
changeset
|
1401 gray16_to_gray(&cvt, |
|
9b00d4206f99
Implement support for one type of grayscale TIFF.
Matti Hamalainen <ccr@tnsp.org>
parents:
11
diff
changeset
|
1402 (PIXEL *)(img->data[1] + y * img->linesize[1]), |
|
9b00d4206f99
Implement support for one type of grayscale TIFF.
Matti Hamalainen <ccr@tnsp.org>
parents:
11
diff
changeset
|
1403 ((uint16_t *) buf) + 1, img->w, 2); |
|
9b00d4206f99
Implement support for one type of grayscale TIFF.
Matti Hamalainen <ccr@tnsp.org>
parents:
11
diff
changeset
|
1404 } |
|
9b00d4206f99
Implement support for one type of grayscale TIFF.
Matti Hamalainen <ccr@tnsp.org>
parents:
11
diff
changeset
|
1405 } |
|
9b00d4206f99
Implement support for one type of grayscale TIFF.
Matti Hamalainen <ccr@tnsp.org>
parents:
11
diff
changeset
|
1406 else |
|
9b00d4206f99
Implement support for one type of grayscale TIFF.
Matti Hamalainen <ccr@tnsp.org>
parents:
11
diff
changeset
|
1407 { |
|
9b00d4206f99
Implement support for one type of grayscale TIFF.
Matti Hamalainen <ccr@tnsp.org>
parents:
11
diff
changeset
|
1408 luma8_to_gray(&cvt, |
|
9b00d4206f99
Implement support for one type of grayscale TIFF.
Matti Hamalainen <ccr@tnsp.org>
parents:
11
diff
changeset
|
1409 (PIXEL *)(img->data[0] + y * img->linesize[0]), |
|
9b00d4206f99
Implement support for one type of grayscale TIFF.
Matti Hamalainen <ccr@tnsp.org>
parents:
11
diff
changeset
|
1410 (uint8_t *) buf, img->w, img_spp); |
|
9b00d4206f99
Implement support for one type of grayscale TIFF.
Matti Hamalainen <ccr@tnsp.org>
parents:
11
diff
changeset
|
1411 |
|
9b00d4206f99
Implement support for one type of grayscale TIFF.
Matti Hamalainen <ccr@tnsp.org>
parents:
11
diff
changeset
|
1412 if (img_alpha) |
|
9b00d4206f99
Implement support for one type of grayscale TIFF.
Matti Hamalainen <ccr@tnsp.org>
parents:
11
diff
changeset
|
1413 { |
|
9b00d4206f99
Implement support for one type of grayscale TIFF.
Matti Hamalainen <ccr@tnsp.org>
parents:
11
diff
changeset
|
1414 gray8_to_gray(&cvt, |
|
9b00d4206f99
Implement support for one type of grayscale TIFF.
Matti Hamalainen <ccr@tnsp.org>
parents:
11
diff
changeset
|
1415 (PIXEL *)(img->data[1] + y * img->linesize[1]), |
|
9b00d4206f99
Implement support for one type of grayscale TIFF.
Matti Hamalainen <ccr@tnsp.org>
parents:
11
diff
changeset
|
1416 ((uint8_t *) buf) + 1, img->w, 2); |
|
9b00d4206f99
Implement support for one type of grayscale TIFF.
Matti Hamalainen <ccr@tnsp.org>
parents:
11
diff
changeset
|
1417 } |
|
9b00d4206f99
Implement support for one type of grayscale TIFF.
Matti Hamalainen <ccr@tnsp.org>
parents:
11
diff
changeset
|
1418 } |
|
9b00d4206f99
Implement support for one type of grayscale TIFF.
Matti Hamalainen <ccr@tnsp.org>
parents:
11
diff
changeset
|
1419 break; |
|
6
690bf78c1ce9
Initial implementation of alpha channel support for TIFF images.
Matti Hamalainen <ccr@tnsp.org>
parents:
5
diff
changeset
|
1420 } |
|
4
bbd61622856a
Initial implementation of TIFF format read support via libtiff.
Matti Hamalainen <ccr@tnsp.org>
parents:
3
diff
changeset
|
1421 } |
|
bbd61622856a
Initial implementation of TIFF format read support via libtiff.
Matti Hamalainen <ccr@tnsp.org>
parents:
3
diff
changeset
|
1422 |
|
9
bfd933ef38b4
Implement some metadata support in TIFF and clean up meta data handling otherwise.
Matti Hamalainen <ccr@tnsp.org>
parents:
8
diff
changeset
|
1423 // Get meta data |
|
bfd933ef38b4
Implement some metadata support in TIFF and clean up meta data handling otherwise.
Matti Hamalainen <ccr@tnsp.org>
parents:
8
diff
changeset
|
1424 if (TIFFGetField(tif, TIFFTAG_ICCPROFILE, &tmp_len, &tmp_buf)) |
|
17
91f27e9fdb60
Rename insert_md() and add_md_contents() to bpg_insert_md() and
Matti Hamalainen <ccr@tnsp.org>
parents:
16
diff
changeset
|
1425 bpg_add_md_contents(pmd, BPG_EXTENSION_TAG_ICCP, tmp_len, tmp_buf); |
|
9
bfd933ef38b4
Implement some metadata support in TIFF and clean up meta data handling otherwise.
Matti Hamalainen <ccr@tnsp.org>
parents:
8
diff
changeset
|
1426 |
|
bfd933ef38b4
Implement some metadata support in TIFF and clean up meta data handling otherwise.
Matti Hamalainen <ccr@tnsp.org>
parents:
8
diff
changeset
|
1427 if (TIFFGetField(tif, TIFFTAG_XMLPACKET, &tmp_len, &tmp_buf)) |
|
17
91f27e9fdb60
Rename insert_md() and add_md_contents() to bpg_insert_md() and
Matti Hamalainen <ccr@tnsp.org>
parents:
16
diff
changeset
|
1428 bpg_add_md_contents(pmd, BPG_EXTENSION_TAG_XMP, tmp_len, tmp_buf); |
|
4
bbd61622856a
Initial implementation of TIFF format read support via libtiff.
Matti Hamalainen <ccr@tnsp.org>
parents:
3
diff
changeset
|
1429 |
|
24
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1430 #ifdef HAVE_LIBEXIF |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1431 // Due to insanity of libtiff's "API", we have to go roundabout way to |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1432 // reconstruct the EXIF data through libexif and fetching TIFF tags .. |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1433 // even though the data already supposedly exists in desired format .. :( |
|
27
4aa0611ad85a
Some adjustments to EXIF support in TIFF input.
Matti Hamalainen <ccr@tnsp.org>
parents:
26
diff
changeset
|
1434 if ((exif_mem = exif_mem_new_default()) == NULL) |
|
24
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1435 goto err; |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1436 |
|
27
4aa0611ad85a
Some adjustments to EXIF support in TIFF input.
Matti Hamalainen <ccr@tnsp.org>
parents:
26
diff
changeset
|
1437 if ((exif = exif_data_new_mem(exif_mem)) == NULL) |
|
24
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1438 goto err; |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1439 |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1440 exif_data_set_option(exif, EXIF_DATA_OPTION_FOLLOW_SPECIFICATION); |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1441 exif_data_set_data_type(exif, EXIF_DATA_TYPE_COMPRESSED); |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1442 exif_data_set_byte_order(exif, EXIF_BYTE_ORDER_INTEL); |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1443 |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1444 tiff_tags_convert(tif, tiff_tag_convert_table, exif_mem, exif, &added); |
|
34
5d51fff843eb
A "commit dump" of random changes I've made, as I probably won't be touching this code anymore.
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
1445 #ifdef TIFF_DEBUG |
|
5d51fff843eb
A "commit dump" of random changes I've made, as I probably won't be touching this code anymore.
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
1446 tiff_tags_dump(tif, tiff_tag_convert_table); |
|
5d51fff843eb
A "commit dump" of random changes I've made, as I probably won't be touching this code anymore.
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
1447 #endif |
|
24
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1448 |
|
27
4aa0611ad85a
Some adjustments to EXIF support in TIFF input.
Matti Hamalainen <ccr@tnsp.org>
parents:
26
diff
changeset
|
1449 if (TIFFGetField(tif, TIFFTAG_EXIFIFD, &tmp_offs) && |
|
4aa0611ad85a
Some adjustments to EXIF support in TIFF input.
Matti Hamalainen <ccr@tnsp.org>
parents:
26
diff
changeset
|
1450 TIFFReadEXIFDirectory(tif, tmp_offs)) |
|
24
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1451 { |
|
27
4aa0611ad85a
Some adjustments to EXIF support in TIFF input.
Matti Hamalainen <ccr@tnsp.org>
parents:
26
diff
changeset
|
1452 tiff_tags_convert(tif, exif_tag_convert_table, exif_mem, exif, &added); |
|
34
5d51fff843eb
A "commit dump" of random changes I've made, as I probably won't be touching this code anymore.
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
1453 #ifdef TIFF_DEBUG |
|
5d51fff843eb
A "commit dump" of random changes I've made, as I probably won't be touching this code anymore.
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
1454 tiff_tags_dump(tif, exif_tag_convert_table); |
|
5d51fff843eb
A "commit dump" of random changes I've made, as I probably won't be touching this code anymore.
Matti Hamalainen <ccr@tnsp.org>
parents:
33
diff
changeset
|
1455 #endif |
|
24
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1456 } |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1457 |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1458 if (added) |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1459 { |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1460 uint8_t *ex_buf = NULL; |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1461 unsigned int ex_len = 0; |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1462 |
|
29
1a7b661841c3
Add exif_fix_data() before creating the EXIF data blob from TIFF tags to
Matti Hamalainen <ccr@tnsp.org>
parents:
28
diff
changeset
|
1463 exif_data_fix(exif); |
|
24
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1464 exif_data_save_data(exif, &ex_buf, &ex_len); |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1465 |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1466 // Strip off "Exif\x00\x00" from the data |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1467 if (ex_len > 6) |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1468 bpg_add_md_contents(pmd, BPG_EXTENSION_TAG_EXIF, ex_len - 6, ex_buf + 6); |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1469 |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1470 exif_mem_free(exif_mem, ex_buf); |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1471 } |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1472 #endif |
|
377dc78a052d
Add EXIF metadata conversion from TIFF files to BPG via libexif.
Matti Hamalainen <ccr@tnsp.org>
parents:
22
diff
changeset
|
1473 |
|
4
bbd61622856a
Initial implementation of TIFF format read support via libtiff.
Matti Hamalainen <ccr@tnsp.org>
parents:
3
diff
changeset
|
1474 err: |
|
27
4aa0611ad85a
Some adjustments to EXIF support in TIFF input.
Matti Hamalainen <ccr@tnsp.org>
parents:
26
diff
changeset
|
1475 #ifdef HAVE_LIBEXIF |
|
4aa0611ad85a
Some adjustments to EXIF support in TIFF input.
Matti Hamalainen <ccr@tnsp.org>
parents:
26
diff
changeset
|
1476 if (exif != NULL) |
|
4aa0611ad85a
Some adjustments to EXIF support in TIFF input.
Matti Hamalainen <ccr@tnsp.org>
parents:
26
diff
changeset
|
1477 exif_data_free(exif); |
|
4aa0611ad85a
Some adjustments to EXIF support in TIFF input.
Matti Hamalainen <ccr@tnsp.org>
parents:
26
diff
changeset
|
1478 #endif |
|
4aa0611ad85a
Some adjustments to EXIF support in TIFF input.
Matti Hamalainen <ccr@tnsp.org>
parents:
26
diff
changeset
|
1479 |
|
4
bbd61622856a
Initial implementation of TIFF format read support via libtiff.
Matti Hamalainen <ccr@tnsp.org>
parents:
3
diff
changeset
|
1480 if (buf != NULL) |
|
bbd61622856a
Initial implementation of TIFF format read support via libtiff.
Matti Hamalainen <ccr@tnsp.org>
parents:
3
diff
changeset
|
1481 _TIFFfree(buf); |
|
bbd61622856a
Initial implementation of TIFF format read support via libtiff.
Matti Hamalainen <ccr@tnsp.org>
parents:
3
diff
changeset
|
1482 |
|
11
e70eb0e6acd5
Add support for indexed palette TIFFs, at least some of them.
Matti Hamalainen <ccr@tnsp.org>
parents:
10
diff
changeset
|
1483 if (buf2 != NULL) |
|
e70eb0e6acd5
Add support for indexed palette TIFFs, at least some of them.
Matti Hamalainen <ccr@tnsp.org>
parents:
10
diff
changeset
|
1484 free(buf2); |
|
e70eb0e6acd5
Add support for indexed palette TIFFs, at least some of them.
Matti Hamalainen <ccr@tnsp.org>
parents:
10
diff
changeset
|
1485 |
|
4
bbd61622856a
Initial implementation of TIFF format read support via libtiff.
Matti Hamalainen <ccr@tnsp.org>
parents:
3
diff
changeset
|
1486 TIFFClose(tif); |
|
bbd61622856a
Initial implementation of TIFF format read support via libtiff.
Matti Hamalainen <ccr@tnsp.org>
parents:
3
diff
changeset
|
1487 return img; |
|
bbd61622856a
Initial implementation of TIFF format read support via libtiff.
Matti Hamalainen <ccr@tnsp.org>
parents:
3
diff
changeset
|
1488 } |
|
bbd61622856a
Initial implementation of TIFF format read support via libtiff.
Matti Hamalainen <ccr@tnsp.org>
parents:
3
diff
changeset
|
1489 |
| 0 | 1490 Image *read_png(BPGMetaData **pmd, |
| 1491 FILE *f, BPGColorSpaceEnum color_space, int out_bit_depth, | |
| 1492 int limited_range, int premultiplied_alpha) | |
| 1493 { | |
| 1494 png_structp png_ptr; | |
| 1495 png_infop info_ptr; | |
| 1496 int bit_depth, color_type; | |
| 1497 Image *img; | |
| 1498 uint8_t **rows; | |
| 1499 int y, has_alpha, linesize, bpp; | |
| 1500 BPGImageFormatEnum format; | |
| 1501 ColorConvertState cvt_s, *cvt = &cvt_s; | |
|
5
524eae707ba4
Cosmetics: Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
1502 |
| 0 | 1503 png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, |
| 1504 NULL, NULL, NULL); | |
| 1505 if (png_ptr == NULL) { | |
| 1506 return NULL; | |
| 1507 } | |
|
5
524eae707ba4
Cosmetics: Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
1508 |
| 0 | 1509 info_ptr = png_create_info_struct(png_ptr); |
| 1510 if (info_ptr == NULL) { | |
| 1511 png_destroy_read_struct(&png_ptr, NULL, NULL); | |
| 1512 return NULL; | |
| 1513 } | |
|
5
524eae707ba4
Cosmetics: Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
1514 |
| 0 | 1515 if (setjmp(png_jmpbuf(png_ptr))) { |
| 1516 png_destroy_read_struct(&png_ptr, &info_ptr, NULL); | |
| 1517 return NULL; | |
| 1518 } | |
|
5
524eae707ba4
Cosmetics: Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
1519 |
| 0 | 1520 png_init_io(png_ptr, f); |
|
5
524eae707ba4
Cosmetics: Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
1521 |
| 0 | 1522 png_read_info(png_ptr, info_ptr); |
|
5
524eae707ba4
Cosmetics: Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
1523 |
| 0 | 1524 bit_depth = png_get_bit_depth(png_ptr, info_ptr); |
| 1525 color_type = png_get_color_type(png_ptr, info_ptr); | |
| 1526 | |
| 1527 switch (color_type) { | |
| 1528 case PNG_COLOR_TYPE_PALETTE: | |
| 1529 png_set_palette_to_rgb(png_ptr); | |
| 1530 bit_depth = 8; | |
| 1531 break; | |
| 1532 case PNG_COLOR_TYPE_GRAY: | |
| 1533 case PNG_COLOR_TYPE_GRAY_ALPHA: | |
| 1534 if (bit_depth < 8) { | |
| 1535 png_set_expand_gray_1_2_4_to_8(png_ptr); | |
| 1536 bit_depth = 8; | |
| 1537 } | |
| 1538 break; | |
| 1539 } | |
| 1540 assert(bit_depth == 8 || bit_depth == 16); | |
| 1541 | |
| 1542 #if __BYTE_ORDER__ != __ORDER_BIG_ENDIAN__ | |
| 1543 if (bit_depth == 16) { | |
| 1544 png_set_swap(png_ptr); | |
| 1545 } | |
| 1546 #endif | |
| 1547 | |
| 1548 if (color_type == PNG_COLOR_TYPE_GRAY || | |
| 1549 color_type == PNG_COLOR_TYPE_GRAY_ALPHA) { | |
| 1550 format = BPG_FORMAT_GRAY; | |
| 1551 color_space = BPG_CS_YCbCr; | |
| 1552 } else { | |
| 1553 format = BPG_FORMAT_444; | |
| 1554 } | |
|
5
524eae707ba4
Cosmetics: Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
1555 |
| 0 | 1556 has_alpha = (color_type == PNG_COLOR_TYPE_GRAY_ALPHA || |
| 1557 color_type == PNG_COLOR_TYPE_RGB_ALPHA); | |
| 1558 | |
| 1559 if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)) { | |
| 1560 png_set_tRNS_to_alpha(png_ptr); | |
| 1561 has_alpha = 1; | |
| 1562 } | |
| 1563 | |
| 1564 if (premultiplied_alpha) { | |
| 1565 png_set_alpha_mode(png_ptr, PNG_ALPHA_ASSOCIATED, PNG_GAMMA_LINEAR); | |
| 1566 } | |
| 1567 | |
| 1568 img = image_alloc(png_get_image_width(png_ptr, info_ptr), | |
| 1569 png_get_image_height(png_ptr, info_ptr), | |
| 1570 format, has_alpha, color_space, | |
| 1571 out_bit_depth); | |
| 1572 img->limited_range = limited_range; | |
| 1573 img->premultiplied_alpha = premultiplied_alpha; | |
| 1574 | |
| 1575 rows = malloc(sizeof(rows[0]) * img->h); | |
| 1576 if (format == BPG_FORMAT_GRAY) | |
| 1577 bpp = (1 + has_alpha) * (bit_depth / 8); | |
| 1578 else | |
| 1579 bpp = (3 + has_alpha) * (bit_depth / 8); | |
| 1580 linesize = bpp * img->w; | |
| 1581 for (y = 0; y < img->h; y++) { | |
| 1582 rows[y] = malloc(linesize); | |
| 1583 } | |
|
5
524eae707ba4
Cosmetics: Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
1584 |
| 0 | 1585 png_read_image(png_ptr, rows); |
|
5
524eae707ba4
Cosmetics: Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
1586 |
| 0 | 1587 convert_init(cvt, bit_depth, out_bit_depth, color_space, limited_range); |
| 1588 | |
| 1589 if (format != BPG_FORMAT_GRAY) { | |
| 1590 int idx; | |
| 1591 RGBConvertFunc *convert_func; | |
| 1592 | |
| 1593 idx = (bit_depth == 16); | |
| 1594 convert_func = rgb_to_cs[idx][color_space]; | |
|
5
524eae707ba4
Cosmetics: Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
1595 |
| 0 | 1596 for (y = 0; y < img->h; y++) { |
| 1597 convert_func(cvt, (PIXEL *)(img->data[0] + y * img->linesize[0]), | |
| 1598 (PIXEL *)(img->data[1] + y * img->linesize[1]), | |
| 1599 (PIXEL *)(img->data[2] + y * img->linesize[2]), | |
| 1600 rows[y], img->w, 3 + has_alpha); | |
| 1601 if (has_alpha) { | |
| 1602 if (idx) { | |
| 1603 gray16_to_gray(cvt, (PIXEL *)(img->data[3] + y * img->linesize[3]), | |
| 1604 (uint16_t *)rows[y] + 3, img->w, 4); | |
| 1605 } else { | |
| 1606 gray8_to_gray(cvt, (PIXEL *)(img->data[3] + y * img->linesize[3]), | |
| 1607 rows[y] + 3, img->w, 4); | |
| 1608 } | |
| 1609 } | |
| 1610 } | |
| 1611 } else { | |
| 1612 if (bit_depth == 16) { | |
| 1613 for (y = 0; y < img->h; y++) { | |
| 1614 luma16_to_gray(cvt, (PIXEL *)(img->data[0] + y * img->linesize[0]), | |
| 1615 (uint16_t *)rows[y], img->w, 1 + has_alpha); | |
| 1616 if (has_alpha) { | |
| 1617 gray16_to_gray(cvt, (PIXEL *)(img->data[1] + y * img->linesize[1]), | |
| 1618 (uint16_t *)rows[y] + 1, img->w, 2); | |
| 1619 } | |
| 1620 } | |
| 1621 } else { | |
| 1622 for (y = 0; y < img->h; y++) { | |
| 1623 luma8_to_gray(cvt, (PIXEL *)(img->data[0] + y * img->linesize[0]), | |
| 1624 rows[y], img->w, 1 + has_alpha); | |
| 1625 if (has_alpha) { | |
| 1626 gray8_to_gray(cvt, (PIXEL *)(img->data[1] + y * img->linesize[1]), | |
| 1627 rows[y] + 1, img->w, 2); | |
| 1628 } | |
| 1629 } | |
| 1630 } | |
| 1631 } | |
| 1632 | |
| 1633 for (y = 0; y < img->h; y++) { | |
| 1634 free(rows[y]); | |
| 1635 } | |
| 1636 free(rows); | |
|
5
524eae707ba4
Cosmetics: Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
1637 |
| 0 | 1638 png_read_end(png_ptr, info_ptr); |
|
5
524eae707ba4
Cosmetics: Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
1639 |
| 0 | 1640 /* get the ICC profile if present */ |
| 1641 { | |
| 1642 png_charp name; | |
| 1643 int comp_type; | |
| 1644 png_bytep iccp_buf; | |
| 1645 png_uint_32 iccp_buf_len; | |
|
5
524eae707ba4
Cosmetics: Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
1646 |
| 0 | 1647 if (png_get_iCCP(png_ptr, info_ptr, |
|
9
bfd933ef38b4
Implement some metadata support in TIFF and clean up meta data handling otherwise.
Matti Hamalainen <ccr@tnsp.org>
parents:
8
diff
changeset
|
1648 &name, &comp_type, &iccp_buf, &iccp_buf_len) == PNG_INFO_iCCP) |
|
17
91f27e9fdb60
Rename insert_md() and add_md_contents() to bpg_insert_md() and
Matti Hamalainen <ccr@tnsp.org>
parents:
16
diff
changeset
|
1649 bpg_add_md_contents(pmd, BPG_EXTENSION_TAG_ICCP, iccp_buf_len, iccp_buf); |
| 0 | 1650 } |
| 1651 | |
| 1652 png_destroy_read_struct(&png_ptr, &info_ptr, NULL); | |
|
5
524eae707ba4
Cosmetics: Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
1653 |
| 0 | 1654 return img; |
| 1655 } | |
| 1656 | |
| 1657 static BPGMetaData *jpeg_get_metadata(jpeg_saved_marker_ptr first_marker) | |
| 1658 { | |
|
26
a6e11adda0be
The format of JPEG EXIF data converted to BPG had an extraneous zero byte at
Matti Hamalainen <ccr@tnsp.org>
parents:
25
diff
changeset
|
1659 static const char app1_exif[6] = "Exif\x00\x00"; |
| 0 | 1660 static const char app1_xmp[] = "http://ns.adobe.com/xap/1.0/"; |
| 1661 static const char app2_iccp[] = "ICC_PROFILE"; | |
| 1662 jpeg_saved_marker_ptr marker; | |
|
18
403c67bcb76a
Use bpg_insert_md() and bpg_add_md_contents() in jpeg_get_metadata() also.
Matti Hamalainen <ccr@tnsp.org>
parents:
17
diff
changeset
|
1663 BPGMetaData *md_list; |
| 0 | 1664 int has_exif, has_xmp, l, iccp_chunk_count, i; |
| 1665 jpeg_saved_marker_ptr iccp_chunks[256]; | |
|
5
524eae707ba4
Cosmetics: Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
1666 |
| 0 | 1667 iccp_chunk_count = 0; |
| 1668 has_exif = 0; | |
| 1669 has_xmp = 0; | |
|
18
403c67bcb76a
Use bpg_insert_md() and bpg_add_md_contents() in jpeg_get_metadata() also.
Matti Hamalainen <ccr@tnsp.org>
parents:
17
diff
changeset
|
1670 md_list = NULL; |
| 0 | 1671 for (marker = first_marker; marker != NULL; marker = marker->next) { |
| 1672 #if 0 | |
|
5
524eae707ba4
Cosmetics: Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
1673 printf("marker=APP%d len=%d\n", |
| 0 | 1674 marker->marker - JPEG_APP0, marker->data_length); |
| 1675 #endif | |
| 1676 if (!has_exif && marker->marker == JPEG_APP0 + 1 && | |
| 1677 marker->data_length > sizeof(app1_exif) && | |
| 1678 !memcmp(marker->data, app1_exif, sizeof(app1_exif))) { | |
| 1679 l = sizeof(app1_exif); | |
|
18
403c67bcb76a
Use bpg_insert_md() and bpg_add_md_contents() in jpeg_get_metadata() also.
Matti Hamalainen <ccr@tnsp.org>
parents:
17
diff
changeset
|
1680 bpg_add_md_contents(&md_list, BPG_EXTENSION_TAG_EXIF, marker->data_length - l, marker->data + l); |
| 0 | 1681 has_exif = 1; |
| 1682 } else if (!has_xmp && marker->marker == JPEG_APP0 + 1 && | |
| 1683 marker->data_length > sizeof(app1_xmp) && | |
|
5
524eae707ba4
Cosmetics: Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
1684 !memcmp(marker->data, app1_xmp, sizeof(app1_xmp)) && |
| 0 | 1685 !has_xmp) { |
| 1686 l = sizeof(app1_xmp); | |
|
18
403c67bcb76a
Use bpg_insert_md() and bpg_add_md_contents() in jpeg_get_metadata() also.
Matti Hamalainen <ccr@tnsp.org>
parents:
17
diff
changeset
|
1687 bpg_add_md_contents(&md_list, BPG_EXTENSION_TAG_XMP, marker->data_length - l, marker->data + l); |
| 0 | 1688 has_xmp = 1; |
| 1689 } else if (marker->marker == JPEG_APP0 + 2 && | |
| 1690 marker->data_length > (sizeof(app2_iccp) + 2) && | |
| 1691 !memcmp(marker->data, app2_iccp, sizeof(app2_iccp))) { | |
| 1692 int chunk_count, chunk_index; | |
| 1693 l = sizeof(app2_iccp); | |
| 1694 chunk_index = marker->data[l]; | |
| 1695 chunk_count = marker->data[l]; | |
|
5
524eae707ba4
Cosmetics: Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
1696 if (chunk_index == 0 || chunk_count == 0) |
| 0 | 1697 continue; |
| 1698 if (iccp_chunk_count == 0) { | |
| 1699 iccp_chunk_count = chunk_count; | |
| 1700 for(i = 0; i < chunk_count; i++) { | |
| 1701 iccp_chunks[i] = NULL; | |
| 1702 } | |
| 1703 } else { | |
| 1704 if (chunk_count != iccp_chunk_count) | |
| 1705 continue; | |
| 1706 } | |
| 1707 if (chunk_index > iccp_chunk_count) | |
| 1708 continue; | |
| 1709 iccp_chunks[chunk_index - 1] = marker; | |
| 1710 } | |
| 1711 } | |
| 1712 | |
| 1713 if (iccp_chunk_count != 0) { | |
| 1714 int len, hlen, idx; | |
| 1715 /* check that no chunk are missing */ | |
| 1716 len = 0; | |
| 1717 hlen = sizeof(app2_iccp) + 2; | |
| 1718 for(i = 0; i < iccp_chunk_count; i++) { | |
| 1719 if (!iccp_chunks[i]) | |
| 1720 break; | |
| 1721 len += iccp_chunks[i]->data_length - hlen; | |
| 1722 } | |
| 1723 if (i == iccp_chunk_count) { | |
|
18
403c67bcb76a
Use bpg_insert_md() and bpg_add_md_contents() in jpeg_get_metadata() also.
Matti Hamalainen <ccr@tnsp.org>
parents:
17
diff
changeset
|
1724 BPGMetaData *md = bpg_md_alloc(BPG_EXTENSION_TAG_ICCP); |
| 0 | 1725 md->buf_len = len; |
| 1726 md->buf = malloc(md->buf_len); | |
|
18
403c67bcb76a
Use bpg_insert_md() and bpg_add_md_contents() in jpeg_get_metadata() also.
Matti Hamalainen <ccr@tnsp.org>
parents:
17
diff
changeset
|
1727 bpg_insert_md(&md_list, md); |
|
403c67bcb76a
Use bpg_insert_md() and bpg_add_md_contents() in jpeg_get_metadata() also.
Matti Hamalainen <ccr@tnsp.org>
parents:
17
diff
changeset
|
1728 for(i = 0, idx = 0; i < iccp_chunk_count; i++) { |
| 0 | 1729 l = iccp_chunks[i]->data_length - hlen; |
| 1730 memcpy(md->buf + idx, iccp_chunks[i]->data + hlen, l); | |
| 1731 idx += l; | |
| 1732 } | |
| 1733 assert(idx == len); | |
| 1734 } | |
| 1735 } | |
|
18
403c67bcb76a
Use bpg_insert_md() and bpg_add_md_contents() in jpeg_get_metadata() also.
Matti Hamalainen <ccr@tnsp.org>
parents:
17
diff
changeset
|
1736 return md_list; |
| 0 | 1737 } |
| 1738 | |
|
5
524eae707ba4
Cosmetics: Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
1739 Image *read_jpeg(BPGMetaData **pmd, FILE *f, |
| 0 | 1740 int out_bit_depth) |
| 1741 { | |
| 1742 struct jpeg_decompress_struct cinfo; | |
| 1743 struct jpeg_error_mgr jerr; | |
| 1744 int w, h, w1, i, y_h, c_h, y, v_shift, c_w, y1, idx, c_idx, h_shift; | |
| 1745 int h1, plane_idx[4], has_alpha, has_w_plane; | |
| 1746 Image *img; | |
| 1747 BPGImageFormatEnum format; | |
| 1748 BPGColorSpaceEnum color_space; | |
| 1749 ColorConvertState cvt_s, *cvt = &cvt_s; | |
| 1750 uint32_t comp_hv; | |
| 1751 | |
| 1752 cinfo.err = jpeg_std_error(&jerr); | |
| 1753 jpeg_create_decompress(&cinfo); | |
| 1754 | |
| 1755 jpeg_save_markers(&cinfo, JPEG_APP0 + 1, 65535); | |
| 1756 jpeg_save_markers(&cinfo, JPEG_APP0 + 2, 65535); | |
| 1757 | |
| 1758 jpeg_stdio_src(&cinfo, f); | |
|
5
524eae707ba4
Cosmetics: Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
1759 |
| 0 | 1760 jpeg_read_header(&cinfo, TRUE); |
|
5
524eae707ba4
Cosmetics: Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
1761 |
| 0 | 1762 cinfo.raw_data_out = TRUE; |
| 1763 cinfo.do_fancy_upsampling = TRUE; | |
|
5
524eae707ba4
Cosmetics: Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
1764 |
| 0 | 1765 w = cinfo.image_width; |
| 1766 h = cinfo.image_height; | |
| 1767 | |
| 1768 has_w_plane = 0; | |
| 1769 comp_hv = 0; | |
| 1770 if (cinfo.num_components < 1 || cinfo.num_components > 4) | |
| 1771 goto unsupported; | |
| 1772 for(i = 0; i < cinfo.num_components; i++) { | |
| 1773 comp_hv |= cinfo.comp_info[i].h_samp_factor << (i * 8 + 4); | |
| 1774 comp_hv |= cinfo.comp_info[i].v_samp_factor << (i * 8); | |
| 1775 } | |
| 1776 switch(cinfo.jpeg_color_space) { | |
| 1777 case JCS_GRAYSCALE: | |
| 1778 if (cinfo.num_components != 1 || comp_hv != 0x11) | |
| 1779 goto unsupported; | |
| 1780 format = BPG_FORMAT_GRAY; | |
| 1781 color_space = BPG_CS_YCbCr; | |
| 1782 break; | |
| 1783 case JCS_YCbCr: | |
| 1784 if (cinfo.num_components != 3) | |
| 1785 goto unsupported; | |
| 1786 switch(comp_hv) { | |
| 1787 case 0x111111: | |
| 1788 format = BPG_FORMAT_444; | |
| 1789 break; | |
| 1790 case 0x111121: | |
| 1791 format = BPG_FORMAT_422; | |
| 1792 break; | |
| 1793 case 0x111122: | |
| 1794 format = BPG_FORMAT_420; | |
| 1795 break; | |
| 1796 default: | |
| 1797 cinfo.raw_data_out = FALSE; | |
| 1798 format = BPG_FORMAT_444; | |
| 1799 cinfo.out_color_space = JCS_YCbCr; | |
| 1800 break; | |
| 1801 } | |
| 1802 color_space = BPG_CS_YCbCr; | |
| 1803 break; | |
| 1804 case JCS_RGB: | |
| 1805 if (cinfo.num_components != 3) | |
| 1806 goto unsupported; | |
| 1807 format = BPG_FORMAT_444; | |
| 1808 color_space = BPG_CS_RGB; | |
| 1809 cinfo.raw_data_out = FALSE; | |
| 1810 cinfo.out_color_space = JCS_RGB; | |
| 1811 break; | |
| 1812 case JCS_YCCK: | |
| 1813 if (cinfo.num_components != 4) | |
| 1814 goto unsupported; | |
| 1815 switch(comp_hv) { | |
| 1816 case 0x11111111: | |
| 1817 format = BPG_FORMAT_444; | |
| 1818 color_space = BPG_CS_YCbCr; | |
| 1819 break; | |
| 1820 case 0x22111121: | |
| 1821 format = BPG_FORMAT_422; | |
| 1822 color_space = BPG_CS_YCbCr; | |
| 1823 break; | |
| 1824 case 0x22111122: | |
| 1825 format = BPG_FORMAT_420; | |
| 1826 color_space = BPG_CS_YCbCr; | |
| 1827 break; | |
| 1828 default: | |
| 1829 cinfo.raw_data_out = FALSE; | |
| 1830 format = BPG_FORMAT_444; | |
| 1831 cinfo.out_color_space = JCS_CMYK; | |
| 1832 color_space = BPG_CS_RGB; | |
| 1833 break; | |
| 1834 } | |
| 1835 has_w_plane = 1; | |
| 1836 break; | |
| 1837 case JCS_CMYK: | |
| 1838 if (cinfo.num_components != 4) | |
| 1839 goto unsupported; | |
| 1840 format = BPG_FORMAT_444; | |
| 1841 color_space = BPG_CS_RGB; | |
| 1842 has_w_plane = 1; | |
| 1843 cinfo.raw_data_out = FALSE; | |
| 1844 cinfo.out_color_space = JCS_CMYK; | |
| 1845 break; | |
| 1846 default: | |
| 1847 unsupported: | |
| 1848 fprintf(stderr, "Unsupported JPEG parameters (cs=%d n_comp=%d comp_hv=%x)\n", | |
| 1849 cinfo.jpeg_color_space, cinfo.num_components, comp_hv); | |
| 1850 img = NULL; | |
| 1851 goto the_end; | |
| 1852 } | |
| 1853 | |
| 1854 v_shift = (format == BPG_FORMAT_420); | |
| 1855 h_shift = (format == BPG_FORMAT_422 || format == BPG_FORMAT_420); | |
| 1856 has_alpha = (cinfo.num_components == 4); | |
| 1857 img = image_alloc(w, h, format, has_alpha, color_space, out_bit_depth); | |
| 1858 img->has_w_plane = has_w_plane; | |
| 1859 | |
| 1860 convert_init(cvt, 8, out_bit_depth, color_space, 0); | |
| 1861 | |
| 1862 jpeg_start_decompress(&cinfo); | |
| 1863 | |
| 1864 if (color_space == BPG_CS_RGB) { | |
| 1865 plane_idx[0] = 2; | |
| 1866 plane_idx[1] = 0; | |
| 1867 plane_idx[2] = 1; | |
| 1868 } else { | |
| 1869 plane_idx[0] = 0; | |
| 1870 plane_idx[1] = 1; | |
| 1871 plane_idx[2] = 2; | |
| 1872 } | |
| 1873 plane_idx[3] = 3; | |
|
5
524eae707ba4
Cosmetics: Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
1874 |
| 0 | 1875 if (cinfo.raw_data_out) { |
| 1876 JSAMPROW rows[4][16]; | |
| 1877 JSAMPROW *plane_pointer[4]; | |
| 1878 | |
| 1879 y_h = 8 * cinfo.max_v_samp_factor; | |
| 1880 if (cinfo.num_components == 1) { | |
| 1881 c_h = 0; | |
| 1882 c_w = 0; | |
| 1883 } else { | |
| 1884 c_h = 8; | |
| 1885 if (h_shift) | |
| 1886 c_w = (w + 1) / 2; | |
| 1887 else | |
| 1888 c_w = w; | |
| 1889 } | |
| 1890 w1 = (w + 15) & ~15; | |
| 1891 for(c_idx = 0; c_idx < cinfo.num_components; c_idx++) { | |
| 1892 if (c_idx == 1 || c_idx == 2) { | |
| 1893 h1 = c_h; | |
| 1894 } else { | |
| 1895 h1 = y_h; | |
| 1896 } | |
| 1897 for(i = 0; i < h1; i++) { | |
| 1898 rows[c_idx][i] = malloc(w1); | |
| 1899 } | |
| 1900 plane_pointer[c_idx] = rows[c_idx]; | |
| 1901 } | |
|
5
524eae707ba4
Cosmetics: Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
1902 |
| 0 | 1903 while (cinfo.output_scanline < cinfo.output_height) { |
| 1904 y = cinfo.output_scanline; | |
| 1905 jpeg_read_raw_data(&cinfo, plane_pointer, y_h); | |
|
5
524eae707ba4
Cosmetics: Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
1906 |
| 0 | 1907 for(c_idx = 0; c_idx < cinfo.num_components; c_idx++) { |
| 1908 if (c_idx == 1 || c_idx == 2) { | |
| 1909 h1 = c_h; | |
| 1910 w1 = c_w; | |
| 1911 y1 = (y >> v_shift); | |
| 1912 } else { | |
| 1913 h1 = y_h; | |
| 1914 w1 = img->w; | |
| 1915 y1 = y; | |
| 1916 } | |
| 1917 idx = plane_idx[c_idx]; | |
| 1918 for(i = 0; i < h1; i++) { | |
| 1919 PIXEL *ptr; | |
|
5
524eae707ba4
Cosmetics: Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
1920 ptr = (PIXEL *)(img->data[idx] + |
| 0 | 1921 img->linesize[idx] * (y1 + i)); |
| 1922 gray8_to_gray(cvt, ptr, rows[c_idx][i], w1, 1); | |
| 1923 if (color_space == BPG_CS_YCbCr && has_w_plane) { | |
| 1924 /* negate color */ | |
| 1925 if (c_idx == 0) { | |
| 1926 gray_one_minus(cvt, ptr, w1); | |
| 1927 } else if (c_idx <= 2) { | |
| 1928 gray_neg_c(cvt, ptr, w1); | |
| 1929 } | |
| 1930 } | |
| 1931 } | |
| 1932 } | |
| 1933 } | |
|
5
524eae707ba4
Cosmetics: Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
1934 |
| 0 | 1935 for(c_idx = 0; c_idx < cinfo.num_components; c_idx++) { |
| 1936 if (c_idx == 1 || c_idx == 2) { | |
| 1937 h1 = c_h; | |
| 1938 } else { | |
| 1939 h1 = y_h; | |
| 1940 } | |
| 1941 for(i = 0; i < h1; i++) { | |
| 1942 free(rows[c_idx][i]); | |
| 1943 } | |
| 1944 } | |
| 1945 } else { | |
| 1946 JSAMPROW rows[1]; | |
| 1947 uint8_t *buf; | |
| 1948 int c_count; | |
| 1949 | |
| 1950 c_count = 3 + has_w_plane; | |
| 1951 buf = malloc(c_count * w); | |
| 1952 rows[0] = buf; | |
| 1953 while (cinfo.output_scanline < cinfo.output_height) { | |
| 1954 y = cinfo.output_scanline; | |
| 1955 jpeg_read_scanlines(&cinfo, rows, 1); | |
| 1956 | |
| 1957 for(c_idx = 0; c_idx < c_count; c_idx++) { | |
| 1958 idx = plane_idx[c_idx]; | |
|
5
524eae707ba4
Cosmetics: Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
1959 gray8_to_gray(cvt, (PIXEL *)(img->data[idx] + |
| 0 | 1960 img->linesize[idx] * y), |
| 1961 buf + c_idx, w, c_count); | |
| 1962 } | |
| 1963 } | |
| 1964 free(buf); | |
| 1965 } | |
|
5
524eae707ba4
Cosmetics: Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
1966 |
|
9
bfd933ef38b4
Implement some metadata support in TIFF and clean up meta data handling otherwise.
Matti Hamalainen <ccr@tnsp.org>
parents:
8
diff
changeset
|
1967 *pmd = jpeg_get_metadata(cinfo.marker_list); |
| 0 | 1968 |
| 1969 the_end: | |
| 1970 jpeg_finish_decompress(&cinfo); | |
|
5
524eae707ba4
Cosmetics: Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
1971 |
| 0 | 1972 jpeg_destroy_decompress(&cinfo); |
| 1973 return img; | |
| 1974 } | |
| 1975 | |
| 25 | 1976 |
|
4
bbd61622856a
Initial implementation of TIFF format read support via libtiff.
Matti Hamalainen <ccr@tnsp.org>
parents:
3
diff
changeset
|
1977 static const char PROBE_TIFF_MAGIC_LE[] = { 'I', 'I', 42, 0 }; |
|
bbd61622856a
Initial implementation of TIFF format read support via libtiff.
Matti Hamalainen <ccr@tnsp.org>
parents:
3
diff
changeset
|
1978 static const char PROBE_TIFF_MAGIC_BE[] = { 'M', 'M', 0, 42 }; |
|
bbd61622856a
Initial implementation of TIFF format read support via libtiff.
Matti Hamalainen <ccr@tnsp.org>
parents:
3
diff
changeset
|
1979 #define PROBE_BUF_SIZE 8 |
|
bbd61622856a
Initial implementation of TIFF format read support via libtiff.
Matti Hamalainen <ccr@tnsp.org>
parents:
3
diff
changeset
|
1980 |
| 0 | 1981 Image *load_image(BPGMetaData **pmd, const char *infilename, |
| 1982 BPGColorSpaceEnum color_space, int bit_depth, | |
| 1983 int limited_range, int premultiplied_alpha) | |
| 1984 { | |
| 1985 FILE *f; | |
|
3
ffcd1967fb5c
Clean up load_image() probing code a bit in preparation for TIFF support.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
1986 Image *img = NULL; |
|
ffcd1967fb5c
Clean up load_image() probing code a bit in preparation for TIFF support.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
1987 uint8_t buf[PROBE_BUF_SIZE]; |
| 0 | 1988 |
| 1989 *pmd = NULL; | |
| 1990 | |
|
3
ffcd1967fb5c
Clean up load_image() probing code a bit in preparation for TIFF support.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
1991 if ((f = fopen(infilename, "rb")) == NULL) |
| 0 | 1992 return NULL; |
|
3
ffcd1967fb5c
Clean up load_image() probing code a bit in preparation for TIFF support.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
1993 |
|
ffcd1967fb5c
Clean up load_image() probing code a bit in preparation for TIFF support.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
1994 if (fread(buf, 1, PROBE_BUF_SIZE, f) != PROBE_BUF_SIZE) |
|
ffcd1967fb5c
Clean up load_image() probing code a bit in preparation for TIFF support.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
1995 goto err; |
|
ffcd1967fb5c
Clean up load_image() probing code a bit in preparation for TIFF support.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
1996 |
|
ffcd1967fb5c
Clean up load_image() probing code a bit in preparation for TIFF support.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
1997 fseek(f, 0, SEEK_SET); |
|
ffcd1967fb5c
Clean up load_image() probing code a bit in preparation for TIFF support.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
1998 |
|
ffcd1967fb5c
Clean up load_image() probing code a bit in preparation for TIFF support.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
1999 if (png_sig_cmp(buf, 0, PROBE_BUF_SIZE) == 0) |
|
8
5a1eec3c43cc
Get rid of indirect metadata variable sillyness in load_image().
Matti Hamalainen <ccr@tnsp.org>
parents:
7
diff
changeset
|
2000 img = read_png(pmd, f, color_space, bit_depth, limited_range, premultiplied_alpha); |
|
3
ffcd1967fb5c
Clean up load_image() probing code a bit in preparation for TIFF support.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
2001 else |
|
4
bbd61622856a
Initial implementation of TIFF format read support via libtiff.
Matti Hamalainen <ccr@tnsp.org>
parents:
3
diff
changeset
|
2002 if (memcmp(buf, PROBE_TIFF_MAGIC_LE, sizeof(PROBE_TIFF_MAGIC_LE)) == 0 || |
|
bbd61622856a
Initial implementation of TIFF format read support via libtiff.
Matti Hamalainen <ccr@tnsp.org>
parents:
3
diff
changeset
|
2003 memcmp(buf, PROBE_TIFF_MAGIC_BE, sizeof(PROBE_TIFF_MAGIC_BE)) == 0) |
|
8
5a1eec3c43cc
Get rid of indirect metadata variable sillyness in load_image().
Matti Hamalainen <ccr@tnsp.org>
parents:
7
diff
changeset
|
2004 img = read_tiff(pmd, infilename, color_space, bit_depth, limited_range, premultiplied_alpha); |
|
4
bbd61622856a
Initial implementation of TIFF format read support via libtiff.
Matti Hamalainen <ccr@tnsp.org>
parents:
3
diff
changeset
|
2005 else |
|
8
5a1eec3c43cc
Get rid of indirect metadata variable sillyness in load_image().
Matti Hamalainen <ccr@tnsp.org>
parents:
7
diff
changeset
|
2006 img = read_jpeg(pmd, f, bit_depth); |
|
3
ffcd1967fb5c
Clean up load_image() probing code a bit in preparation for TIFF support.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
2007 |
|
ffcd1967fb5c
Clean up load_image() probing code a bit in preparation for TIFF support.
Matti Hamalainen <ccr@tnsp.org>
parents:
0
diff
changeset
|
2008 err: |
| 0 | 2009 fclose(f); |
| 2010 return img; | |
| 2011 } | |
| 2012 | |
| 2013 void save_yuv1(Image *img, FILE *f) | |
| 2014 { | |
| 2015 int c_w, c_h, i, c_count, y; | |
| 2016 | |
| 2017 if (img->format == BPG_FORMAT_GRAY) | |
| 2018 c_count = 1; | |
| 2019 else | |
| 2020 c_count = 3; | |
| 2021 for(i = 0; i < c_count; i++) { | |
| 2022 get_plane_res(img, &c_w, &c_h, i); | |
| 2023 for(y = 0; y < c_h; y++) { | |
|
5
524eae707ba4
Cosmetics: Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
2024 fwrite(img->data[i] + y * img->linesize[i], |
| 0 | 2025 1, c_w << img->pixel_shift, f); |
| 2026 } | |
| 2027 } | |
| 2028 } | |
| 2029 | |
| 2030 void save_yuv(Image *img, const char *filename) | |
| 2031 { | |
| 2032 FILE *f; | |
| 2033 | |
| 2034 f = fopen(filename, "wb"); | |
| 2035 if (!f) { | |
| 2036 fprintf(stderr, "Could not open %s\n", filename); | |
| 2037 exit(1); | |
| 2038 } | |
| 2039 save_yuv1(img, f); | |
| 2040 fclose(f); | |
| 2041 } | |
| 2042 | |
| 2043 /* return the position of the end of the NAL or -1 if error */ | |
| 2044 static int find_nal_end(const uint8_t *buf, int buf_len) | |
| 2045 { | |
| 2046 int idx; | |
| 2047 | |
| 2048 idx = 0; | |
| 2049 if (buf_len >= 4 && | |
| 2050 buf[0] == 0 && buf[1] == 0 && buf[2] == 0 && buf[3] == 1) { | |
| 2051 idx = 4; | |
| 2052 } else if (buf_len >= 3 && | |
| 2053 buf[0] == 0 && buf[1] == 0 && buf[2] == 1) { | |
| 2054 idx = 3; | |
| 2055 } else { | |
| 2056 return -1; | |
| 2057 } | |
| 2058 /* NAL header */ | |
| 2059 if (idx + 2 > buf_len) | |
| 2060 return -1; | |
| 2061 /* find the last byte */ | |
| 2062 for(;;) { | |
| 2063 if (idx + 2 >= buf_len) { | |
| 2064 idx = buf_len; | |
| 2065 break; | |
| 2066 } | |
| 2067 if (buf[idx] == 0 && buf[idx + 1] == 0 && buf[idx + 2] == 1) | |
| 2068 break; | |
| 2069 if (idx + 3 < buf_len && | |
| 2070 buf[idx] == 0 && buf[idx + 1] == 0 && buf[idx + 2] == 0 && buf[idx + 3] == 1) | |
| 2071 break; | |
| 2072 idx++; | |
| 2073 } | |
| 2074 return idx; | |
| 2075 } | |
| 2076 | |
| 2077 /* return the position of the end of the NAL or -1 if error */ | |
|
5
524eae707ba4
Cosmetics: Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
2078 static int extract_nal(uint8_t **pnal_buf, int *pnal_len, |
| 0 | 2079 const uint8_t *buf, int buf_len) |
| 2080 { | |
| 2081 int idx, start, end, len; | |
| 2082 uint8_t *nal_buf; | |
| 2083 int nal_len; | |
| 2084 | |
| 2085 end = find_nal_end(buf, buf_len); | |
| 2086 if (end < 0) | |
| 2087 return -1; | |
| 2088 if (buf[2] == 1) | |
| 2089 start = 3; | |
| 2090 else | |
| 2091 start = 4; | |
| 2092 len = end - start; | |
|
5
524eae707ba4
Cosmetics: Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
2093 |
| 0 | 2094 nal_buf = malloc(len); |
| 2095 nal_len = 0; | |
| 2096 idx = start; | |
| 2097 while (idx < end) { | |
| 2098 if (idx + 2 < end && buf[idx] == 0 && buf[idx + 1] == 0 && buf[idx + 2] == 3) { | |
| 2099 nal_buf[nal_len++] = 0; | |
| 2100 nal_buf[nal_len++] = 0; | |
| 2101 idx += 3; | |
| 2102 } else { | |
| 2103 nal_buf[nal_len++] = buf[idx++]; | |
| 2104 } | |
| 2105 } | |
| 2106 while (idx < end) { | |
| 2107 nal_buf[nal_len++] = buf[idx++]; | |
| 2108 } | |
| 2109 *pnal_buf = nal_buf; | |
| 2110 *pnal_len = nal_len; | |
| 2111 return idx; | |
| 2112 } | |
| 2113 | |
| 2114 /* big endian variable length 7 bit encoding */ | |
| 2115 static void put_ue(uint8_t **pp, uint32_t v) | |
| 2116 { | |
| 2117 uint8_t *p = *pp; | |
| 2118 int i, j; | |
|
5
524eae707ba4
Cosmetics: Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
2119 |
| 33 | 2120 for (i = 1; i < 5; i++) { |
| 32 | 2121 if (v < (1U << (7 * i))) |
| 0 | 2122 break; |
| 2123 } | |
| 33 | 2124 for (j = i - 1; j >= 1; j--) |
| 0 | 2125 *p++ = ((v >> (7 * j)) & 0x7f) | 0x80; |
| 2126 *p++ = v & 0x7f; | |
| 2127 *pp = p; | |
| 2128 } | |
| 2129 | |
| 2130 typedef struct { | |
| 2131 const uint8_t *buf; | |
| 2132 int idx; | |
| 2133 int buf_len; | |
| 2134 } GetBitState; | |
| 2135 | |
| 2136 static void init_get_bits(GetBitState *s, const uint8_t *buf, int buf_len) | |
| 2137 { | |
| 2138 s->buf = buf; | |
| 2139 s->buf_len = buf_len; | |
| 2140 s->idx = 0; | |
| 2141 } | |
| 2142 | |
| 2143 static void skip_bits(GetBitState *s, int n) | |
| 2144 { | |
| 2145 s->idx += n; | |
| 2146 } | |
| 2147 | |
| 2148 /* 1 <= n <= 25. return '0' bits if past the end of the buffer. */ | |
| 2149 static uint32_t get_bits(GetBitState *s, int n) | |
| 2150 { | |
| 2151 const uint8_t *buf = s->buf; | |
| 2152 int p, i; | |
| 2153 uint32_t v; | |
| 2154 | |
| 2155 p = s->idx >> 3; | |
| 2156 if ((p + 3) < s->buf_len) { | |
|
5
524eae707ba4
Cosmetics: Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
2157 v = (buf[p] << 24) | (buf[p + 1] << 16) | |
| 0 | 2158 (buf[p + 2] << 8) | buf[p + 3]; |
| 2159 } else { | |
| 2160 v = 0; | |
| 2161 for(i = 0; i < 3; i++) { | |
| 2162 if ((p + i) < s->buf_len) | |
| 2163 v |= buf[p + i] << (24 - i * 8); | |
| 2164 } | |
| 2165 } | |
| 2166 v = (v >> (32 - (s->idx & 7) - n)) & ((1 << n) - 1); | |
| 2167 s->idx += n; | |
| 2168 return v; | |
| 2169 } | |
| 2170 | |
| 2171 /* 1 <= n <= 32 */ | |
| 2172 static uint32_t get_bits_long(GetBitState *s, int n) | |
| 2173 { | |
| 2174 uint32_t v; | |
| 2175 | |
| 2176 if (n <= 25) { | |
| 2177 v = get_bits(s, n); | |
| 2178 } else { | |
| 2179 n -= 16; | |
| 2180 v = get_bits(s, 16) << n; | |
| 2181 v |= get_bits(s, n); | |
| 2182 } | |
| 2183 return v; | |
| 2184 } | |
| 2185 | |
| 2186 /* at most 32 bits are supported */ | |
| 2187 static uint32_t get_ue_golomb(GetBitState *s) | |
| 2188 { | |
| 2189 int i; | |
| 2190 i = 0; | |
| 2191 for(;;) { | |
| 2192 if (get_bits(s, 1)) | |
| 2193 break; | |
| 2194 i++; | |
| 2195 if (i == 32) | |
| 2196 return 0xffffffff; | |
| 2197 } | |
| 2198 if (i == 0) | |
| 2199 return 0; | |
| 2200 else | |
| 2201 return ((1 << i) | get_bits_long(s, i)) - 1; | |
| 2202 } | |
| 2203 | |
| 2204 typedef struct { | |
| 2205 uint8_t *buf; | |
| 2206 int idx; | |
| 2207 } PutBitState; | |
| 2208 | |
| 2209 static void init_put_bits(PutBitState *s, uint8_t *buf) | |
| 2210 { | |
| 2211 s->buf = buf; | |
| 2212 s->idx = 0; | |
| 2213 } | |
| 2214 | |
| 2215 static void put_bit(PutBitState *s, int bit) | |
| 2216 { | |
| 2217 s->buf[s->idx >> 3] |= bit << (7 - (s->idx & 7)); | |
| 2218 s->idx++; | |
| 2219 } | |
| 2220 | |
| 2221 static void put_bits(PutBitState *s, int n, uint32_t v) | |
| 2222 { | |
| 2223 int i; | |
| 2224 | |
| 2225 for(i = 0; i < n; i++) { | |
| 2226 put_bit(s, (v >> (n - 1 - i)) & 1); | |
| 2227 } | |
| 2228 } | |
| 2229 | |
| 2230 static void put_ue_golomb(PutBitState *s, uint32_t v) | |
| 2231 { | |
| 2232 uint32_t a; | |
| 2233 int n; | |
| 2234 | |
| 2235 v++; | |
| 2236 n = 0; | |
| 2237 a = v; | |
| 2238 while (a != 0) { | |
| 2239 a >>= 1; | |
| 2240 n++; | |
| 2241 } | |
| 2242 if (n > 1) | |
| 2243 put_bits(s, n - 1, 0); | |
| 2244 put_bits(s, n, v); | |
| 2245 } | |
| 2246 | |
| 2247 typedef struct { | |
| 2248 uint8_t *buf; | |
| 2249 int size; | |
| 2250 int len; | |
| 2251 } DynBuf; | |
| 2252 | |
| 2253 static void dyn_buf_init(DynBuf *s) | |
| 2254 { | |
| 2255 s->buf = NULL; | |
| 2256 s->size = 0; | |
| 2257 s->len = 0; | |
| 2258 } | |
| 2259 | |
| 2260 static int dyn_buf_resize(DynBuf *s, int size) | |
| 2261 { | |
| 2262 int new_size; | |
| 2263 uint8_t *new_buf; | |
| 2264 | |
| 2265 if (size <= s->size) | |
| 2266 return 0; | |
| 2267 new_size = (s->size * 3) / 2; | |
| 2268 if (new_size < size) | |
| 2269 new_size = size; | |
| 2270 new_buf = realloc(s->buf, new_size); | |
|
5
524eae707ba4
Cosmetics: Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
2271 if (!new_buf) |
| 0 | 2272 return -1; |
| 2273 s->buf = new_buf; | |
| 2274 s->size = new_size; | |
| 2275 return 0; | |
| 2276 } | |
| 2277 | |
| 2278 /* suppress the VPS NAL and keep only the useful part of the SPS | |
| 2279 header. The decoder can rebuild a valid HEVC stream if needed. */ | |
| 2280 static int build_modified_sps(uint8_t **pout_buf, int *pout_buf_len, | |
| 2281 const uint8_t *buf, int buf_len) | |
| 2282 { | |
| 2283 int nal_unit_type, nal_len, idx, i, ret, msps_buf_len; | |
| 2284 int out_buf_len, out_buf_len_max; | |
| 2285 uint8_t *nal_buf, *msps_buf, *out_buf; | |
| 2286 GetBitState gb_s, *gb = &gb_s; | |
| 2287 PutBitState pb_s, *pb = &pb_s; | |
| 2288 uint8_t *p; | |
| 2289 | |
| 2290 idx = extract_nal(&nal_buf, &nal_len, buf, buf_len); | |
| 2291 if (idx < 0) | |
| 2292 return -1; | |
| 2293 if (nal_len < 2) { | |
| 2294 free(nal_buf); | |
| 2295 return -1; | |
| 2296 } | |
| 2297 nal_unit_type = (nal_buf[0] >> 1) & 0x3f; | |
| 2298 free(nal_buf); | |
| 2299 if (nal_unit_type != 32) { | |
| 2300 fprintf(stderr, "expecting VPS nal (%d)\n", nal_unit_type); | |
| 2301 return -1; /* expect VPS nal */ | |
| 2302 } | |
| 2303 | |
| 2304 ret = extract_nal(&nal_buf, &nal_len, buf + idx, buf_len); | |
| 2305 if (ret < 0) | |
| 2306 return -1; | |
| 2307 idx += ret; | |
| 2308 if (nal_len < 2) | |
| 2309 return -1; | |
| 2310 nal_unit_type = (nal_buf[0] >> 1) & 0x3f; | |
| 2311 if (nal_unit_type != 33) { | |
| 2312 fprintf(stderr, "expecting SPS nal (%d)\n", nal_unit_type); | |
| 2313 return -1; /* expect SPS nal */ | |
| 2314 } | |
| 2315 | |
| 2316 /* skip the initial part of the SPS up to and including | |
| 2317 log2_min_cb_size */ | |
| 2318 { | |
| 32 | 2319 int vps_id, max_sub_layers, sps_id; |
| 2320 int chroma_format_idc; | |
| 2321 int log2_max_poc_lsb, log2_min_cb_size; | |
| 0 | 2322 int log2_diff_max_min_coding_block_size, log2_min_tb_size; |
| 2323 int log2_diff_max_min_transform_block_size; | |
| 2324 int max_transform_hierarchy_depth_inter; | |
| 2325 int max_transform_hierarchy_depth_intra; | |
| 2326 int scaling_list_enable_flag, amp_enabled_flag, sao_enabled; | |
| 2327 int pcm_enabled_flag, nb_st_rps; | |
| 2328 int long_term_ref_pics_present_flag, sps_strong_intra_smoothing_enable_flag, vui_present; | |
| 2329 int sps_temporal_mvp_enabled_flag; | |
| 2330 int pcm_sample_bit_depth_luma_minus1; | |
| 2331 int pcm_sample_bit_depth_chroma_minus1; | |
| 2332 int log2_min_pcm_luma_coding_block_size_minus3; | |
| 2333 int log2_diff_max_min_pcm_luma_coding_block_size; | |
| 2334 int pcm_loop_filter_disabled_flag; | |
| 2335 int sps_extension_flag, sps_range_extension_flag, sps_extension_7bits; | |
| 2336 int sps_range_extension_flags; | |
| 2337 | |
| 2338 init_get_bits(gb, nal_buf, nal_len); | |
| 2339 skip_bits(gb, 16); /* nal header */ | |
| 2340 vps_id = get_bits(gb, 4); | |
| 2341 if (vps_id != 0) { | |
| 2342 fprintf(stderr, "VPS id 0 expected\n"); | |
| 2343 return -1; | |
| 2344 } | |
| 2345 max_sub_layers = get_bits(gb, 3); | |
| 2346 if (max_sub_layers != 0) { | |
| 2347 fprintf(stderr, "max_sub_layers == 0 expected\n"); | |
| 2348 return -1; | |
| 2349 } | |
| 2350 skip_bits(gb, 1); /* temporal_id_nesting_flag */ | |
| 2351 /* profile tier level */ | |
| 2352 skip_bits(gb, 2); /* profile_space */ | |
| 2353 skip_bits(gb, 1); /* tier_flag */ | |
| 32 | 2354 skip_bits(gb, 5); /* profile_idc */ |
| 0 | 2355 for(i = 0; i < 32; i++) { |
| 2356 skip_bits(gb, 1); /* profile_compatibility_flag */ | |
| 2357 } | |
| 2358 skip_bits(gb, 1); /* progressive_source_flag */ | |
| 2359 skip_bits(gb, 1); /* interlaced_source_flag */ | |
| 2360 skip_bits(gb, 1); /* non_packed_constraint_flag */ | |
| 2361 skip_bits(gb, 1); /* frame_only_constraint_flag */ | |
| 2362 skip_bits(gb, 44); /* XXX_reserved_zero_44 */ | |
| 2363 skip_bits(gb, 8); /* level_idc */ | |
| 2364 | |
| 2365 sps_id = get_ue_golomb(gb); | |
| 2366 if (sps_id != 0) { | |
| 2367 fprintf(stderr, "SPS id 0 expected (%d)\n", sps_id); | |
| 2368 return -1; | |
| 2369 } | |
| 2370 chroma_format_idc = get_ue_golomb(gb); | |
| 2371 if (chroma_format_idc == 3) { | |
| 2372 get_bits(gb, 1); /* separate_colour_plane_flag */ | |
| 2373 } | |
| 32 | 2374 get_ue_golomb(gb); /* width = get_ue_golomb(gb); */ |
| 2375 get_ue_golomb(gb); /* height = get_ue_golomb(gb); */ | |
| 0 | 2376 /* pic conformance_flag */ |
| 2377 if (get_bits(gb, 1)) { | |
| 2378 get_ue_golomb(gb); /* left_offset */ | |
| 2379 get_ue_golomb(gb); /* right_offset */ | |
| 2380 get_ue_golomb(gb); /* top_offset */ | |
| 2381 get_ue_golomb(gb); /* bottom_offset */ | |
| 2382 } | |
| 32 | 2383 get_ue_golomb(gb); /* bit_depth_luma = get_ue_golomb(gb) + 8; */ |
| 2384 get_ue_golomb(gb); /* bit_depth_chroma = get_ue_golomb(gb) + 8; */ | |
| 0 | 2385 log2_max_poc_lsb = get_ue_golomb(gb) + 4; |
| 2386 if (log2_max_poc_lsb != 8) { | |
| 2387 fprintf(stderr, "log2_max_poc_lsb must be 8 (%d)\n", log2_max_poc_lsb); | |
| 2388 return -1; | |
| 2389 } | |
| 32 | 2390 skip_bits(gb, 1); /* sublayer_ordering_info */ |
| 0 | 2391 get_ue_golomb(gb); /* max_dec_pic_buffering */ |
| 2392 get_ue_golomb(gb); /* num_reorder_pics */ | |
| 2393 get_ue_golomb(gb); /* max_latency_increase */ | |
|
5
524eae707ba4
Cosmetics: Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
2394 |
| 0 | 2395 log2_min_cb_size = get_ue_golomb(gb) + 3; |
| 2396 log2_diff_max_min_coding_block_size = get_ue_golomb(gb); | |
| 2397 log2_min_tb_size = get_ue_golomb(gb) + 2; | |
| 2398 log2_diff_max_min_transform_block_size = get_ue_golomb(gb); | |
|
5
524eae707ba4
Cosmetics: Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
2399 |
| 0 | 2400 max_transform_hierarchy_depth_inter = get_ue_golomb(gb); |
| 2401 max_transform_hierarchy_depth_intra = get_ue_golomb(gb); | |
| 2402 if (max_transform_hierarchy_depth_inter != max_transform_hierarchy_depth_intra) { | |
| 2403 fprintf(stderr, "max_transform_hierarchy_depth_inter must be the same as max_transform_hierarchy_depth_intra (%d %d)\n", max_transform_hierarchy_depth_inter, max_transform_hierarchy_depth_intra); | |
| 2404 return -1; | |
| 2405 } | |
| 2406 | |
| 2407 scaling_list_enable_flag = get_bits(gb, 1); | |
| 2408 if (scaling_list_enable_flag != 0) { | |
| 2409 fprintf(stderr, "scaling_list_enable_flag must be 0\n"); | |
| 2410 return -1; | |
| 2411 } | |
| 2412 amp_enabled_flag = get_bits(gb, 1); | |
| 2413 if (!amp_enabled_flag) { | |
| 2414 fprintf(stderr, "amp_enabled_flag must be set\n"); | |
| 2415 return -1; | |
| 2416 } | |
| 2417 sao_enabled = get_bits(gb, 1); | |
| 2418 pcm_enabled_flag = get_bits(gb, 1); | |
| 2419 if (pcm_enabled_flag) { | |
| 2420 pcm_sample_bit_depth_luma_minus1 = get_bits(gb, 4); | |
| 2421 pcm_sample_bit_depth_chroma_minus1 = get_bits(gb, 4); | |
| 2422 log2_min_pcm_luma_coding_block_size_minus3 = get_ue_golomb(gb); | |
| 2423 log2_diff_max_min_pcm_luma_coding_block_size = get_ue_golomb(gb); | |
| 2424 pcm_loop_filter_disabled_flag = get_bits(gb, 1); | |
| 2425 } | |
| 2426 nb_st_rps = get_ue_golomb(gb); | |
| 2427 if (nb_st_rps != 0) { | |
| 2428 fprintf(stderr, "nb_st_rps must be 0 (%d)\n", nb_st_rps); | |
| 2429 return -1; | |
| 2430 } | |
| 2431 long_term_ref_pics_present_flag = get_bits(gb, 1); | |
| 2432 if (long_term_ref_pics_present_flag) { | |
| 2433 fprintf(stderr, "nlong_term_ref_pics_present_flag must be 0 (%d)\n", nb_st_rps); | |
| 2434 return -1; | |
| 2435 } | |
| 2436 sps_temporal_mvp_enabled_flag = get_bits(gb, 1); | |
| 2437 if (!sps_temporal_mvp_enabled_flag) { | |
| 2438 fprintf(stderr, "sps_temporal_mvp_enabled_flag must be set\n"); | |
| 2439 return -1; | |
| 2440 } | |
| 2441 sps_strong_intra_smoothing_enable_flag = get_bits(gb, 1); | |
| 2442 vui_present = get_bits(gb, 1); | |
| 2443 if (vui_present) { | |
| 2444 int sar_present, sar_idx, overscan_info_present_flag; | |
| 2445 int video_signal_type_present_flag, chroma_loc_info_present_flag; | |
| 2446 int default_display_window_flag, vui_timing_info_present_flag; | |
| 2447 int vui_poc_proportional_to_timing_flag; | |
| 2448 int vui_hrd_parameters_present_flag, bitstream_restriction_flag; | |
| 2449 | |
| 2450 sar_present = get_bits(gb, 1); | |
| 2451 if (sar_present) { | |
| 2452 sar_idx = get_bits(gb, 8); | |
| 2453 if (sar_idx == 255) { | |
|
5
524eae707ba4
Cosmetics: Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
2454 skip_bits(gb, 16); /* sar_num */ |
|
524eae707ba4
Cosmetics: Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
2455 skip_bits(gb, 16); /* sar_den */ |
| 0 | 2456 } |
| 2457 } | |
|
5
524eae707ba4
Cosmetics: Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
2458 |
| 0 | 2459 overscan_info_present_flag = get_bits(gb, 1); |
| 2460 if (overscan_info_present_flag) { | |
| 2461 skip_bits(gb, 1); /* overscan_appropriate_flag */ | |
| 2462 } | |
| 2463 | |
| 2464 video_signal_type_present_flag = get_bits(gb, 1); | |
| 2465 if (video_signal_type_present_flag) { | |
| 2466 fprintf(stderr, "video_signal_type_present_flag must be 0\n"); | |
| 2467 return -1; | |
| 2468 } | |
| 2469 chroma_loc_info_present_flag = get_bits(gb, 1); | |
| 2470 if (chroma_loc_info_present_flag) { | |
| 2471 get_ue_golomb(gb); | |
| 2472 get_ue_golomb(gb); | |
| 2473 } | |
| 2474 skip_bits(gb, 1); /* neutra_chroma_indication_flag */ | |
| 2475 skip_bits(gb, 1); | |
| 2476 skip_bits(gb, 1); | |
| 2477 default_display_window_flag = get_bits(gb, 1); | |
| 2478 if (default_display_window_flag) { | |
| 2479 fprintf(stderr, "default_display_window_flag must be 0\n"); | |
| 2480 return -1; | |
| 2481 } | |
| 2482 vui_timing_info_present_flag = get_bits(gb, 1); | |
| 2483 if (vui_timing_info_present_flag) { | |
| 2484 skip_bits(gb, 32); | |
| 2485 skip_bits(gb, 32); | |
| 2486 vui_poc_proportional_to_timing_flag = get_bits(gb, 1); | |
| 2487 if (vui_poc_proportional_to_timing_flag) { | |
| 2488 get_ue_golomb(gb); | |
| 2489 } | |
| 2490 vui_hrd_parameters_present_flag = get_bits(gb, 1); | |
| 2491 if (vui_hrd_parameters_present_flag) { | |
| 2492 fprintf(stderr, "vui_hrd_parameters_present_flag must be 0\n"); | |
| 2493 return -1; | |
| 2494 } | |
| 2495 } | |
| 2496 bitstream_restriction_flag = get_bits(gb, 1); | |
| 2497 if (bitstream_restriction_flag) { | |
| 2498 skip_bits(gb, 1); | |
| 2499 skip_bits(gb, 1); | |
| 2500 skip_bits(gb, 1); | |
| 2501 get_ue_golomb(gb); | |
| 2502 get_ue_golomb(gb); | |
| 2503 get_ue_golomb(gb); | |
| 2504 get_ue_golomb(gb); | |
| 2505 get_ue_golomb(gb); | |
| 2506 } | |
| 2507 } | |
| 2508 sps_extension_flag = get_bits(gb, 1); | |
| 2509 sps_range_extension_flag = 0; | |
| 2510 sps_range_extension_flags = 0; | |
| 2511 if (sps_extension_flag) { | |
| 2512 sps_range_extension_flag = get_bits(gb, 1); | |
| 2513 sps_extension_7bits = get_bits(gb, 7); | |
| 2514 if (sps_extension_7bits != 0) { | |
| 2515 fprintf(stderr, "sps_extension_7bits must be 0\n"); | |
| 2516 return -1; | |
| 2517 } | |
| 2518 if (sps_range_extension_flag) { | |
| 2519 sps_range_extension_flags = get_bits(gb, 9); | |
|
5
524eae707ba4
Cosmetics: Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
2520 if (sps_range_extension_flags & ((1 << (8 - 3)) | |
|
524eae707ba4
Cosmetics: Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
2521 (1 << (8 - 4)) | |
|
524eae707ba4
Cosmetics: Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
2522 (1 << (8 - 6)) | |
| 0 | 2523 (1 << (8 - 8)))) { |
| 2524 fprintf(stderr, "unsupported range extensions (0x%x)\n", | |
| 2525 sps_range_extension_flags); | |
| 2526 return -1; | |
| 2527 } | |
| 2528 } | |
| 2529 } | |
| 2530 | |
| 2531 /* build the modified SPS */ | |
| 2532 msps_buf = malloc(nal_len + 32); | |
| 2533 memset(msps_buf, 0, nal_len + 16); | |
|
5
524eae707ba4
Cosmetics: Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
2534 |
| 0 | 2535 init_put_bits(pb, msps_buf); |
| 2536 put_ue_golomb(pb, log2_min_cb_size - 3); | |
| 2537 put_ue_golomb(pb, log2_diff_max_min_coding_block_size); | |
| 2538 put_ue_golomb(pb, log2_min_tb_size - 2); | |
| 2539 put_ue_golomb(pb, log2_diff_max_min_transform_block_size); | |
| 2540 put_ue_golomb(pb, max_transform_hierarchy_depth_intra); | |
| 2541 put_bits(pb, 1, sao_enabled); | |
| 2542 put_bits(pb, 1, pcm_enabled_flag); | |
| 2543 if (pcm_enabled_flag) { | |
| 2544 put_bits(pb, 4, pcm_sample_bit_depth_luma_minus1); | |
| 2545 put_bits(pb, 4, pcm_sample_bit_depth_chroma_minus1); | |
| 2546 put_ue_golomb(pb, log2_min_pcm_luma_coding_block_size_minus3); | |
| 2547 put_ue_golomb(pb, log2_diff_max_min_pcm_luma_coding_block_size); | |
| 2548 put_bits(pb, 1, pcm_loop_filter_disabled_flag); | |
| 2549 } | |
| 2550 put_bits(pb, 1, sps_strong_intra_smoothing_enable_flag); | |
| 2551 put_bits(pb, 1, sps_extension_flag); | |
| 2552 if (sps_extension_flag) { | |
| 2553 put_bits(pb, 1, sps_range_extension_flag); | |
| 2554 put_bits(pb, 7, 0); | |
| 2555 if (sps_range_extension_flag) { | |
| 2556 put_bits(pb, 9, sps_range_extension_flags); | |
| 2557 } | |
| 2558 } | |
| 2559 msps_buf_len = (pb->idx + 7) >> 3; | |
| 2560 | |
| 2561 out_buf_len_max = 5 + msps_buf_len; | |
| 2562 out_buf = malloc(out_buf_len_max); | |
| 2563 | |
| 2564 // printf("msps_n_bits=%d\n", pb->idx); | |
| 2565 p = out_buf; | |
| 2566 put_ue(&p, msps_buf_len); /* header length */ | |
| 2567 | |
| 2568 memcpy(p, msps_buf, msps_buf_len); | |
| 2569 p += msps_buf_len; | |
|
5
524eae707ba4
Cosmetics: Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
2570 |
| 0 | 2571 out_buf_len = p - out_buf; |
| 2572 free(msps_buf); | |
| 2573 free(nal_buf); | |
| 2574 } | |
| 2575 *pout_buf = out_buf; | |
| 2576 *pout_buf_len = out_buf_len; | |
| 2577 return idx; | |
| 2578 } | |
| 2579 | |
| 2580 static int add_frame_duration_sei(DynBuf *out_buf, uint16_t frame_ticks) | |
| 2581 { | |
| 2582 uint8_t nal_buf[128], *q; | |
| 2583 int nut, nal_len; | |
| 2584 | |
| 2585 q = nal_buf; | |
| 2586 *q++ = 0x00; | |
| 2587 *q++ = 0x00; | |
| 2588 *q++ = 0x01; | |
| 2589 nut = 39; /* prefix SEI NUT */ | |
| 2590 *q++ = (nut << 1); | |
| 2591 *q++ = 1; | |
| 2592 *q++ = 0xff; /* payload_type = 257 */ | |
| 2593 *q++ = 0x02; | |
| 2594 *q++ = 2; /* payload_size = 2 */ | |
| 2595 *q++ = frame_ticks >> 8; | |
| 2596 *q++ = frame_ticks; | |
| 2597 *q++ = 0x80; /* extra '1' bit and align to byte */ | |
| 2598 /* Note: the 0x00 0x00 b pattern with b <= 3 cannot happen, so no | |
| 2599 need to escape */ | |
| 2600 nal_len = q - nal_buf; | |
| 2601 if (dyn_buf_resize(out_buf, out_buf->len + nal_len) < 0) | |
| 2602 return -1; | |
| 2603 memcpy(out_buf->buf + out_buf->len, nal_buf, nal_len); | |
| 2604 out_buf->len += nal_len; | |
| 2605 return 0; | |
| 2606 } | |
| 2607 | |
|
5
524eae707ba4
Cosmetics: Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
2608 static int build_modified_hevc(uint8_t **pout_buf, |
| 0 | 2609 const uint8_t *cbuf, int cbuf_len, |
| 2610 const uint8_t *abuf, int abuf_len, | |
| 2611 const uint16_t *frame_duration_tab, | |
| 2612 int frame_count) | |
| 2613 { | |
| 2614 DynBuf out_buf_s, *out_buf = &out_buf_s; | |
| 2615 uint8_t *msps; | |
| 2616 const uint8_t *nal_buf; | |
| 2617 int msps_len, cidx, aidx, is_alpha, nal_len, first_nal, start, l, frame_num; | |
|
5
524eae707ba4
Cosmetics: Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
2618 |
| 0 | 2619 dyn_buf_init(out_buf); |
|
5
524eae707ba4
Cosmetics: Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
2620 |
| 0 | 2621 /* add alpha MSPS */ |
| 2622 aidx = 0; /* avoids warning */ | |
| 2623 if (abuf) { | |
| 2624 aidx = build_modified_sps(&msps, &msps_len, abuf, abuf_len); | |
| 2625 if (aidx < 0) | |
| 2626 goto fail; | |
| 2627 if (dyn_buf_resize(out_buf, out_buf->len + msps_len) < 0) | |
| 2628 goto fail; | |
| 2629 memcpy(out_buf->buf + out_buf->len, msps, msps_len); | |
| 2630 out_buf->len += msps_len; | |
| 2631 free(msps); | |
| 2632 } | |
|
5
524eae707ba4
Cosmetics: Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
2633 |
| 0 | 2634 /* add color MSPS */ |
| 2635 cidx = build_modified_sps(&msps, &msps_len, cbuf, cbuf_len); | |
| 2636 if (cidx < 0) | |
| 2637 goto fail; | |
| 2638 if (dyn_buf_resize(out_buf, out_buf->len + msps_len) < 0) | |
| 2639 goto fail; | |
| 2640 memcpy(out_buf->buf + out_buf->len, msps, msps_len); | |
| 2641 out_buf->len += msps_len; | |
| 2642 free(msps); | |
| 2643 | |
| 2644 /* add the remaining NALs, alternating between alpha (if present) | |
| 2645 and color. */ | |
| 2646 is_alpha = (abuf != NULL); | |
| 2647 first_nal = 1; | |
| 2648 frame_num = 0; | |
| 2649 for(;;) { | |
| 2650 if (!is_alpha) { | |
| 2651 if (cidx >= cbuf_len) { | |
| 2652 if (abuf) { | |
| 2653 fprintf(stderr, "Incorrect number of alpha NALs\n"); | |
| 2654 goto fail; | |
| 2655 } | |
| 2656 break; | |
| 2657 } | |
| 2658 nal_buf = cbuf + cidx; | |
| 2659 nal_len = find_nal_end(nal_buf, cbuf_len - cidx); | |
| 2660 // printf("cidx=%d/%d nal_len=%d\n", cidx, cbuf_len, nal_len); | |
| 2661 if (nal_len < 0) | |
| 2662 goto fail; | |
| 2663 cidx += nal_len; | |
| 2664 } else { | |
|
5
524eae707ba4
Cosmetics: Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
2665 if (aidx >= abuf_len) |
| 0 | 2666 break; |
| 2667 nal_buf = abuf + aidx; | |
| 2668 nal_len = find_nal_end(nal_buf, abuf_len - aidx); | |
| 2669 // printf("aidx=%d/%d nal_len=%d\n", aidx, abuf_len, nal_len); | |
| 2670 if (nal_len < 0) | |
| 2671 goto fail; | |
| 2672 aidx += nal_len; | |
| 2673 } | |
| 2674 start = 3 + (nal_buf[2] == 0); | |
| 2675 if (!is_alpha) { | |
| 2676 int nut; | |
| 2677 /* add SEI NAL for the frame duration (animation case) */ | |
| 2678 nut = (nal_buf[start] >> 1) & 0x3f; | |
|
5
524eae707ba4
Cosmetics: Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
2679 if ((nut <= 9 || (nut >= 16 && nut <= 21)) && |
| 0 | 2680 start + 2 < nal_len && (nal_buf[start + 2] & 0x80)) { |
| 2681 int frame_ticks; | |
| 2682 assert(frame_num < frame_count); | |
| 2683 frame_ticks = frame_duration_tab[frame_num]; | |
| 2684 if (frame_ticks > 1) { | |
| 2685 add_frame_duration_sei(out_buf, frame_ticks); | |
| 2686 } | |
| 2687 frame_num++; | |
| 2688 } | |
| 2689 } | |
| 2690 if (first_nal) { | |
| 2691 /* skip first start code */ | |
| 2692 l = start; | |
| 2693 } else { | |
| 2694 l = 0; | |
| 2695 } | |
| 2696 if (dyn_buf_resize(out_buf, out_buf->len + nal_len - l) < 0) | |
| 2697 goto fail; | |
| 2698 // printf("add nal len=%d\n", nal_len - l); | |
| 2699 memcpy(out_buf->buf + out_buf->len, nal_buf + l, nal_len - l); | |
| 2700 if (is_alpha) { | |
| 2701 /* set nul_layer_id of alpha to '1' */ | |
| 2702 out_buf->buf[out_buf->len + (start - l) + 1] |= 1 << 3; | |
| 2703 } | |
| 2704 out_buf->len += nal_len - l; | |
| 2705 | |
| 2706 if (abuf) { | |
| 2707 is_alpha ^= 1; | |
| 2708 } | |
| 2709 first_nal = 0; | |
| 2710 } | |
| 2711 *pout_buf = out_buf->buf; | |
| 2712 return out_buf->len; | |
| 2713 fail: | |
| 2714 free(out_buf->buf); | |
| 2715 return -1; | |
| 2716 } | |
| 2717 | |
| 2718 typedef enum { | |
| 2719 #if defined(USE_X265) | |
| 2720 HEVC_ENCODER_X265, | |
| 2721 #endif | |
| 2722 #if defined(USE_JCTVC) | |
| 2723 HEVC_ENCODER_JCTVC, | |
| 2724 #endif | |
| 2725 | |
| 2726 HEVC_ENCODER_COUNT, | |
| 2727 } HEVCEncoderEnum; | |
| 2728 | |
| 2729 static char *hevc_encoder_name[HEVC_ENCODER_COUNT] = { | |
| 2730 #if defined(USE_X265) | |
| 2731 "x265", | |
| 2732 #endif | |
| 2733 #if defined(USE_JCTVC) | |
| 2734 "jctvc", | |
| 2735 #endif | |
| 2736 }; | |
| 2737 | |
| 2738 static HEVCEncoder *hevc_encoder_tab[HEVC_ENCODER_COUNT] = { | |
| 2739 #if defined(USE_X265) | |
| 2740 &x265_hevc_encoder, | |
| 2741 #endif | |
| 2742 #if defined(USE_JCTVC) | |
| 2743 &jctvc_encoder, | |
| 2744 #endif | |
| 2745 }; | |
| 2746 | |
| 2747 #define IMAGE_HEADER_MAGIC 0x425047fb | |
| 2748 | |
| 2749 #define DEFAULT_OUTFILENAME "out.bpg" | |
| 2750 #define DEFAULT_QP 29 | |
| 2751 #define DEFAULT_BIT_DEPTH 8 | |
| 2752 | |
| 2753 #ifdef RExt__HIGH_BIT_DEPTH_SUPPORT | |
| 2754 #define BIT_DEPTH_MAX 14 | |
| 2755 #else | |
| 2756 #define BIT_DEPTH_MAX 12 | |
| 2757 #endif | |
| 2758 #define DEFAULT_COMPRESS_LEVEL 8 | |
| 2759 | |
| 2760 | |
| 2761 typedef struct BPGEncoderContext BPGEncoderContext; | |
| 2762 | |
| 2763 typedef struct BPGEncoderParameters { | |
| 2764 int qp; /* 0 ... 51 */ | |
| 2765 int alpha_qp; /* -1 ... 51. -1 means same as qp */ | |
| 2766 int lossless; /* true if lossless compression (qp and alpha_qp are | |
| 2767 ignored) */ | |
| 2768 BPGImageFormatEnum preferred_chroma_format; | |
| 2769 int sei_decoded_picture_hash; /* 0, 1 */ | |
| 2770 int compress_level; /* 1 ... 9 */ | |
| 2771 int verbose; | |
| 2772 HEVCEncoderEnum encoder_type; | |
| 2773 int animated; /* 0 ... 1: if true, encode as animated image */ | |
| 2774 uint16_t loop_count; /* animations: number of loops. 0=infinite */ | |
| 2775 /* animations: the frame delay is a multiple of | |
| 2776 frame_delay_num/frame_delay_den seconds */ | |
| 2777 uint16_t frame_delay_num; | |
| 2778 uint16_t frame_delay_den; | |
| 2779 } BPGEncoderParameters; | |
| 2780 | |
| 2781 typedef int BPGEncoderWriteFunc(void *opaque, const uint8_t *buf, int buf_len); | |
| 2782 | |
| 2783 struct BPGEncoderContext { | |
| 2784 BPGEncoderParameters params; | |
| 2785 BPGMetaData *first_md; | |
| 2786 HEVCEncoder *encoder; | |
| 2787 int frame_count; | |
| 2788 HEVCEncoderContext *enc_ctx; | |
| 2789 HEVCEncoderContext *alpha_enc_ctx; | |
| 2790 int frame_ticks; | |
| 2791 uint16_t *frame_duration_tab; | |
| 2792 int frame_duration_tab_size; | |
| 2793 }; | |
| 2794 | |
| 2795 void *mallocz(size_t size) | |
| 2796 { | |
| 2797 void *ptr; | |
| 2798 ptr = malloc(size); | |
| 2799 if (!ptr) | |
| 2800 return NULL; | |
| 2801 memset(ptr, 0, size); | |
| 2802 return ptr; | |
| 2803 } | |
| 2804 | |
| 2805 BPGEncoderParameters *bpg_encoder_param_alloc(void) | |
| 2806 { | |
| 2807 BPGEncoderParameters *p; | |
| 2808 p = mallocz(sizeof(BPGEncoderParameters)); | |
| 2809 if (!p) | |
| 2810 return NULL; | |
| 2811 p->qp = DEFAULT_QP; | |
| 2812 p->alpha_qp = -1; | |
| 2813 p->preferred_chroma_format = BPG_FORMAT_420; | |
| 2814 p->compress_level = DEFAULT_COMPRESS_LEVEL; | |
| 2815 p->frame_delay_num = 1; | |
| 2816 p->frame_delay_den = 25; | |
| 2817 p->loop_count = 0; | |
| 2818 return p; | |
| 2819 } | |
| 2820 | |
| 2821 void bpg_encoder_param_free(BPGEncoderParameters *p) | |
| 2822 { | |
| 2823 free(p); | |
| 2824 } | |
| 2825 | |
| 2826 BPGEncoderContext *bpg_encoder_open(BPGEncoderParameters *p) | |
| 2827 { | |
| 2828 BPGEncoderContext *s; | |
| 2829 | |
| 2830 s = mallocz(sizeof(BPGEncoderContext)); | |
| 2831 if (!s) | |
| 2832 return NULL; | |
| 2833 s->params = *p; | |
| 2834 s->encoder = hevc_encoder_tab[s->params.encoder_type]; | |
| 2835 s->frame_ticks = 1; | |
| 2836 return s; | |
| 2837 } | |
| 2838 | |
|
5
524eae707ba4
Cosmetics: Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
2839 void bpg_encoder_set_extension_data(BPGEncoderContext *s, |
| 0 | 2840 BPGMetaData *md) |
| 2841 { | |
| 2842 s->first_md = md; | |
| 2843 } | |
| 2844 | |
|
5
524eae707ba4
Cosmetics: Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
2845 static int bpg_encoder_encode_trailer(BPGEncoderContext *s, |
| 0 | 2846 BPGEncoderWriteFunc *write_func, |
| 2847 void *opaque) | |
| 2848 { | |
| 2849 uint8_t *out_buf, *alpha_buf, *hevc_buf; | |
| 2850 int out_buf_len, alpha_buf_len, hevc_buf_len; | |
| 2851 | |
| 2852 out_buf_len = s->encoder->close(s->enc_ctx, &out_buf); | |
| 2853 if (out_buf_len < 0) { | |
| 2854 fprintf(stderr, "Error while encoding picture\n"); | |
| 2855 exit(1); | |
| 2856 } | |
| 2857 s->enc_ctx = NULL; | |
|
5
524eae707ba4
Cosmetics: Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
2858 |
| 0 | 2859 alpha_buf = NULL; |
| 2860 alpha_buf_len = 0; | |
| 2861 if (s->alpha_enc_ctx) { | |
| 2862 alpha_buf_len = s->encoder->close(s->alpha_enc_ctx, &alpha_buf); | |
| 2863 if (alpha_buf_len < 0) { | |
| 2864 fprintf(stderr, "Error while encoding picture (alpha plane)\n"); | |
| 2865 exit(1); | |
| 2866 } | |
| 2867 s->alpha_enc_ctx = NULL; | |
| 2868 } | |
|
5
524eae707ba4
Cosmetics: Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
2869 |
| 0 | 2870 hevc_buf = NULL; |
| 2871 hevc_buf_len = build_modified_hevc(&hevc_buf, out_buf, out_buf_len, | |
| 2872 alpha_buf, alpha_buf_len, | |
| 2873 s->frame_duration_tab, s->frame_count); | |
| 2874 if (hevc_buf_len < 0) { | |
| 2875 fprintf(stderr, "Error while creating HEVC data\n"); | |
| 2876 exit(1); | |
| 2877 } | |
| 2878 free(out_buf); | |
| 2879 free(alpha_buf); | |
|
5
524eae707ba4
Cosmetics: Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
2880 |
| 0 | 2881 if (write_func(opaque, hevc_buf, hevc_buf_len) != hevc_buf_len) { |
| 2882 fprintf(stderr, "Error while writing HEVC data\n"); | |
| 2883 exit(1); | |
| 2884 } | |
| 2885 free(hevc_buf); | |
| 2886 return 0; | |
| 2887 } | |
| 2888 | |
| 2889 int bpg_encoder_set_frame_duration(BPGEncoderContext *s, int frame_ticks) | |
| 2890 { | |
| 2891 if (frame_ticks >= 1 && frame_ticks <= 65535) { | |
| 2892 s->frame_ticks = frame_ticks; | |
| 2893 return 0; | |
| 2894 } else { | |
| 2895 return -1; | |
| 2896 } | |
| 2897 } | |
| 2898 | |
| 2899 /* Warning: currently 'img' is modified. When encoding animations, img | |
| 2900 = NULL indicates the end of the stream. */ | |
| 2901 int bpg_encoder_encode(BPGEncoderContext *s, Image *img, | |
| 2902 BPGEncoderWriteFunc *write_func, | |
| 2903 void *opaque) | |
| 2904 { | |
| 2905 const BPGEncoderParameters *p = &s->params; | |
| 2906 Image *img_alpha; | |
| 2907 HEVCEncodeParams ep_s, *ep = &ep_s; | |
| 2908 uint8_t *extension_buf; | |
| 2909 int extension_buf_len; | |
| 2910 int cb_size, width, height; | |
| 2911 | |
| 2912 if (p->animated && !img) { | |
| 2913 return bpg_encoder_encode_trailer(s, write_func, opaque); | |
| 2914 } | |
| 2915 | |
| 2916 /* extract the alpha plane */ | |
| 2917 if (img->has_alpha) { | |
| 2918 int c_idx; | |
| 2919 | |
| 2920 img_alpha = malloc(sizeof(Image)); | |
| 2921 memset(img_alpha, 0, sizeof(*img_alpha)); | |
| 2922 if (img->format == BPG_FORMAT_GRAY) | |
| 2923 c_idx = 1; | |
| 2924 else | |
| 2925 c_idx = 3; | |
| 2926 | |
| 2927 img_alpha->w = img->w; | |
| 2928 img_alpha->h = img->h; | |
| 2929 img_alpha->format = BPG_FORMAT_GRAY; | |
| 2930 img_alpha->has_alpha = 0; | |
| 2931 img_alpha->color_space = BPG_CS_YCbCr; | |
| 2932 img_alpha->bit_depth = img->bit_depth; | |
| 2933 img_alpha->pixel_shift = img->pixel_shift; | |
| 2934 img_alpha->data[0] = img->data[c_idx]; | |
| 2935 img_alpha->linesize[0] = img->linesize[c_idx]; | |
|
5
524eae707ba4
Cosmetics: Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
2936 |
| 0 | 2937 img->data[c_idx] = NULL; |
| 2938 img->has_alpha = 0; | |
| 2939 } else { | |
| 2940 img_alpha = NULL; | |
| 2941 } | |
| 2942 | |
| 2943 if (img->format == BPG_FORMAT_444 && img->color_space != BPG_CS_RGB) { | |
| 2944 if (p->preferred_chroma_format == BPG_FORMAT_420 || | |
| 2945 p->preferred_chroma_format == BPG_FORMAT_420_VIDEO) { | |
| 2946 int c_h_phase = (p->preferred_chroma_format == BPG_FORMAT_420); | |
| 2947 if (image_ycc444_to_ycc420(img, c_h_phase) != 0) | |
| 2948 goto error_convert; | |
| 2949 } else if (p->preferred_chroma_format == BPG_FORMAT_422 || | |
| 2950 p->preferred_chroma_format == BPG_FORMAT_422_VIDEO) { | |
| 2951 int c_h_phase = (p->preferred_chroma_format == BPG_FORMAT_422); | |
| 2952 if (image_ycc444_to_ycc422(img, c_h_phase) != 0) { | |
| 2953 error_convert: | |
| 2954 fprintf(stderr, "Cannot convert image\n"); | |
| 2955 exit(1); | |
| 2956 } | |
| 2957 } | |
| 2958 } | |
| 2959 | |
| 2960 cb_size = 8; /* XXX: should make it configurable. We assume the | |
| 2961 HEVC encoder uses the same value */ | |
| 2962 width = img->w; | |
| 2963 height = img->h; | |
| 2964 image_pad(img, cb_size); | |
| 2965 if (img_alpha) | |
| 2966 image_pad(img_alpha, cb_size); | |
| 2967 | |
| 2968 /* convert to the allocated pixel width to 8 bit if needed by the | |
| 2969 HEVC encoder */ | |
| 2970 if (img->bit_depth == 8) { | |
| 2971 image_convert16to8(img); | |
| 2972 if (img_alpha) | |
| 2973 image_convert16to8(img_alpha); | |
| 2974 } | |
|
5
524eae707ba4
Cosmetics: Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
2975 |
| 0 | 2976 if (s->frame_count == 0) { |
| 2977 memset(ep, 0, sizeof(*ep)); | |
| 2978 ep->qp = p->qp; | |
| 2979 ep->width = img->w; | |
| 2980 ep->height = img->h; | |
| 2981 ep->chroma_format = img->format; | |
| 2982 ep->bit_depth = img->bit_depth; | |
| 2983 ep->intra_only = !p->animated; | |
| 2984 ep->lossless = p->lossless; | |
| 2985 ep->sei_decoded_picture_hash = p->sei_decoded_picture_hash; | |
| 2986 ep->compress_level = p->compress_level; | |
| 2987 ep->verbose = p->verbose; | |
| 2988 | |
| 2989 s->enc_ctx = s->encoder->open(ep); | |
| 2990 if (!s->enc_ctx) { | |
| 2991 fprintf(stderr, "Error while opening encoder\n"); | |
| 2992 exit(1); | |
| 2993 } | |
| 2994 | |
| 2995 if (img_alpha) { | |
| 2996 if (p->alpha_qp < 0) | |
| 2997 ep->qp = p->qp; | |
| 2998 else | |
| 2999 ep->qp = p->alpha_qp; | |
| 3000 ep->chroma_format = 0; | |
|
5
524eae707ba4
Cosmetics: Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
3001 |
| 0 | 3002 s->alpha_enc_ctx = s->encoder->open(ep); |
| 3003 if (!s->alpha_enc_ctx) { | |
| 3004 fprintf(stderr, "Error while opening alpha encoder\n"); | |
| 3005 exit(1); | |
| 3006 } | |
| 3007 } | |
| 3008 | |
| 3009 /* prepare the extension data */ | |
| 3010 if (p->animated) { | |
| 3011 BPGMetaData *md; | |
| 3012 uint8_t buf[15], *q; | |
| 3013 | |
| 3014 md = bpg_md_alloc(BPG_EXTENSION_TAG_ANIM_CONTROL); | |
| 3015 q = buf; | |
| 3016 put_ue(&q, p->loop_count); | |
| 3017 put_ue(&q, p->frame_delay_num); | |
| 3018 put_ue(&q, p->frame_delay_den); | |
| 3019 md->buf_len = q - buf; | |
| 3020 md->buf = malloc(md->buf_len); | |
| 3021 memcpy(md->buf, buf, md->buf_len); | |
| 3022 md->next = s->first_md; | |
| 3023 s->first_md = md; | |
| 3024 } | |
| 3025 | |
| 3026 extension_buf = NULL; | |
| 3027 extension_buf_len = 0; | |
| 3028 if (s->first_md) { | |
| 3029 BPGMetaData *md1; | |
| 3030 int max_len; | |
| 3031 uint8_t *q; | |
|
5
524eae707ba4
Cosmetics: Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
3032 |
| 0 | 3033 max_len = 0; |
| 3034 for(md1 = s->first_md; md1 != NULL; md1 = md1->next) { | |
| 3035 max_len += md1->buf_len + 5 * 2; | |
| 3036 } | |
| 3037 extension_buf = malloc(max_len); | |
| 3038 q = extension_buf; | |
| 3039 for(md1 = s->first_md; md1 != NULL; md1 = md1->next) { | |
| 3040 put_ue(&q, md1->tag); | |
| 3041 put_ue(&q, md1->buf_len); | |
| 3042 memcpy(q, md1->buf, md1->buf_len); | |
| 3043 q += md1->buf_len; | |
| 3044 } | |
| 3045 extension_buf_len = q - extension_buf; | |
|
5
524eae707ba4
Cosmetics: Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
3046 |
| 0 | 3047 bpg_md_free(s->first_md); |
| 3048 s->first_md = NULL; | |
| 3049 } | |
|
5
524eae707ba4
Cosmetics: Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
3050 |
| 0 | 3051 { |
| 3052 uint8_t img_header[128], *q; | |
| 3053 int v, has_alpha, has_extension, alpha2_flag, alpha1_flag, format; | |
|
5
524eae707ba4
Cosmetics: Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
3054 |
| 0 | 3055 has_alpha = (img_alpha != NULL); |
| 3056 has_extension = (extension_buf_len > 0); | |
|
5
524eae707ba4
Cosmetics: Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
3057 |
|
524eae707ba4
Cosmetics: Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
3058 |
| 0 | 3059 if (has_alpha) { |
| 3060 if (img->has_w_plane) { | |
| 3061 alpha1_flag = 0; | |
| 3062 alpha2_flag = 1; | |
| 3063 } else { | |
| 3064 alpha1_flag = 1; | |
| 3065 alpha2_flag = img->premultiplied_alpha; | |
| 3066 } | |
| 3067 } else { | |
| 3068 alpha1_flag = 0; | |
| 3069 alpha2_flag = 0; | |
| 3070 } | |
|
5
524eae707ba4
Cosmetics: Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
3071 |
| 0 | 3072 q = img_header; |
| 3073 *q++ = (IMAGE_HEADER_MAGIC >> 24) & 0xff; | |
| 3074 *q++ = (IMAGE_HEADER_MAGIC >> 16) & 0xff; | |
| 3075 *q++ = (IMAGE_HEADER_MAGIC >> 8) & 0xff; | |
| 3076 *q++ = (IMAGE_HEADER_MAGIC >> 0) & 0xff; | |
| 3077 | |
| 3078 if (img->c_h_phase == 0 && img->format == BPG_FORMAT_420) | |
| 3079 format = BPG_FORMAT_420_VIDEO; | |
| 3080 else if (img->c_h_phase == 0 && img->format == BPG_FORMAT_422) | |
| 3081 format = BPG_FORMAT_422_VIDEO; | |
| 3082 else | |
| 3083 format = img->format; | |
| 3084 v = (format << 5) | (alpha1_flag << 4) | (img->bit_depth - 8); | |
| 3085 *q++ = v; | |
| 3086 v = (img->color_space << 4) | (has_extension << 3) | | |
| 3087 (alpha2_flag << 2) | (img->limited_range << 1) | | |
| 3088 p->animated; | |
| 3089 *q++ = v; | |
| 3090 put_ue(&q, width); | |
| 3091 put_ue(&q, height); | |
|
5
524eae707ba4
Cosmetics: Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
3092 |
| 0 | 3093 put_ue(&q, 0); /* zero length means up to the end of the file */ |
| 3094 if (has_extension) { | |
| 3095 put_ue(&q, extension_buf_len); /* extension data length */ | |
| 3096 } | |
|
5
524eae707ba4
Cosmetics: Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
3097 |
| 0 | 3098 write_func(opaque, img_header, q - img_header); |
|
5
524eae707ba4
Cosmetics: Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
3099 |
| 0 | 3100 if (has_extension) { |
| 3101 if (write_func(opaque, extension_buf, extension_buf_len) != extension_buf_len) { | |
| 3102 fprintf(stderr, "Error while writing extension data\n"); | |
| 3103 exit(1); | |
| 3104 } | |
| 3105 free(extension_buf); | |
| 3106 } | |
| 3107 } | |
| 3108 } | |
| 3109 | |
| 3110 /* store the frame duration */ | |
| 3111 if ((s->frame_count + 1) > s->frame_duration_tab_size) { | |
| 3112 s->frame_duration_tab_size = (s->frame_duration_tab_size * 3) / 2; | |
| 3113 if (s->frame_duration_tab_size < (s->frame_count + 1)) | |
| 3114 s->frame_duration_tab_size = (s->frame_count + 1); | |
|
5
524eae707ba4
Cosmetics: Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
3115 s->frame_duration_tab = realloc(s->frame_duration_tab, |
| 0 | 3116 sizeof(s->frame_duration_tab) * s->frame_duration_tab_size); |
| 3117 } | |
| 3118 s->frame_duration_tab[s->frame_count] = s->frame_ticks; | |
| 3119 | |
| 3120 s->encoder->encode(s->enc_ctx, img); | |
|
5
524eae707ba4
Cosmetics: Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
3121 |
| 0 | 3122 if (img_alpha) { |
| 3123 s->encoder->encode(s->alpha_enc_ctx, img_alpha); | |
| 3124 image_free(img_alpha); | |
| 3125 } | |
|
5
524eae707ba4
Cosmetics: Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
3126 |
| 0 | 3127 s->frame_count++; |
| 3128 | |
| 3129 if (!p->animated) | |
| 3130 bpg_encoder_encode_trailer(s, write_func, opaque); | |
| 3131 | |
| 3132 return 0; | |
| 3133 } | |
| 3134 | |
| 3135 void bpg_encoder_close(BPGEncoderContext *s) | |
| 3136 { | |
| 3137 free(s->frame_duration_tab); | |
| 3138 bpg_md_free(s->first_md); | |
| 3139 free(s); | |
| 3140 } | |
| 3141 | |
| 3142 static int my_write_func(void *opaque, const uint8_t *buf, int buf_len) | |
| 3143 { | |
| 3144 FILE *f = opaque; | |
| 3145 return fwrite(buf, 1, buf_len, f); | |
| 3146 } | |
| 3147 | |
| 3148 static int get_filename_num(char *buf, int buf_size, const char *str, int n) | |
| 3149 { | |
|
15
29527d65b71a
Fix assigned-but-unused variable warning.
Matti Hamalainen <ccr@tnsp.org>
parents:
14
diff
changeset
|
3150 const char *p; |
| 0 | 3151 char *q; |
| 3152 int l, c; | |
| 3153 | |
| 3154 q = buf; | |
| 3155 p = str; | |
| 3156 for(;;) { | |
| 3157 c = *p++; | |
| 3158 if (c == '\0') | |
| 3159 break; | |
| 3160 if (c == '%') { | |
| 3161 l = 0; | |
| 3162 for(;;) { | |
| 3163 c = *p; | |
| 3164 if (c < '0' || c > '9') | |
| 3165 break; | |
| 3166 l = l * 10 + (c - '0'); | |
| 3167 p++; | |
| 3168 } | |
| 3169 c = *p++; | |
| 3170 if (c == '%') { | |
| 3171 goto add_char; | |
| 3172 } else if (c != 'd') { | |
| 3173 return -1; | |
| 3174 } | |
| 3175 snprintf(q, buf + buf_size - q, "%0*u", l, n); | |
| 3176 q += strlen(q); | |
|
5
524eae707ba4
Cosmetics: Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
3177 |
| 0 | 3178 } else { |
| 3179 add_char: | |
| 3180 if ((q - buf) < buf_size - 1) | |
| 3181 *q++ = c; | |
| 3182 } | |
| 3183 } | |
| 3184 *q = '\0'; | |
| 3185 return 0; | |
| 3186 } | |
| 3187 | |
| 3188 void help(int is_full) | |
| 3189 { | |
| 3190 char hevc_encoders[128]; | |
| 3191 int i; | |
| 3192 | |
| 3193 hevc_encoders[0] = '\0'; | |
| 3194 for(i = 0; i < HEVC_ENCODER_COUNT; i++) { | |
| 3195 if (i != 0) | |
| 3196 strcat(hevc_encoders, " "); | |
| 3197 strcat(hevc_encoders, hevc_encoder_name[i]); | |
| 3198 } | |
|
5
524eae707ba4
Cosmetics: Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
3199 |
| 0 | 3200 printf("BPG Image Encoder version " CONFIG_BPG_VERSION "\n" |
|
5
524eae707ba4
Cosmetics: Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
3201 "usage: bpgenc [options] infile.[jpg|png|tiff]\n" |
| 0 | 3202 "\n" |
| 3203 "Main options:\n" | |
| 3204 "-h show the full help (including the advanced options)\n" | |
|
28
76a105267445
Move information about -keepmetadata under main options.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
3205 "-keepmetadata keep the metadata (from JPEG: EXIF, ICC profile, XMP,\n" |
|
76a105267445
Move information about -keepmetadata under main options.
Matti Hamalainen <ccr@tnsp.org>
parents:
27
diff
changeset
|
3206 " from PNG: ICC profile, from TIFF: EXIF, ICC and XMP.)\n" |
| 0 | 3207 "-o outfile set output filename (default = %s)\n" |
|
5
524eae707ba4
Cosmetics: Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
3208 "-q qp set quantizer parameter (smaller gives better quality,\n" |
| 0 | 3209 " range: 0-51, default = %d)\n" |
| 3210 "-f cfmt set the preferred chroma format (420, 422, 444,\n" | |
| 3211 " default=420)\n" | |
| 3212 "-c color_space set the preferred color space (ycbcr, rgb, ycgco,\n" | |
| 3213 " ycbcr_bt709, ycbcr_bt2020, default=ycbcr)\n" | |
| 3214 "-b bit_depth set the bit depth (8 to %d, default = %d)\n" | |
| 3215 "-lossless enable lossless mode\n" | |
| 3216 "-e encoder select the HEVC encoder (%s, default = %s)\n" | |
| 3217 "-m level select the compression level (1=fast, 9=slow, default = %d)\n" | |
| 3218 "\n" | |
| 3219 "Animation options:\n" | |
| 3220 "-a generate animations from a sequence of images. Use %%d or\n" | |
| 3221 " %%Nd (N = number of digits) in the filename to specify the\n" | |
| 3222 " image index, starting from 0 or 1.\n" | |
| 3223 "-fps N set the frame rate (default = 25)\n" | |
| 3224 "-loop N set the number of times the animation is played. 0 means\n" | |
| 3225 " infinite (default = 0)\n" | |
| 3226 "-delayfile file text file containing one number per image giving the\n" | |
| 3227 " display delay per image in centiseconds.\n" | |
| 3228 , DEFAULT_OUTFILENAME, DEFAULT_QP, BIT_DEPTH_MAX, DEFAULT_BIT_DEPTH, | |
| 3229 hevc_encoders, hevc_encoder_name[0], DEFAULT_COMPRESS_LEVEL); | |
| 3230 | |
| 3231 if (is_full) { | |
| 3232 printf("\nAdvanced options:\n" | |
| 3233 "-alphaq set quantizer parameter for the alpha channel (default = same as -q value)\n" | |
| 3234 "-premul store the color with premultiplied alpha\n" | |
| 3235 "-limitedrange encode the color data with the limited range of video\n" | |
| 3236 "-hash include MD5 hash in HEVC bitstream\n" | |
| 3237 "-v show debug messages\n" | |
| 25 | 3238 ); |
| 0 | 3239 } |
| 3240 | |
| 3241 exit(1); | |
| 3242 } | |
| 3243 | |
| 3244 struct option long_opts[] = { | |
|
16
86b6c976ef2d
Fix some warnings by adding missing field initializers for long opts.
Matti Hamalainen <ccr@tnsp.org>
parents:
15
diff
changeset
|
3245 { "hash" , no_argument , NULL, 0 }, |
|
86b6c976ef2d
Fix some warnings by adding missing field initializers for long opts.
Matti Hamalainen <ccr@tnsp.org>
parents:
15
diff
changeset
|
3246 { "keepmetadata" , no_argument , NULL, 0 }, |
|
86b6c976ef2d
Fix some warnings by adding missing field initializers for long opts.
Matti Hamalainen <ccr@tnsp.org>
parents:
15
diff
changeset
|
3247 { "alphaq" , required_argument , NULL, 0 }, |
|
86b6c976ef2d
Fix some warnings by adding missing field initializers for long opts.
Matti Hamalainen <ccr@tnsp.org>
parents:
15
diff
changeset
|
3248 { "lossless" , no_argument , NULL, 0 }, |
|
86b6c976ef2d
Fix some warnings by adding missing field initializers for long opts.
Matti Hamalainen <ccr@tnsp.org>
parents:
15
diff
changeset
|
3249 { "limitedrange" , no_argument , NULL, 0 }, |
|
86b6c976ef2d
Fix some warnings by adding missing field initializers for long opts.
Matti Hamalainen <ccr@tnsp.org>
parents:
15
diff
changeset
|
3250 { "premul" , no_argument , NULL, 0 }, |
|
86b6c976ef2d
Fix some warnings by adding missing field initializers for long opts.
Matti Hamalainen <ccr@tnsp.org>
parents:
15
diff
changeset
|
3251 { "loop" , required_argument , NULL, 0 }, |
|
86b6c976ef2d
Fix some warnings by adding missing field initializers for long opts.
Matti Hamalainen <ccr@tnsp.org>
parents:
15
diff
changeset
|
3252 { "fps" , required_argument , NULL, 0 }, |
|
86b6c976ef2d
Fix some warnings by adding missing field initializers for long opts.
Matti Hamalainen <ccr@tnsp.org>
parents:
15
diff
changeset
|
3253 { "delayfile" , required_argument , NULL, 0 }, |
|
86b6c976ef2d
Fix some warnings by adding missing field initializers for long opts.
Matti Hamalainen <ccr@tnsp.org>
parents:
15
diff
changeset
|
3254 { NULL , 0 , NULL, 0 }, |
| 0 | 3255 }; |
| 3256 | |
| 3257 int main(int argc, char **argv) | |
| 3258 { | |
| 3259 const char *infilename, *outfilename, *frame_delay_file; | |
| 3260 Image *img; | |
| 3261 FILE *f; | |
| 3262 int c, option_index; | |
| 3263 int keep_metadata; | |
| 3264 int bit_depth, i, limited_range, premultiplied_alpha; | |
| 3265 BPGColorSpaceEnum color_space; | |
| 3266 BPGMetaData *md; | |
| 3267 BPGEncoderContext *enc_ctx; | |
| 3268 BPGEncoderParameters *p; | |
| 3269 | |
| 3270 p = bpg_encoder_param_alloc(); | |
| 3271 | |
| 3272 outfilename = DEFAULT_OUTFILENAME; | |
| 3273 color_space = BPG_CS_YCbCr; | |
| 3274 keep_metadata = 0; | |
| 3275 bit_depth = DEFAULT_BIT_DEPTH; | |
| 3276 limited_range = 0; | |
| 3277 premultiplied_alpha = 0; | |
| 3278 frame_delay_file = NULL; | |
|
5
524eae707ba4
Cosmetics: Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
3279 |
| 0 | 3280 for(;;) { |
| 3281 c = getopt_long_only(argc, argv, "q:o:hf:c:vm:b:e:a", long_opts, &option_index); | |
| 3282 if (c == -1) | |
| 3283 break; | |
| 3284 switch(c) { | |
| 3285 case 0: | |
| 3286 switch(option_index) { | |
| 3287 case 0: | |
| 3288 p->sei_decoded_picture_hash = 1; | |
| 3289 break; | |
| 3290 case 1: | |
| 3291 keep_metadata = 1; | |
| 3292 break; | |
| 3293 case 2: | |
| 3294 p->alpha_qp = atoi(optarg); | |
| 3295 if (p->alpha_qp < 0 || p->alpha_qp > 51) { | |
| 3296 fprintf(stderr, "alpha_qp must be between 0 and 51\n"); | |
| 3297 exit(1); | |
| 3298 } | |
| 3299 break; | |
| 3300 case 3: | |
| 3301 p->lossless = 1; | |
| 3302 color_space = BPG_CS_RGB; | |
| 3303 p->preferred_chroma_format = BPG_FORMAT_444; | |
| 3304 bit_depth = 8; | |
| 3305 limited_range = 0; | |
| 3306 break; | |
| 3307 case 4: | |
| 3308 limited_range = 1; | |
| 3309 break; | |
| 3310 case 5: | |
| 3311 premultiplied_alpha = 1; | |
| 3312 break; | |
| 3313 case 6: | |
| 3314 p->loop_count = strtoul(optarg, NULL, 0); | |
| 3315 break; | |
| 3316 case 7: | |
| 3317 p->frame_delay_num = 1; | |
| 3318 p->frame_delay_den = strtoul(optarg, NULL, 0); | |
| 3319 if (p->frame_delay_den == 0) { | |
| 3320 fprintf(stderr, "invalid frame rate\n"); | |
| 3321 exit(1); | |
| 3322 } | |
| 3323 break; | |
| 3324 case 8: | |
| 3325 frame_delay_file = optarg; | |
| 3326 break; | |
| 3327 default: | |
| 3328 goto show_help; | |
| 3329 } | |
| 3330 break; | |
| 3331 case 'h': | |
| 3332 show_help: | |
| 3333 help(1); | |
| 3334 break; | |
| 3335 case 'q': | |
| 3336 p->qp = atoi(optarg); | |
| 3337 if (p->qp < 0 || p->qp > 51) { | |
| 3338 fprintf(stderr, "qp must be between 0 and 51\n"); | |
| 3339 exit(1); | |
| 3340 } | |
| 3341 break; | |
| 3342 case 'o': | |
| 3343 outfilename = optarg; | |
| 3344 break; | |
| 3345 case 'f': | |
| 3346 if (!strcmp(optarg, "420")) { | |
| 3347 p->preferred_chroma_format = BPG_FORMAT_420; | |
| 3348 } else if (!strcmp(optarg, "422")) { | |
| 3349 p->preferred_chroma_format = BPG_FORMAT_422; | |
| 3350 } else if (!strcmp(optarg, "444")) { | |
| 3351 p->preferred_chroma_format = BPG_FORMAT_444; | |
| 3352 } else if (!strcmp(optarg, "422_video")) { | |
| 3353 p->preferred_chroma_format = BPG_FORMAT_422_VIDEO; | |
| 3354 } else if (!strcmp(optarg, "420_video")) { | |
| 3355 p->preferred_chroma_format = BPG_FORMAT_420_VIDEO; | |
| 3356 } else { | |
| 3357 fprintf(stderr, "Invalid chroma format\n"); | |
| 3358 exit(1); | |
| 3359 } | |
| 3360 break; | |
| 3361 case 'c': | |
| 3362 if (!strcmp(optarg, "ycbcr")) { | |
| 3363 color_space = BPG_CS_YCbCr; | |
| 3364 } else if (!strcmp(optarg, "rgb")) { | |
| 3365 color_space = BPG_CS_RGB; | |
| 3366 p->preferred_chroma_format = BPG_FORMAT_444; | |
| 3367 } else if (!strcmp(optarg, "ycgco")) { | |
| 3368 color_space = BPG_CS_YCgCo; | |
| 3369 } else if (!strcmp(optarg, "ycbcr_bt709")) { | |
| 3370 color_space = BPG_CS_YCbCr_BT709; | |
| 3371 } else if (!strcmp(optarg, "ycbcr_bt2020")) { | |
| 3372 color_space = BPG_CS_YCbCr_BT2020; | |
| 3373 } else { | |
| 3374 fprintf(stderr, "Invalid color space format\n"); | |
| 3375 exit(1); | |
| 3376 } | |
| 3377 break; | |
| 3378 case 'm': | |
| 3379 p->compress_level = atoi(optarg); | |
| 3380 if (p->compress_level < 1) | |
| 3381 p->compress_level = 1; | |
| 3382 else if (p->compress_level > 9) | |
| 3383 p->compress_level = 9; | |
| 3384 break; | |
| 3385 case 'b': | |
| 3386 bit_depth = atoi(optarg); | |
| 3387 if (bit_depth < 8 || bit_depth > BIT_DEPTH_MAX) { | |
| 3388 fprintf(stderr, "Invalid bit depth (range: 8 to %d)\n", | |
| 3389 BIT_DEPTH_MAX); | |
| 3390 exit(1); | |
| 3391 } | |
| 3392 break; | |
| 3393 case 'v': | |
| 3394 p->verbose++; | |
| 3395 break; | |
| 3396 case 'e': | |
| 3397 for(i = 0; i < HEVC_ENCODER_COUNT; i++) { | |
| 3398 if (!strcmp(optarg, hevc_encoder_name[i])) | |
| 3399 break; | |
| 3400 } | |
| 3401 if (i == HEVC_ENCODER_COUNT) { | |
| 3402 fprintf(stderr, "Unsupported encoder. Available ones are:"); | |
| 3403 for(i = 0; i < HEVC_ENCODER_COUNT; i++) { | |
| 3404 fprintf(stderr, " %s", hevc_encoder_name[i]); | |
| 3405 } | |
| 3406 fprintf(stderr, "\n"); | |
| 3407 exit(1); | |
| 3408 } | |
| 3409 p->encoder_type = i; | |
| 3410 break; | |
| 3411 case 'a': | |
| 3412 p->animated = 1; | |
| 3413 break; | |
| 3414 default: | |
| 3415 exit(1); | |
| 3416 } | |
| 3417 } | |
| 3418 | |
|
5
524eae707ba4
Cosmetics: Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
3419 if (optind >= argc) |
| 0 | 3420 help(0); |
| 3421 infilename = argv[optind]; | |
| 3422 | |
| 3423 f = fopen(outfilename, "wb"); | |
| 3424 if (!f) { | |
| 3425 perror(outfilename); | |
| 3426 exit(1); | |
| 3427 } | |
| 3428 | |
| 3429 enc_ctx = bpg_encoder_open(p); | |
| 3430 if (!enc_ctx) { | |
| 3431 fprintf(stderr, "Could not open BPG encoder\n"); | |
| 3432 exit(1); | |
| 3433 } | |
| 3434 | |
| 3435 if (p->animated) { | |
| 3436 int frame_num, first_frame, frame_ticks; | |
| 3437 char filename[1024]; | |
| 3438 FILE *f1; | |
| 3439 | |
| 3440 if (frame_delay_file) { | |
| 3441 f1 = fopen(frame_delay_file, "r"); | |
| 3442 if (!f1) { | |
| 3443 fprintf(stderr, "Could not open '%s'\n", frame_delay_file); | |
| 3444 exit(1); | |
| 3445 } | |
| 3446 } else { | |
| 3447 f1 = NULL; | |
| 3448 } | |
| 3449 | |
| 3450 first_frame = 1; | |
| 3451 for(frame_num = 0; ; frame_num++) { | |
| 3452 if (get_filename_num(filename, sizeof(filename), infilename, frame_num) < 0) { | |
| 3453 fprintf(stderr, "Invalid filename syntax: '%s'\n", infilename); | |
| 3454 exit(1); | |
| 3455 } | |
| 3456 img = load_image(&md, filename, color_space, bit_depth, limited_range, | |
| 3457 premultiplied_alpha); | |
| 3458 if (!img) { | |
| 3459 if (frame_num == 0) | |
| 3460 continue; /* accept to start at 0 or 1 */ | |
| 3461 if (first_frame) { | |
| 3462 fprintf(stderr, "Could not read '%s'\n", filename); | |
| 3463 exit(1); | |
| 3464 } else { | |
| 3465 break; | |
| 3466 } | |
| 3467 } | |
| 3468 frame_ticks = 1; | |
| 3469 if (f1) { | |
| 3470 float fdelay; | |
| 3471 if (fscanf(f1, "%f", &fdelay) == 1) { | |
| 3472 frame_ticks = lrint(fdelay * p->frame_delay_den / (p->frame_delay_num * 100)); | |
| 3473 if (frame_ticks < 1) | |
| 3474 frame_ticks = 1; | |
| 3475 } | |
| 3476 } | |
|
5
524eae707ba4
Cosmetics: Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
3477 |
| 0 | 3478 if (p->verbose) |
| 3479 printf("Encoding '%s' ticks=%d\n", filename, frame_ticks); | |
|
5
524eae707ba4
Cosmetics: Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
3480 |
| 0 | 3481 if (keep_metadata && first_frame) { |
| 3482 bpg_encoder_set_extension_data(enc_ctx, md); | |
| 3483 } else { | |
| 3484 bpg_md_free(md); | |
| 3485 } | |
| 3486 bpg_encoder_set_frame_duration(enc_ctx, frame_ticks); | |
| 3487 bpg_encoder_encode(enc_ctx, img, my_write_func, f); | |
| 3488 image_free(img); | |
| 3489 | |
| 3490 first_frame = 0; | |
| 3491 } | |
| 3492 if (f1) | |
| 3493 fclose(f1); | |
| 3494 /* end of stream */ | |
| 3495 bpg_encoder_encode(enc_ctx, NULL, my_write_func, f); | |
| 3496 } else { | |
| 3497 img = load_image(&md, infilename, color_space, bit_depth, limited_range, | |
| 3498 premultiplied_alpha); | |
| 3499 if (!img) { | |
| 3500 fprintf(stderr, "Could not read '%s'\n", infilename); | |
| 3501 exit(1); | |
| 3502 } | |
|
5
524eae707ba4
Cosmetics: Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
3503 |
| 0 | 3504 if (!keep_metadata && md) { |
| 3505 bpg_md_free(md); | |
| 3506 md = NULL; | |
| 3507 } | |
|
5
524eae707ba4
Cosmetics: Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
3508 |
| 0 | 3509 bpg_encoder_set_extension_data(enc_ctx, md); |
|
5
524eae707ba4
Cosmetics: Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
3510 |
| 0 | 3511 bpg_encoder_encode(enc_ctx, img, my_write_func, f); |
| 3512 image_free(img); | |
| 3513 } | |
| 3514 | |
| 3515 fclose(f); | |
|
5
524eae707ba4
Cosmetics: Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
3516 |
| 0 | 3517 bpg_encoder_close(enc_ctx); |
|
5
524eae707ba4
Cosmetics: Remove trailing whitespace.
Matti Hamalainen <ccr@tnsp.org>
parents:
4
diff
changeset
|
3518 |
| 0 | 3519 bpg_encoder_param_free(p); |
| 3520 | |
| 3521 return 0; | |
| 3522 } |