RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-01-13 19:01:03 +00:00
Code Issues Projects Releases Wiki Activity

avcodec/tiff: set color_trc, remove sRGB conversion

Browse Source
This commit is contained in:
Paul B Mahol 2019-08-31 20:57:29 +02:00
parent 63689b16ad
commit d7529b03ba
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libavcodec/tiff.c
View File

@ -773,16 +773,8 @@ static int tiff_unpack_strip(TiffContext *s, AVFrame *p, uint8_t *dst, int strid
return 0; return 0;
} }
static float av_always_inline linear_to_srgb(float value) {
if (value <= 0.0031308f)
return value * 12.92f;
else
return powf(value * 1.055f, 1.0f / 2.4f) - 0.055f;
}
/** /**
* Map stored raw sensor values into linear reference values (see: DNG Specification - Chapter 5) * Map stored raw sensor values into linear reference values (see: DNG Specification - Chapter 5)
* Then convert to sRGB color space.
*/ */
static uint16_t av_always_inline dng_process_color16(uint16_t value, static uint16_t av_always_inline dng_process_color16(uint16_t value,
const uint16_t *lut, const uint16_t *lut,
@ -800,8 +792,7 @@ static uint16_t av_always_inline dng_process_color16(uint16_t value,
// Color scaling // Color scaling
value_norm = (float)value * scale_factor; value_norm = (float)value * scale_factor;
// Color space conversion (sRGB) value = av_clip_uint16_c(value_norm * 65535);
value = av_clip_uint16_c((uint16_t)(linear_to_srgb(value_norm) * 0xFFFF));
return value; return value;
} }
@ -1920,6 +1911,13 @@ again:
} }
} }
if (s->photometric == TIFF_PHOTOMETRIC_LINEAR_RAW ||
s->photometric == TIFF_PHOTOMETRIC_CFA) {
p->color_trc = AVCOL_TRC_LINEAR;
} else if (s->photometric == TIFF_PHOTOMETRIC_BLACK_IS_ZERO) {
p->color_trc = AVCOL_TRC_GAMMA22;
}
/* Handle DNG images with JPEG-compressed tiles */ /* Handle DNG images with JPEG-compressed tiles */
if (is_dng && s->is_tiled) { if (is_dng && s->is_tiled) {