virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

avcodec/tiff: improve lut handling for DNG

Browse Source
This commit is contained in:
Paul B Mahol
2022-09-23 17:30:55 +02:00
parent 6c23391064
commit ec8be8a913
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/tiff.c
View File

@@ -283,16 +283,15 @@ static uint16_t av_always_inline dng_process_color16(uint16_t value,
float value_norm; float value_norm;
// Lookup table lookup // Lookup table lookup
if (lut)
value = lut[value]; value = lut[value];
// Black level subtraction // Black level subtraction
value = av_clip_uint16_c((unsigned)value - black_level); value = av_clip_uint16_c((unsigned)value - black_level);
// Color scaling // Color scaling
value_norm = (float)value * scale_factor; value_norm = (float)value * scale_factor * 65535.f;
value = av_clip_uint16_c(value_norm * 65535); value = av_clip_uint16_c(lrintf(value_norm));
return value; return value;
} }
@@ -1414,6 +1413,7 @@ static int tiff_decode_tag(TiffContext *s, AVFrame *frame)
else if (count > 1) else if (count > 1)
s->sub_ifd = ff_tget(&s->gb, TIFF_LONG, s->le); /** Only get the first SubIFD */ s->sub_ifd = ff_tget(&s->gb, TIFF_LONG, s->le); /** Only get the first SubIFD */
break; break;
case TIFF_GRAY_RESPONSE_CURVE:
case DNG_LINEARIZATION_TABLE: case DNG_LINEARIZATION_TABLE:
if (count > FF_ARRAY_ELEMS(s->dng_lut)) if (count > FF_ARRAY_ELEMS(s->dng_lut))
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;

1
libavcodec/tiff.h
View File

@@ -66,6 +66,7 @@ enum TiffTags {
TIFF_PAGE_NAME = 0x11D, TIFF_PAGE_NAME = 0x11D,
TIFF_XPOS = 0x11E, TIFF_XPOS = 0x11E,
TIFF_YPOS = 0x11F, TIFF_YPOS = 0x11F,
TIFF_GRAY_RESPONSE_CURVE= 0x123,
TIFF_T4OPTIONS = 0x124, TIFF_T4OPTIONS = 0x124,
TIFF_T6OPTIONS, TIFF_T6OPTIONS,
TIFF_RES_UNIT = 0x128, TIFF_RES_UNIT = 0x128,