summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--libavcodec/Makefile10
-rw-r--r--libavcodec/pnmdec.c234
-rw-r--r--libavcodec/pnmenc.c208
3 files changed, 239 insertions, 213 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 58f370d72a..26ff51b9f8 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -220,20 +220,20 @@ OBJS-$(CONFIG_MSZH_DECODER) += lcldec.o
OBJS-$(CONFIG_NELLYMOSER_DECODER) += nellymoserdec.o nellymoser.o
OBJS-$(CONFIG_NELLYMOSER_ENCODER) += nellymoserenc.o nellymoser.o
OBJS-$(CONFIG_NUV_DECODER) += nuv.o rtjpeg.o
-OBJS-$(CONFIG_PAM_DECODER) += pnmenc.o pnm.o
+OBJS-$(CONFIG_PAM_DECODER) += pnmdec.o pnm.o
OBJS-$(CONFIG_PAM_ENCODER) += pnmenc.o pnm.o
-OBJS-$(CONFIG_PBM_DECODER) += pnmenc.o pnm.o
+OBJS-$(CONFIG_PBM_DECODER) += pnmdec.o pnm.o
OBJS-$(CONFIG_PBM_ENCODER) += pnmenc.o pnm.o
OBJS-$(CONFIG_PCX_DECODER) += pcx.o
OBJS-$(CONFIG_PCX_ENCODER) += pcxenc.o
-OBJS-$(CONFIG_PGM_DECODER) += pnmenc.o pnm.o
+OBJS-$(CONFIG_PGM_DECODER) += pnmdec.o pnm.o
OBJS-$(CONFIG_PGM_ENCODER) += pnmenc.o pnm.o
-OBJS-$(CONFIG_PGMYUV_DECODER) += pnmenc.o pnm.o
+OBJS-$(CONFIG_PGMYUV_DECODER) += pnmdec.o pnm.o
OBJS-$(CONFIG_PGMYUV_ENCODER) += pnmenc.o pnm.o
OBJS-$(CONFIG_PGSSUB_DECODER) += pgssubdec.o
OBJS-$(CONFIG_PNG_DECODER) += png.o pngdec.o
OBJS-$(CONFIG_PNG_ENCODER) += png.o pngenc.o
-OBJS-$(CONFIG_PPM_DECODER) += pnmenc.o pnm.o
+OBJS-$(CONFIG_PPM_DECODER) += pnmdec.o pnm.o
OBJS-$(CONFIG_PPM_ENCODER) += pnmenc.o pnm.o
OBJS-$(CONFIG_PTX_DECODER) += ptx.o
OBJS-$(CONFIG_QCELP_DECODER) += qcelpdec.o lsp.o celp_math.o \
diff --git a/libavcodec/pnmdec.c b/libavcodec/pnmdec.c
new file mode 100644
index 0000000000..f29c873200
--- /dev/null
+++ b/libavcodec/pnmdec.c
@@ -0,0 +1,234 @@
+/*
+ * PNM image format
+ * Copyright (c) 2002, 2003 Fabrice Bellard
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg 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,
+ * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "avcodec.h"
+#include "bytestream.h"
+#include "pnm.h"
+
+
+static int pnm_decode_frame(AVCodecContext *avctx, void *data,
+ int *data_size, 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 = (AVFrame*)&s->picture;
+ int i, n, linesize, h, upgrade = 0;
+ unsigned char *ptr;
+
+ s->bytestream_start =
+ s->bytestream = buf;
+ s->bytestream_end = buf + buf_size;
+
+ if (ff_pnm_decode_header(avctx, s) < 0)
+ return -1;
+
+ if (p->data[0])
+ avctx->release_buffer(avctx, p);
+
+ p->reference = 0;
+ if (avctx->get_buffer(avctx, p) < 0) {
+ av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
+ return -1;
+ }
+ p->pict_type = FF_I_TYPE;
+ p->key_frame = 1;
+
+ switch (avctx->pix_fmt) {
+ default:
+ return -1;
+ case PIX_FMT_RGB48BE:
+ n = avctx->width * 6;
+ goto do_read;
+ case PIX_FMT_RGB24:
+ n = avctx->width * 3;
+ goto do_read;
+ case PIX_FMT_GRAY8:
+ n = avctx->width;
+ if (s->maxval < 255)
+ upgrade = 1;
+ goto do_read;
+ case PIX_FMT_GRAY16BE:
+ case PIX_FMT_GRAY16LE:
+ n = avctx->width * 2;
+ if (s->maxval < 65535)
+ upgrade = 2;
+ goto do_read;
+ case PIX_FMT_MONOWHITE:
+ case PIX_FMT_MONOBLACK:
+ n = (avctx->width + 7) >> 3;
+ do_read:
+ ptr = p->data[0];
+ linesize = p->linesize[0];
+ if (s->bytestream + n * avctx->height > s->bytestream_end)
+ return -1;
+ for (i = 0; i < avctx->height; i++) {
+ if (!upgrade)
+ memcpy(ptr, s->bytestream, n);
+ else if (upgrade == 1) {
+ unsigned int j, f = (255 * 128 + s->maxval / 2) / s->maxval;
+ for (j = 0; j < n; j++)
+ ptr[j] = (s->bytestream[j] * f + 64) >> 7;
+ } else if (upgrade == 2) {
+ unsigned int j, v, f = (65535 * 32768 + s->maxval / 2) / s->maxval;
+ for (j = 0; j < n / 2; j++) {
+ v = be2me_16(((uint16_t *)s->bytestream)[j]);
+ ((uint16_t *)ptr)[j] = (v * f + 16384) >> 15;
+ }
+ }
+ s->bytestream += n;
+ ptr += linesize;
+ }
+ break;
+ case PIX_FMT_YUV420P:
+ {
+ unsigned char *ptr1, *ptr2;
+
+ n = avctx->width;
+ ptr = p->data[0];
+ linesize = p->linesize[0];
+ if (s->bytestream + n * avctx->height * 3 / 2 > s->bytestream_end)
+ return -1;
+ for (i = 0; i < avctx->height; i++) {
+ memcpy(ptr, s->bytestream, n);
+ s->bytestream += n;
+ ptr += linesize;
+ }
+ ptr1 = p->data[1];
+ ptr2 = p->data[2];
+ n >>= 1;
+ h = avctx->height >> 1;
+ for (i = 0; i < h; i++) {
+ memcpy(ptr1, s->bytestream, n);
+ s->bytestream += n;
+ memcpy(ptr2, s->bytestream, n);
+ s->bytestream += n;
+ ptr1 += p->linesize[1];
+ ptr2 += p->linesize[2];
+ }
+ }
+ 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);
+
+ return s->bytestream - s->bytestream_start;
+}
+
+
+#if CONFIG_PGM_DECODER
+AVCodec pgm_decoder = {
+ "pgm",
+ CODEC_TYPE_VIDEO,
+ CODEC_ID_PGM,
+ sizeof(PNMContext),
+ ff_pnm_init,
+ NULL,
+ ff_pnm_end,
+ pnm_decode_frame,
+ CODEC_CAP_DR1,
+ .pix_fmts = (const enum PixelFormat[]){PIX_FMT_GRAY8, PIX_FMT_GRAY16BE, PIX_FMT_NONE},
+ .long_name = NULL_IF_CONFIG_SMALL("PGM (Portable GrayMap) image"),
+};
+#endif
+
+#if CONFIG_PGMYUV_DECODER
+AVCodec pgmyuv_decoder = {
+ "pgmyuv",
+ CODEC_TYPE_VIDEO,
+ CODEC_ID_PGMYUV,
+ sizeof(PNMContext),
+ ff_pnm_init,
+ NULL,
+ ff_pnm_end,
+ pnm_decode_frame,
+ CODEC_CAP_DR1,
+ .pix_fmts = (const enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE},
+ .long_name = NULL_IF_CONFIG_SMALL("PGMYUV (Portable GrayMap YUV) image"),
+};
+#endif
+
+#if CONFIG_PPM_DECODER
+AVCodec ppm_decoder = {
+ "ppm",
+ CODEC_TYPE_VIDEO,
+ CODEC_ID_PPM,
+ sizeof(PNMContext),
+ ff_pnm_init,
+ NULL,
+ ff_pnm_end,
+ pnm_decode_frame,
+ CODEC_CAP_DR1,
+ .pix_fmts = (const enum PixelFormat[]){PIX_FMT_RGB24, PIX_FMT_RGB48BE, PIX_FMT_NONE},
+ .long_name = NULL_IF_CONFIG_SMALL("PPM (Portable PixelMap) image"),
+};
+#endif
+
+#if CONFIG_PBM_DECODER
+AVCodec pbm_decoder = {
+ "pbm",
+ CODEC_TYPE_VIDEO,
+ CODEC_ID_PBM,
+ sizeof(PNMContext),
+ ff_pnm_init,
+ NULL,
+ ff_pnm_end,
+ pnm_decode_frame,
+ CODEC_CAP_DR1,
+ .pix_fmts = (const enum PixelFormat[]){PIX_FMT_MONOWHITE, PIX_FMT_NONE},
+ .long_name = NULL_IF_CONFIG_SMALL("PBM (Portable BitMap) image"),
+};
+#endif
+
+#if CONFIG_PAM_DECODER
+AVCodec pam_decoder = {
+ "pam",
+ CODEC_TYPE_VIDEO,
+ CODEC_ID_PAM,
+ sizeof(PNMContext),
+ ff_pnm_init,
+ NULL,
+ ff_pnm_end,
+ pnm_decode_frame,
+ CODEC_CAP_DR1,
+ .pix_fmts = (const enum PixelFormat[]){PIX_FMT_RGB24, PIX_FMT_RGB32, PIX_FMT_GRAY8, PIX_FMT_MONOWHITE, PIX_FMT_NONE},
+ .long_name = NULL_IF_CONFIG_SMALL("PAM (Portable AnyMap) image"),
+};
+#endif
diff --git a/libavcodec/pnmenc.c b/libavcodec/pnmenc.c
index 431df93d52..a695b0db0f 100644
--- a/libavcodec/pnmenc.c
+++ b/libavcodec/pnmenc.c
@@ -24,134 +24,6 @@
#include "pnm.h"
-static int pnm_decode_frame(AVCodecContext *avctx, void *data,
- int *data_size, 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 = (AVFrame*)&s->picture;
- int i, n, linesize, h, upgrade = 0;
- unsigned char *ptr;
-
- s->bytestream_start =
- s->bytestream = buf;
- s->bytestream_end = buf + buf_size;
-
- if (ff_pnm_decode_header(avctx, s) < 0)
- return -1;
-
- if (p->data[0])
- avctx->release_buffer(avctx, p);
-
- p->reference = 0;
- if (avctx->get_buffer(avctx, p) < 0) {
- av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
- return -1;
- }
- p->pict_type = FF_I_TYPE;
- p->key_frame = 1;
-
- switch (avctx->pix_fmt) {
- default:
- return -1;
- case PIX_FMT_RGB48BE:
- n = avctx->width * 6;
- goto do_read;
- case PIX_FMT_RGB24:
- n = avctx->width * 3;
- goto do_read;
- case PIX_FMT_GRAY8:
- n = avctx->width;
- if (s->maxval < 255)
- upgrade = 1;
- goto do_read;
- case PIX_FMT_GRAY16BE:
- case PIX_FMT_GRAY16LE:
- n = avctx->width * 2;
- if (s->maxval < 65535)
- upgrade = 2;
- goto do_read;
- case PIX_FMT_MONOWHITE:
- case PIX_FMT_MONOBLACK:
- n = (avctx->width + 7) >> 3;
- do_read:
- ptr = p->data[0];
- linesize = p->linesize[0];
- if (s->bytestream + n * avctx->height > s->bytestream_end)
- return -1;
- for (i = 0; i < avctx->height; i++) {
- if (!upgrade)
- memcpy(ptr, s->bytestream, n);
- else if (upgrade == 1) {
- unsigned int j, f = (255 * 128 + s->maxval / 2) / s->maxval;
- for (j = 0; j < n; j++)
- ptr[j] = (s->bytestream[j] * f + 64) >> 7;
- } else if (upgrade == 2) {
- unsigned int j, v, f = (65535 * 32768 + s->maxval / 2) / s->maxval;
- for (j = 0; j < n / 2; j++) {
- v = be2me_16(((uint16_t *)s->bytestream)[j]);
- ((uint16_t *)ptr)[j] = (v * f + 16384) >> 15;
- }
- }
- s->bytestream += n;
- ptr += linesize;
- }
- break;
- case PIX_FMT_YUV420P:
- {
- unsigned char *ptr1, *ptr2;
-
- n = avctx->width;
- ptr = p->data[0];
- linesize = p->linesize[0];
- if (s->bytestream + n * avctx->height * 3 / 2 > s->bytestream_end)
- return -1;
- for (i = 0; i < avctx->height; i++) {
- memcpy(ptr, s->bytestream, n);
- s->bytestream += n;
- ptr += linesize;
- }
- ptr1 = p->data[1];
- ptr2 = p->data[2];
- n >>= 1;
- h = avctx->height >> 1;
- for (i = 0; i < h; i++) {
- memcpy(ptr1, s->bytestream, n);
- s->bytestream += n;
- memcpy(ptr2, s->bytestream, n);
- s->bytestream += n;
- ptr1 += p->linesize[1];
- ptr2 += p->linesize[2];
- }
- }
- 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);
-
- return s->bytestream - s->bytestream_start;
-}
-
static int pnm_encode_frame(AVCodecContext *avctx, unsigned char *outbuf,
int buf_size, void *data)
{
@@ -323,22 +195,6 @@ static int pam_encode_frame(AVCodecContext *avctx, unsigned char *outbuf,
}
-#if CONFIG_PGM_DECODER
-AVCodec pgm_decoder = {
- "pgm",
- CODEC_TYPE_VIDEO,
- CODEC_ID_PGM,
- sizeof(PNMContext),
- ff_pnm_init,
- NULL,
- ff_pnm_end,
- pnm_decode_frame,
- CODEC_CAP_DR1,
- .pix_fmts = (const enum PixelFormat[]){PIX_FMT_GRAY8, PIX_FMT_GRAY16BE, PIX_FMT_NONE},
- .long_name = NULL_IF_CONFIG_SMALL("PGM (Portable GrayMap) image"),
-};
-#endif
-
#if CONFIG_PGM_ENCODER
AVCodec pgm_encoder = {
"pgm",
@@ -352,22 +208,6 @@ AVCodec pgm_encoder = {
};
#endif
-#if CONFIG_PGMYUV_DECODER
-AVCodec pgmyuv_decoder = {
- "pgmyuv",
- CODEC_TYPE_VIDEO,
- CODEC_ID_PGMYUV,
- sizeof(PNMContext),
- ff_pnm_init,
- NULL,
- ff_pnm_end,
- pnm_decode_frame,
- CODEC_CAP_DR1,
- .pix_fmts = (const enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE},
- .long_name = NULL_IF_CONFIG_SMALL("PGMYUV (Portable GrayMap YUV) image"),
-};
-#endif
-
#if CONFIG_PGMYUV_ENCODER
AVCodec pgmyuv_encoder = {
"pgmyuv",
@@ -381,22 +221,6 @@ AVCodec pgmyuv_encoder = {
};
#endif
-#if CONFIG_PPM_DECODER
-AVCodec ppm_decoder = {
- "ppm",
- CODEC_TYPE_VIDEO,
- CODEC_ID_PPM,
- sizeof(PNMContext),
- ff_pnm_init,
- NULL,
- ff_pnm_end,
- pnm_decode_frame,
- CODEC_CAP_DR1,
- .pix_fmts = (const enum PixelFormat[]){PIX_FMT_RGB24, PIX_FMT_RGB48BE, PIX_FMT_NONE},
- .long_name = NULL_IF_CONFIG_SMALL("PPM (Portable PixelMap) image"),
-};
-#endif
-
#if CONFIG_PPM_ENCODER
AVCodec ppm_encoder = {
"ppm",
@@ -410,22 +234,6 @@ AVCodec ppm_encoder = {
};
#endif
-#if CONFIG_PBM_DECODER
-AVCodec pbm_decoder = {
- "pbm",
- CODEC_TYPE_VIDEO,
- CODEC_ID_PBM,
- sizeof(PNMContext),
- ff_pnm_init,
- NULL,
- ff_pnm_end,
- pnm_decode_frame,
- CODEC_CAP_DR1,
- .pix_fmts = (const enum PixelFormat[]){PIX_FMT_MONOWHITE, PIX_FMT_NONE},
- .long_name = NULL_IF_CONFIG_SMALL("PBM (Portable BitMap) image"),
-};
-#endif
-
#if CONFIG_PBM_ENCODER
AVCodec pbm_encoder = {
"pbm",
@@ -439,22 +247,6 @@ AVCodec pbm_encoder = {
};
#endif
-#if CONFIG_PAM_DECODER
-AVCodec pam_decoder = {
- "pam",
- CODEC_TYPE_VIDEO,
- CODEC_ID_PAM,
- sizeof(PNMContext),
- ff_pnm_init,
- NULL,
- ff_pnm_end,
- pnm_decode_frame,
- CODEC_CAP_DR1,
- .pix_fmts = (const enum PixelFormat[]){PIX_FMT_RGB24, PIX_FMT_RGB32, PIX_FMT_GRAY8, PIX_FMT_MONOWHITE, PIX_FMT_NONE},
- .long_name = NULL_IF_CONFIG_SMALL("PAM (Portable AnyMap) image"),
-};
-#endif
-
#if CONFIG_PAM_ENCODER
AVCodec pam_encoder = {
"pam",
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-01 23:12:29 +0000