generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Simplify 32bit pam decoding.

Browse Source 
Reviewed-by: Paul B Mahol
This commit is contained in:
Carl Eugen Hoyos 2012-01-19 23:08:12 +01:00
parent 34aadeaa2c
commit b614c14767
3 changed files with 7 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/pnm.c
View File

@ -129,7 +129,7 @@ int ff_pnm_decode_header(AVCodecContext *avctx, PNMContext * const s)
}
} else if (depth == 4) {
if (maxval < 256) {
avctx->pix_fmt = PIX_FMT_RGB32;
avctx->pix_fmt = PIX_FMT_RGBA;
} else {
avctx->pix_fmt = PIX_FMT_RGBA64BE;
}

23
libavcodec/pnmdec.c
View File

@ -67,6 +67,11 @@ static int pnm_decode_frame(AVCodecContext *avctx, void *data,
components=3;
sample_len=16;
goto do_read;
case PIX_FMT_RGBA:
n = avctx->width * 4;
components=4;
sample_len=8;
goto do_read;
case PIX_FMT_RGB24:
n = avctx->width * 3;
components=3;
@ -177,24 +182,6 @@ static int pnm_decode_frame(AVCodecContext *avctx, void *data,
}
}
break;
case PIX_FMT_RGB32:
ptr = p->data[0];
linesize = p->linesize[0];
if (s->bytestream + avctx->width * avctx->height * 4 > s->bytestream_end)
return -1;
for (i = 0; i < avctx->height; i++) {
int j, r, g, b, a;
for (j = 0; j < avctx->width; j++) {
r = *s->bytestream++;
g = *s->bytestream++;
b = *s->bytestream++;
a = *s->bytestream++;
((uint32_t *)ptr)[j] = (a << 24) | (r << 16) | (g << 8) | b;
}
ptr += linesize;
}
break;
}
*picture = *(AVFrame*)&s->picture;
*data_size = sizeof(AVPicture);

2
libavcodec/version.h
View File

@ -22,7 +22,7 @@
#define LIBAVCODEC_VERSION_MAJOR 53
#define LIBAVCODEC_VERSION_MINOR 57
#define LIBAVCODEC_VERSION_MICRO 101
#define LIBAVCODEC_VERSION_MICRO 102
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
LIBAVCODEC_VERSION_MINOR, \