RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-27 09:52:17 +00:00
Code Issues Projects Releases Wiki Activity

lavc/pnm: Allow decoding gray float pfm images.

Browse Source
This commit is contained in:
Carl Eugen Hoyos 2021-02-11 23:37:06 +01:00
parent 9c0b3eddf4
commit ca781761d6
2 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavcodec/pnm.c
View File

@ -72,6 +72,7 @@ int ff_pnm_decode_header(AVCodecContext *avctx, PNMContext * const s)
s->bytestream[0] != 'P' || s->bytestream[0] != 'P' ||
(s->bytestream[1] < '1' || (s->bytestream[1] < '1' ||
s->bytestream[1] > '7' && s->bytestream[1] > '7' &&
s->bytestream[1] != 'f' &&
s->bytestream[1] != 'F')) { s->bytestream[1] != 'F')) {
s->bytestream += s->bytestream_end > s->bytestream; s->bytestream += s->bytestream_end > s->bytestream;
s->bytestream += s->bytestream_end > s->bytestream; s->bytestream += s->bytestream_end > s->bytestream;
@ -82,6 +83,8 @@ int ff_pnm_decode_header(AVCodecContext *avctx, PNMContext * const s)
if (buf1[1] == 'F') { if (buf1[1] == 'F') {
avctx->pix_fmt = AV_PIX_FMT_GBRPF32; avctx->pix_fmt = AV_PIX_FMT_GBRPF32;
} else if (buf1[1] == 'f') {
avctx->pix_fmt = AV_PIX_FMT_GRAYF32;
} else if (s->type==1 || s->type==4) { } else if (s->type==1 || s->type==4) {
avctx->pix_fmt = AV_PIX_FMT_MONOWHITE; avctx->pix_fmt = AV_PIX_FMT_MONOWHITE;
} else if (s->type==2 || s->type==5) { } else if (s->type==2 || s->type==5) {
@ -177,7 +180,7 @@ int ff_pnm_decode_header(AVCodecContext *avctx, PNMContext * const s)
if (ret < 0) if (ret < 0)
return ret; return ret;
if (avctx->pix_fmt == AV_PIX_FMT_GBRPF32) { if (avctx->pix_fmt == AV_PIX_FMT_GBRPF32 || avctx->pix_fmt == AV_PIX_FMT_GRAYF32) {
pnm_get(s, buf1, sizeof(buf1)); pnm_get(s, buf1, sizeof(buf1));
if (av_sscanf(buf1, "%f", &s->scale) != 1 || s->scale == 0.0 || !isfinite(s->scale)) { if (av_sscanf(buf1, "%f", &s->scale) != 1 || s->scale == 0.0 || !isfinite(s->scale)) {
av_log(avctx, AV_LOG_ERROR, "Invalid scale.\n"); av_log(avctx, AV_LOG_ERROR, "Invalid scale.\n");

24
libavcodec/pnmdec.c
View File

@ -297,6 +297,30 @@ static int pnm_decode_frame(AVCodecContext *avctx, void *data,
} }
} }
break; break;
case AV_PIX_FMT_GRAYF32:
if (avctx->width * avctx->height * 4 > s->bytestream_end - s->bytestream)
return AVERROR_INVALIDDATA;
scale = 1.f / s->scale;
if (s->endian) {
float *g = (float *)p->data[0];
for (int i = 0; i < avctx->height; i++) {
for (int j = 0; j < avctx->width; j++) {
g[j] = av_int2float(AV_RL32(s->bytestream)) * scale;
s->bytestream += 4;
}
g += p->linesize[0] / 4;
}
} else {
float *g = (float *)p->data[0];
for (int i = 0; i < avctx->height; i++) {
for (int j = 0; j < avctx->width; j++) {
g[j] = av_int2float(AV_RB32(s->bytestream)) * scale;
s->bytestream += 4;
}
g += p->linesize[0] / 4;
}
}
break;
} }
*got_frame = 1; *got_frame = 1;