X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fpnmdec.c;h=9074d9b28ce3b9a99a391110ccb6ca647eb9241f;hb=f349f4b5502c94943c30001b8a4d75daded3281c;hp=ada0fd8a36834e37169e75e94231de242906f6d9;hpb=562b6c744abdde4e673038fcb0c126a4aadfa6c7;p=ffmpeg diff --git a/libavcodec/pnmdec.c b/libavcodec/pnmdec.c index ada0fd8a368..9074d9b28ce 100644 --- a/libavcodec/pnmdec.c +++ b/libavcodec/pnmdec.c @@ -21,70 +21,66 @@ #include "avcodec.h" #include "bytestream.h" +#include "internal.h" #include "put_bits.h" #include "pnm.h" static int pnm_decode_frame(AVCodecContext *avctx, void *data, - int *data_size, AVPacket *avpkt) + int *got_frame, AVPacket *avpkt) { const uint8_t *buf = avpkt->data; int buf_size = avpkt->size; PNMContext * const s = avctx->priv_data; - AVFrame *picture = data; - AVFrame * const p = &s->picture; + AVFrame * const p = data; int i, j, n, linesize, h, upgrade = 0; unsigned char *ptr; - int components, sample_len; + int components, sample_len, ret; s->bytestream_start = s->bytestream = buf; s->bytestream_end = buf + buf_size; - if (ff_pnm_decode_header(avctx, s) < 0) - return -1; + if ((ret = ff_pnm_decode_header(avctx, s)) < 0) + return ret; - if (p->data[0]) - avctx->release_buffer(avctx, p); - - p->reference = 0; - if (avctx->get_buffer(avctx, p) < 0) { + if ((ret = ff_get_buffer(avctx, p, 0)) < 0) { av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); - return -1; + return ret; } p->pict_type = AV_PICTURE_TYPE_I; p->key_frame = 1; switch (avctx->pix_fmt) { default: - return -1; - case PIX_FMT_RGB48BE: + return AVERROR(EINVAL); + case AV_PIX_FMT_RGB48BE: n = avctx->width * 6; components=3; sample_len=16; goto do_read; - case PIX_FMT_RGB24: + case AV_PIX_FMT_RGB24: n = avctx->width * 3; components=3; sample_len=8; goto do_read; - case PIX_FMT_GRAY8: + case AV_PIX_FMT_GRAY8: n = avctx->width; components=1; sample_len=8; if (s->maxval < 255) upgrade = 1; goto do_read; - case PIX_FMT_GRAY16BE: - case PIX_FMT_GRAY16LE: + case AV_PIX_FMT_GRAY16BE: + case AV_PIX_FMT_GRAY16LE: n = avctx->width * 2; components=1; sample_len=16; if (s->maxval < 65535) upgrade = 2; goto do_read; - case PIX_FMT_MONOWHITE: - case PIX_FMT_MONOBLACK: + case AV_PIX_FMT_MONOWHITE: + case AV_PIX_FMT_MONOBLACK: n = (avctx->width + 7) >> 3; components=1; sample_len=1; @@ -92,7 +88,7 @@ static int pnm_decode_frame(AVCodecContext *avctx, void *data, ptr = p->data[0]; linesize = p->linesize[0]; if (s->bytestream + n * avctx->height > s->bytestream_end) - return -1; + return AVERROR_INVALIDDATA; if(s->type < 4){ for (i=0; iheight; i++) { PutBitContext pb; @@ -103,7 +99,7 @@ static int pnm_decode_frame(AVCodecContext *avctx, void *data, while(s->bytestream < s->bytestream_end && (*s->bytestream < '0' || *s->bytestream > '9' )) s->bytestream++; if(s->bytestream >= s->bytestream_end) - return -1; + return AVERROR_INVALIDDATA; do{ v= 10*v + c; c= (*s->bytestream++) - '0'; @@ -133,15 +129,19 @@ static int pnm_decode_frame(AVCodecContext *avctx, void *data, } } break; - case PIX_FMT_YUV420P: + case AV_PIX_FMT_YUV420P: + case AV_PIX_FMT_YUV420P9BE: + case AV_PIX_FMT_YUV420P10BE: { unsigned char *ptr1, *ptr2; n = avctx->width; ptr = p->data[0]; linesize = p->linesize[0]; + if (s->maxval >= 256) + n *= 2; if (s->bytestream + n * avctx->height * 3 / 2 > s->bytestream_end) - return -1; + return AVERROR_INVALIDDATA; for (i = 0; i < avctx->height; i++) { memcpy(ptr, s->bytestream, n); s->bytestream += n; @@ -161,11 +161,52 @@ static int pnm_decode_frame(AVCodecContext *avctx, void *data, } } break; - case PIX_FMT_RGB32: + case AV_PIX_FMT_YUV420P16: + { + uint16_t *ptr1, *ptr2; + const int f = (65535 * 32768 + s->maxval / 2) / s->maxval; + unsigned int j, v; + + n = avctx->width * 2; + ptr = p->data[0]; + linesize = p->linesize[0]; + if (s->bytestream + n * avctx->height * 3 / 2 > s->bytestream_end) + return AVERROR_INVALIDDATA; + for (i = 0; i < avctx->height; i++) { + for (j = 0; j < n / 2; j++) { + v = av_be2ne16(((uint16_t *)s->bytestream)[j]); + ((uint16_t *)ptr)[j] = (v * f + 16384) >> 15; + } + s->bytestream += n; + ptr += linesize; + } + ptr1 = (uint16_t*)p->data[1]; + ptr2 = (uint16_t*)p->data[2]; + n >>= 1; + h = avctx->height >> 1; + for (i = 0; i < h; i++) { + for (j = 0; j < n / 2; j++) { + v = av_be2ne16(((uint16_t *)s->bytestream)[j]); + ptr1[j] = (v * f + 16384) >> 15; + } + s->bytestream += n; + + for (j = 0; j < n / 2; j++) { + v = av_be2ne16(((uint16_t *)s->bytestream)[j]); + ptr2[j] = (v * f + 16384) >> 15; + } + s->bytestream += n; + + ptr1 += p->linesize[1] / 2; + ptr2 += p->linesize[2] / 2; + } + } + break; + case AV_PIX_FMT_RGB32: ptr = p->data[0]; linesize = p->linesize[0]; if (s->bytestream + avctx->width * avctx->height * 4 > s->bytestream_end) - return -1; + return AVERROR_INVALIDDATA; for (i = 0; i < avctx->height; i++) { int j, r, g, b, a; @@ -180,8 +221,7 @@ static int pnm_decode_frame(AVCodecContext *avctx, void *data, } break; } - *picture = *(AVFrame*)&s->picture; - *data_size = sizeof(AVPicture); + *got_frame = 1; return s->bytestream - s->bytestream_start; } @@ -190,69 +230,59 @@ static int pnm_decode_frame(AVCodecContext *avctx, void *data, #if CONFIG_PGM_DECODER AVCodec ff_pgm_decoder = { .name = "pgm", + .long_name = NULL_IF_CONFIG_SMALL("PGM (Portable GrayMap) image"), .type = AVMEDIA_TYPE_VIDEO, - .id = CODEC_ID_PGM, + .id = AV_CODEC_ID_PGM, .priv_data_size = sizeof(PNMContext), - .init = ff_pnm_init, - .close = ff_pnm_end, .decode = pnm_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("PGM (Portable GrayMap) image"), }; #endif #if CONFIG_PGMYUV_DECODER AVCodec ff_pgmyuv_decoder = { .name = "pgmyuv", + .long_name = NULL_IF_CONFIG_SMALL("PGMYUV (Portable GrayMap YUV) image"), .type = AVMEDIA_TYPE_VIDEO, - .id = CODEC_ID_PGMYUV, + .id = AV_CODEC_ID_PGMYUV, .priv_data_size = sizeof(PNMContext), - .init = ff_pnm_init, - .close = ff_pnm_end, .decode = pnm_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("PGMYUV (Portable GrayMap YUV) image"), }; #endif #if CONFIG_PPM_DECODER AVCodec ff_ppm_decoder = { .name = "ppm", + .long_name = NULL_IF_CONFIG_SMALL("PPM (Portable PixelMap) image"), .type = AVMEDIA_TYPE_VIDEO, - .id = CODEC_ID_PPM, + .id = AV_CODEC_ID_PPM, .priv_data_size = sizeof(PNMContext), - .init = ff_pnm_init, - .close = ff_pnm_end, .decode = pnm_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("PPM (Portable PixelMap) image"), }; #endif #if CONFIG_PBM_DECODER AVCodec ff_pbm_decoder = { .name = "pbm", + .long_name = NULL_IF_CONFIG_SMALL("PBM (Portable BitMap) image"), .type = AVMEDIA_TYPE_VIDEO, - .id = CODEC_ID_PBM, + .id = AV_CODEC_ID_PBM, .priv_data_size = sizeof(PNMContext), - .init = ff_pnm_init, - .close = ff_pnm_end, .decode = pnm_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("PBM (Portable BitMap) image"), }; #endif #if CONFIG_PAM_DECODER AVCodec ff_pam_decoder = { .name = "pam", + .long_name = NULL_IF_CONFIG_SMALL("PAM (Portable AnyMap) image"), .type = AVMEDIA_TYPE_VIDEO, - .id = CODEC_ID_PAM, + .id = AV_CODEC_ID_PAM, .priv_data_size = sizeof(PNMContext), - .init = ff_pnm_init, - .close = ff_pnm_end, .decode = pnm_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("PAM (Portable AnyMap) image"), }; #endif