X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fpnm.c;h=eea30e86212c8e5f320e3e67b6cc348897fe34e6;hb=3d7c84747d4b68f3929c98a6e09efea8e53634dc;hp=2cbbdf60ea96ad83a7c5562152db85e96fd8ff01;hpb=737eb5976f6a37703923ce3c3d5e6ca8eeabb43a;p=ffmpeg diff --git a/libavcodec/pnm.c b/libavcodec/pnm.c index 2cbbdf60ea9..eea30e86212 100644 --- a/libavcodec/pnm.c +++ b/libavcodec/pnm.c @@ -2,23 +2,26 @@ * PNM image format * Copyright (c) 2002, 2003 Fabrice Bellard * - * This file is part of FFmpeg. + * This file is part of Libav. * - * FFmpeg is free software; you can redistribute it and/or + * Libav is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * - * FFmpeg is distributed in the hope that it will be useful, + * Libav is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with FFmpeg; if not, write to the Free Software + * License along with Libav; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include +#include + #include "libavutil/imgutils.h" #include "avcodec.h" #include "pnm.h" @@ -62,17 +65,17 @@ int ff_pnm_decode_header(AVCodecContext *avctx, PNMContext * const s) pnm_get(s, buf1, sizeof(buf1)); s->type= buf1[1]-'0'; if(buf1[0] != 'P') - return -1; + return AVERROR_INVALIDDATA; if (s->type==1 || s->type==4) { - avctx->pix_fmt = PIX_FMT_MONOWHITE; + avctx->pix_fmt = AV_PIX_FMT_MONOWHITE; } else if (s->type==2 || s->type==5) { - if (avctx->codec_id == CODEC_ID_PGMYUV) - avctx->pix_fmt = PIX_FMT_YUV420P; + if (avctx->codec_id == AV_CODEC_ID_PGMYUV) + avctx->pix_fmt = AV_PIX_FMT_YUV420P; else - avctx->pix_fmt = PIX_FMT_GRAY8; + avctx->pix_fmt = AV_PIX_FMT_GRAY8; } else if (s->type==3 || s->type==6) { - avctx->pix_fmt = PIX_FMT_RGB24; + avctx->pix_fmt = AV_PIX_FMT_RGB24; } else if (s->type==7) { w = -1; h = -1; @@ -93,51 +96,53 @@ int ff_pnm_decode_header(AVCodecContext *avctx, PNMContext * const s) } else if (!strcmp(buf1, "MAXVAL")) { pnm_get(s, buf1, sizeof(buf1)); maxval = strtol(buf1, NULL, 10); - } else if (!strcmp(buf1, "TUPLETYPE")) { + } else if (!strcmp(buf1, "TUPLTYPE") || + /* libavcodec used to write invalid files */ + !strcmp(buf1, "TUPLETYPE")) { pnm_get(s, tuple_type, sizeof(tuple_type)); } else if (!strcmp(buf1, "ENDHDR")) { break; } else { - return -1; + return AVERROR_INVALIDDATA; } } /* check that all tags are present */ if (w <= 0 || h <= 0 || maxval <= 0 || depth <= 0 || tuple_type[0] == '\0' || av_image_check_size(w, h, 0, avctx)) - return -1; + return AVERROR_INVALIDDATA; avctx->width = w; avctx->height = h; if (depth == 1) { if (maxval == 1) - avctx->pix_fmt = PIX_FMT_MONOWHITE; + avctx->pix_fmt = AV_PIX_FMT_MONOWHITE; else - avctx->pix_fmt = PIX_FMT_GRAY8; + avctx->pix_fmt = AV_PIX_FMT_GRAY8; } else if (depth == 3) { if (maxval < 256) { - avctx->pix_fmt = PIX_FMT_RGB24; + avctx->pix_fmt = AV_PIX_FMT_RGB24; } else { av_log(avctx, AV_LOG_ERROR, "16-bit components are only supported for grayscale\n"); - avctx->pix_fmt = PIX_FMT_NONE; - return -1; + avctx->pix_fmt = AV_PIX_FMT_NONE; + return AVERROR_INVALIDDATA; } } else if (depth == 4) { - avctx->pix_fmt = PIX_FMT_RGB32; + avctx->pix_fmt = AV_PIX_FMT_RGB32; } else { - return -1; + return AVERROR_INVALIDDATA; } return 0; } else { - return -1; + return AVERROR_INVALIDDATA; } pnm_get(s, buf1, sizeof(buf1)); avctx->width = atoi(buf1); if (avctx->width <= 0) - return -1; + return AVERROR_INVALIDDATA; pnm_get(s, buf1, sizeof(buf1)); avctx->height = atoi(buf1); if(av_image_check_size(avctx->width, avctx->height, 0, avctx)) - return -1; - if (avctx->pix_fmt != PIX_FMT_MONOWHITE) { + return AVERROR_INVALIDDATA; + if (avctx->pix_fmt != AV_PIX_FMT_MONOWHITE) { pnm_get(s, buf1, sizeof(buf1)); s->maxval = atoi(buf1); if (s->maxval <= 0) { @@ -145,50 +150,47 @@ int ff_pnm_decode_header(AVCodecContext *avctx, PNMContext * const s) s->maxval = 255; } if (s->maxval >= 256) { - if (avctx->pix_fmt == PIX_FMT_GRAY8) { - avctx->pix_fmt = PIX_FMT_GRAY16BE; + if (avctx->pix_fmt == AV_PIX_FMT_GRAY8) { + avctx->pix_fmt = AV_PIX_FMT_GRAY16BE; if (s->maxval != 65535) - avctx->pix_fmt = PIX_FMT_GRAY16; - } else if (avctx->pix_fmt == PIX_FMT_RGB24) { + avctx->pix_fmt = AV_PIX_FMT_GRAY16; + } else if (avctx->pix_fmt == AV_PIX_FMT_RGB24) { if (s->maxval > 255) - avctx->pix_fmt = PIX_FMT_RGB48BE; + avctx->pix_fmt = AV_PIX_FMT_RGB48BE; + } else if (avctx->pix_fmt == AV_PIX_FMT_YUV420P && s->maxval < 65536) { + if (s->maxval < 512) + avctx->pix_fmt = AV_PIX_FMT_YUV420P9BE; + else if (s->maxval < 1024) + avctx->pix_fmt = AV_PIX_FMT_YUV420P10BE; + else + avctx->pix_fmt = AV_PIX_FMT_YUV420P16; } else { av_log(avctx, AV_LOG_ERROR, "Unsupported pixel format\n"); - avctx->pix_fmt = PIX_FMT_NONE; - return -1; + avctx->pix_fmt = AV_PIX_FMT_NONE; + return AVERROR_INVALIDDATA; } } }else s->maxval=1; /* more check if YUV420 */ - if (avctx->pix_fmt == PIX_FMT_YUV420P) { + if (av_pix_fmt_desc_get(avctx->pix_fmt)->flags & AV_PIX_FMT_FLAG_PLANAR) { if ((avctx->width & 1) != 0) - return -1; + return AVERROR_INVALIDDATA; h = (avctx->height * 2); if ((h % 3) != 0) - return -1; + return AVERROR_INVALIDDATA; h /= 3; avctx->height = h; } return 0; } -av_cold int ff_pnm_end(AVCodecContext *avctx) -{ - PNMContext *s = avctx->priv_data; - - if (s->picture.data[0]) - avctx->release_buffer(avctx, &s->picture); - - return 0; -} - av_cold int ff_pnm_init(AVCodecContext *avctx) { PNMContext *s = avctx->priv_data; - avcodec_get_frame_defaults((AVFrame*)&s->picture); - avctx->coded_frame = (AVFrame*)&s->picture; + avcodec_get_frame_defaults(&s->picture); + avctx->coded_frame = &s->picture; return 0; }