RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-26 01:02:33 +00:00
Code Issues Projects Releases Wiki Activity

lavc/tiff: Decode 10-bit and 14-bit DNG images

Browse Source 
10-bit sample: http://www.rawsamples.ch/raws/phones/RAW_ONEPLUS_ONE-A0001.DNG
14-bit sample: https://drive.google.com/open?id=0B4JyRT3Lth5HVndyOTVOdWktM3J4TFEydTk1MnY3RWlpSzVB

Signed-off-by: Nick Renieris <velocityra@gmail.com>
This commit is contained in:
Nick Renieris 2019-08-29 16:10:50 +03:00 committed by Paul B Mahol
parent 31acdf4351
commit c44aa7f176
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
libavcodec/tiff.c
View File

@ -309,14 +309,19 @@ static void av_always_inline horizontal_fill(TiffContext *s,
dst[(width+offset)*2+0] = (usePtr ? src[width] : c) >> 4;
}
break;
case 12: {
uint16_t *dst16 = (uint16_t *)dst;
GetBitContext gb;
init_get_bits8(&gb, src, width);
for (int i = 0; i < s->width; i++) {
dst16[i] = get_bits(&gb, 12) << 4;
}
}
case 10:
case 12:
case 14: {
uint16_t *dst16 = (uint16_t *)dst;
int is_dng = (s->tiff_type == TIFF_TYPE_DNG || s->tiff_type == TIFF_TYPE_CINEMADNG);
uint8_t shift = is_dng ? 0 : 16 - bpp;
GetBitContext gb;
init_get_bits8(&gb, src, width);
for (int i = 0; i < s->width; i++) {
dst16[i] = get_bits(&gb, bpp) << shift;
}
}
break;
default:
if (usePtr) {
@ -1067,7 +1072,9 @@ static int init_image(TiffContext *s, ThreadFrame *frame)
return AVERROR_PATCHWELCOME;
}
break;
case 10101:
case 10121:
case 10141:
switch (AV_RL32(s->pattern)) {
case 0x02010100:
s->avctx->pix_fmt = s->le ? AV_PIX_FMT_BAYER_RGGB16LE : AV_PIX_FMT_BAYER_RGGB16BE;