[FFmpeg-cvslog] r20394 - in trunk/libavcodec: Makefile pnmdec.c pnmenc.c
diego
subversion
Wed Oct 28 07:34:00 CET 2009
Author: diego
Date: Wed Oct 28 07:34:00 2009
New Revision: 20394
Log:
The the decoders from pnmen.c off into their own file.
Added:
trunk/libavcodec/pnmdec.c
- copied, changed from r20382, trunk/libavcodec/pnmenc.c
Modified:
trunk/libavcodec/Makefile
trunk/libavcodec/pnmenc.c
Modified: trunk/libavcodec/Makefile
==============================================================================
--- trunk/libavcodec/Makefile Wed Oct 28 07:32:35 2009 (r20393)
+++ trunk/libavcodec/Makefile Wed Oct 28 07:34:00 2009 (r20394)
@@ -220,20 +220,20 @@ OBJS-$(CONFIG_MSZH_DECODER) +
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 \
Copied and modified: trunk/libavcodec/pnmdec.c (from r20382, trunk/libavcodec/pnmenc.c)
==============================================================================
--- trunk/libavcodec/pnmenc.c Tue Oct 27 18:15:05 2009 (r20382, copy source)
+++ trunk/libavcodec/pnmdec.c Wed Oct 28 07:34:00 2009 (r20394)
@@ -152,176 +152,6 @@ static int pnm_decode_frame(AVCodecConte
return s->bytestream - s->bytestream_start;
}
-static int pnm_encode_frame(AVCodecContext *avctx, unsigned char *outbuf,
- int buf_size, void *data)
-{
- PNMContext *s = avctx->priv_data;
- AVFrame *pict = data;
- AVFrame * const p = (AVFrame*)&s->picture;
- int i, h, h1, c, n, linesize;
- uint8_t *ptr, *ptr1, *ptr2;
-
- if (buf_size < avpicture_get_size(avctx->pix_fmt, avctx->width, avctx->height) + 200) {
- av_log(avctx, AV_LOG_ERROR, "encoded frame too large\n");
- return -1;
- }
-
- *p = *pict;
- p->pict_type = FF_I_TYPE;
- p->key_frame = 1;
-
- s->bytestream_start =
- s->bytestream = outbuf;
- s->bytestream_end = outbuf + buf_size;
-
- h = avctx->height;
- h1 = h;
- switch (avctx->pix_fmt) {
- case PIX_FMT_MONOWHITE:
- c = '4';
- n = (avctx->width + 7) >> 3;
- break;
- case PIX_FMT_GRAY8:
- c = '5';
- n = avctx->width;
- break;
- case PIX_FMT_GRAY16BE:
- c = '5';
- n = avctx->width * 2;
- break;
- case PIX_FMT_RGB24:
- c = '6';
- n = avctx->width * 3;
- break;
- case PIX_FMT_RGB48BE:
- c = '6';
- n = avctx->width * 6;
- break;
- case PIX_FMT_YUV420P:
- c = '5';
- n = avctx->width;
- h1 = (h * 3) / 2;
- break;
- default:
- return -1;
- }
- snprintf(s->bytestream, s->bytestream_end - s->bytestream,
- "P%c\n%d %d\n", c, avctx->width, h1);
- s->bytestream += strlen(s->bytestream);
- if (avctx->pix_fmt != PIX_FMT_MONOWHITE) {
- snprintf(s->bytestream, s->bytestream_end - s->bytestream,
- "%d\n", (avctx->pix_fmt != PIX_FMT_GRAY16BE && avctx->pix_fmt != PIX_FMT_RGB48BE) ? 255 : 65535);
- s->bytestream += strlen(s->bytestream);
- }
-
- ptr = p->data[0];
- linesize = p->linesize[0];
- for (i = 0; i < h; i++) {
- memcpy(s->bytestream, ptr, n);
- s->bytestream += n;
- ptr += linesize;
- }
-
- if (avctx->pix_fmt == PIX_FMT_YUV420P) {
- h >>= 1;
- n >>= 1;
- ptr1 = p->data[1];
- ptr2 = p->data[2];
- for (i = 0; i < h; i++) {
- memcpy(s->bytestream, ptr1, n);
- s->bytestream += n;
- memcpy(s->bytestream, ptr2, n);
- s->bytestream += n;
- ptr1 += p->linesize[1];
- ptr2 += p->linesize[2];
- }
- }
- return s->bytestream - s->bytestream_start;
-}
-
-static int pam_encode_frame(AVCodecContext *avctx, unsigned char *outbuf,
- int buf_size, void *data)
-{
- PNMContext *s = avctx->priv_data;
- AVFrame *pict = data;
- AVFrame * const p = (AVFrame*)&s->picture;
- int i, h, w, n, linesize, depth, maxval;
- const char *tuple_type;
- uint8_t *ptr;
-
- if (buf_size < avpicture_get_size(avctx->pix_fmt, avctx->width, avctx->height) + 200) {
- av_log(avctx, AV_LOG_ERROR, "encoded frame too large\n");
- return -1;
- }
-
- *p = *pict;
- p->pict_type = FF_I_TYPE;
- p->key_frame = 1;
-
- s->bytestream_start =
- s->bytestream = outbuf;
- s->bytestream_end = outbuf+buf_size;
-
- h = avctx->height;
- w = avctx->width;
- switch (avctx->pix_fmt) {
- case PIX_FMT_MONOWHITE:
- n = (w + 7) >> 3;
- depth = 1;
- maxval = 1;
- tuple_type = "BLACKANDWHITE";
- break;
- case PIX_FMT_GRAY8:
- n = w;
- depth = 1;
- maxval = 255;
- tuple_type = "GRAYSCALE";
- break;
- case PIX_FMT_RGB24:
- n = w * 3;
- depth = 3;
- maxval = 255;
- tuple_type = "RGB";
- break;
- case PIX_FMT_RGB32:
- n = w * 4;
- depth = 4;
- maxval = 255;
- tuple_type = "RGB_ALPHA";
- break;
- default:
- return -1;
- }
- snprintf(s->bytestream, s->bytestream_end - s->bytestream,
- "P7\nWIDTH %d\nHEIGHT %d\nDEPTH %d\nMAXVAL %d\nTUPLETYPE %s\nENDHDR\n",
- w, h, depth, maxval, tuple_type);
- s->bytestream += strlen(s->bytestream);
-
- ptr = p->data[0];
- linesize = p->linesize[0];
-
- if (avctx->pix_fmt == PIX_FMT_RGB32) {
- int j;
- unsigned int v;
-
- for (i = 0; i < h; i++) {
- for (j = 0; j < w; j++) {
- v = ((uint32_t *)ptr)[j];
- bytestream_put_be24(&s->bytestream, v);
- *s->bytestream++ = v >> 24;
- }
- ptr += linesize;
- }
- } else {
- for (i = 0; i < h; i++) {
- memcpy(s->bytestream, ptr, n);
- s->bytestream += n;
- ptr += linesize;
- }
- }
- return s->bytestream - s->bytestream_start;
-}
-
#if CONFIG_PGM_DECODER
AVCodec pgm_decoder = {
@@ -339,19 +169,6 @@ AVCodec pgm_decoder = {
};
#endif
-#if CONFIG_PGM_ENCODER
-AVCodec pgm_encoder = {
- "pgm",
- CODEC_TYPE_VIDEO,
- CODEC_ID_PGM,
- sizeof(PNMContext),
- ff_pnm_init,
- pnm_encode_frame,
- .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",
@@ -368,19 +185,6 @@ AVCodec pgmyuv_decoder = {
};
#endif
-#if CONFIG_PGMYUV_ENCODER
-AVCodec pgmyuv_encoder = {
- "pgmyuv",
- CODEC_TYPE_VIDEO,
- CODEC_ID_PGMYUV,
- sizeof(PNMContext),
- ff_pnm_init,
- pnm_encode_frame,
- .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",
@@ -397,19 +201,6 @@ AVCodec ppm_decoder = {
};
#endif
-#if CONFIG_PPM_ENCODER
-AVCodec ppm_encoder = {
- "ppm",
- CODEC_TYPE_VIDEO,
- CODEC_ID_PPM,
- sizeof(PNMContext),
- ff_pnm_init,
- pnm_encode_frame,
- .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",
@@ -426,19 +217,6 @@ AVCodec pbm_decoder = {
};
#endif
-#if CONFIG_PBM_ENCODER
-AVCodec pbm_encoder = {
- "pbm",
- CODEC_TYPE_VIDEO,
- CODEC_ID_PBM,
- sizeof(PNMContext),
- ff_pnm_init,
- pnm_encode_frame,
- .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",
@@ -454,16 +232,3 @@ AVCodec pam_decoder = {
.long_name = NULL_IF_CONFIG_SMALL("PAM (Portable AnyMap) image"),
};
#endif
-
-#if CONFIG_PAM_ENCODER
-AVCodec pam_encoder = {
- "pam",
- CODEC_TYPE_VIDEO,
- CODEC_ID_PAM,
- sizeof(PNMContext),
- ff_pnm_init,
- pam_encode_frame,
- .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
Modified: trunk/libavcodec/pnmenc.c
==============================================================================
--- trunk/libavcodec/pnmenc.c Wed Oct 28 07:32:35 2009 (r20393)
+++ trunk/libavcodec/pnmenc.c Wed Oct 28 07:34:00 2009 (r20394)
@@ -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(AVCodecConte
}
-#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",
More information about the ffmpeg-cvslog
mailing list