From 638783bf8155d1d4a901646ce836aeed14227824 Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Wed, 28 Oct 2009 06:41:58 +0000 Subject: Split PAM encoder off into its own file. Originally committed as revision 20395 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/Makefile | 2 +- libavcodec/pamenc.c | 120 ++++++++++++++++++++++++++++++++++++++++++++++++++++ libavcodec/pnmenc.c | 96 ----------------------------------------- 3 files changed, 121 insertions(+), 97 deletions(-) create mode 100644 libavcodec/pamenc.c (limited to 'libavcodec') diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 26ff51b9f8..e5fecbc809 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -221,7 +221,7 @@ 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) += pnmdec.o pnm.o -OBJS-$(CONFIG_PAM_ENCODER) += pnmenc.o pnm.o +OBJS-$(CONFIG_PAM_ENCODER) += pamenc.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 diff --git a/libavcodec/pamenc.c b/libavcodec/pamenc.c new file mode 100644 index 0000000000..1239521a7a --- /dev/null +++ b/libavcodec/pamenc.c @@ -0,0 +1,120 @@ +/* + * PAM 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 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; +} + + +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"), +}; diff --git a/libavcodec/pnmenc.c b/libavcodec/pnmenc.c index a695b0db0f..b14a151937 100644 --- a/libavcodec/pnmenc.c +++ b/libavcodec/pnmenc.c @@ -111,89 +111,6 @@ static int pnm_encode_frame(AVCodecContext *avctx, unsigned char *outbuf, 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_ENCODER AVCodec pgm_encoder = { @@ -246,16 +163,3 @@ AVCodec pbm_encoder = { .long_name = NULL_IF_CONFIG_SMALL("PBM (Portable BitMap) 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 -- cgit v1.2.3