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, ret;
if ((ret = ff_pnm_decode_header(avctx, s)) < 0)
return ret;
- if (p->data[0])
- avctx->release_buffer(avctx, p);
-
- p->reference = 0;
- if ((ret = ff_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 ret;
}
}
break;
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 AVERROR_INVALIDDATA;
for (i = 0; i < avctx->height; i++) {
}
}
break;
+ 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];
}
break;
}
- *picture = s->picture;
*got_frame = 1;
return s->bytestream - s->bytestream_start;
#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 = 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 = 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 = 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 = 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 = 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