From 631670888d4ff9ca08c9d0804082511a1bc587a5 Mon Sep 17 00:00:00 2001 From: Roman Shaposhnik Date: Wed, 7 May 2003 19:01:45 +0000 Subject: * introducing new public interface in imgconvert.c + avcodec_get_pix_fmt converts textual representation of pixel format into the actual id. Complements avcodec_get_pix_fmt_name. + avpicture_layout serializes given picture into a flat array. Complements avpicture_fill. * adding a new option -pix_fmt to the ffmpeg, in order to control pixel format for the codecs that do support it, like rawvideo, for example. * reducing complexity of the rawvideo codec by splitting it in two and making it more reliable via hooking up to the avpicture_layout. Plus adding new FourCC as described here: http://www.fourcc.org * A tiny fix for avienc.c that makes avih and video strf consistent regarding codec FourCC. Originally committed as revision 1842 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/raw.c | 171 ++++++++++++++++++++++--------------------------------- 1 file changed, 68 insertions(+), 103 deletions(-) (limited to 'libavcodec/raw.c') diff --git a/libavcodec/raw.c b/libavcodec/raw.c index 86591aae46..8c38b8e8c1 100644 --- a/libavcodec/raw.c +++ b/libavcodec/raw.c @@ -24,6 +24,12 @@ #include "avcodec.h" +typedef struct RawVideoContext { + unsigned char * buffer; /* block of memory for holding one frame */ + unsigned char * p; /* current position in buffer */ + int length; /* number of bytes in buffer */ + AVFrame pic; ///< AVCodecContext.coded_frame +} RawVideoContext; typedef struct PixleFormatTag { int pix_fmt; @@ -31,8 +37,19 @@ typedef struct PixleFormatTag { } PixelFormatTag; const PixelFormatTag pixelFormatTags[] = { - { PIX_FMT_YUV422, MKTAG('Y', '4', '2', '2') }, - { PIX_FMT_YUV420P, MKTAG('I', '4', '2', '0') }, + { PIX_FMT_YUV420P, MKTAG('I', '4', '2', '0') }, /* Planar formats */ + { PIX_FMT_YUV420P, MKTAG('I', 'Y', 'U', 'V') }, + { PIX_FMT_YUV410P, MKTAG('Y', 'U', 'V', '9') }, + { PIX_FMT_YUV411P, MKTAG('Y', '4', '1', 'B') }, + { PIX_FMT_YUV422P, MKTAG('Y', '4', '2', 'B') }, + { PIX_FMT_GRAY8, MKTAG('Y', '8', '0', '0') }, + { PIX_FMT_GRAY8, MKTAG(' ', ' ', 'Y', '8') }, + + + { PIX_FMT_YUV422, MKTAG('Y', '4', '2', '2') }, /* Packed formats */ + { PIX_FMT_YUV422, MKTAG('U', 'Y', 'V', 'Y') }, + { PIX_FMT_GRAY8, MKTAG('G', 'R', 'E', 'Y') }, + { -1, 0 }, }; @@ -47,35 +64,37 @@ static int findPixelFormat(unsigned int fourcc) return PIX_FMT_YUV420P; } +static unsigned int findFourCC(int fmt) +{ + const PixelFormatTag * tags = pixelFormatTags; + while (tags->pix_fmt >= 0) { + if (tags->pix_fmt == fmt) + return tags->fourcc; + tags++; + } + return 0; +} -typedef struct RawVideoContext { - unsigned char * buffer; /* block of memory for holding one frame */ - unsigned char * p; /* current position in buffer */ - int length; /* number of bytes in buffer */ - AVFrame pic; ///< AVCodecContext.coded_frame -} RawVideoContext; - +/* RAW Decoder Implementation */ -static int raw_init(AVCodecContext *avctx) +static int raw_init_decoder(AVCodecContext *avctx) { RawVideoContext *context = avctx->priv_data; - if (avctx->codec_tag) { - avctx->pix_fmt = findPixelFormat(avctx->codec_tag); - } - - context->length = avpicture_get_size(avctx->pix_fmt, avctx->width, avctx->height); - context->buffer = av_malloc(context->length); - context->p = context->buffer; - - context->pic.pict_type= FF_I_TYPE; - context->pic.key_frame= 1; + if (avctx->codec_tag) + avctx->pix_fmt = findPixelFormat(avctx->codec_tag); + + context->length = avpicture_get_size(avctx->pix_fmt, avctx->width, avctx->height); + context->buffer = av_malloc(context->length); + context->p = context->buffer; + context->pic.pict_type = FF_I_TYPE; + context->pic.key_frame = 1; + avctx->coded_frame= &context->pic; - if (! context->buffer) { + if (!context->buffer) return -1; - } - + return 0; } @@ -110,102 +129,48 @@ static int raw_decode(AVCodecContext *avctx, return bytesNeeded; } -static int raw_close(AVCodecContext *avctx) +static int raw_close_decoder(AVCodecContext *avctx) { RawVideoContext *context = avctx->priv_data; + + av_freep(&context->buffer); + return 0; +} - av_freep(& context->buffer); +/* RAW Encoder Implementation */ +static int raw_init_encoder(AVCodecContext *avctx) +{ + avctx->coded_frame = (AVPicture*)avctx->priv_data; + avctx->coded_frame->pict_type = FF_I_TYPE; + avctx->coded_frame->key_frame = 1; + avctx->codec_tag = findFourCC(avctx->pix_fmt); return 0; } static int raw_encode(AVCodecContext *avctx, unsigned char *frame, int buf_size, void *data) { - AVPicture * picture = data; - - unsigned char *src; - unsigned char *dest = frame; - int i, j; - - int w = avctx->width; - int h = avctx->height; - int size = avpicture_get_size(avctx->pix_fmt, w, h); - - if (size > buf_size) { - return -1; - } - - switch(avctx->pix_fmt) { - case PIX_FMT_YUV420P: - for(i=0;i<3;i++) { - if (i == 1) { - w >>= 1; - h >>= 1; - } - src = picture->data[i]; - for(j=0;jlinesize[i]; - } - } - break; - case PIX_FMT_YUV422P: - for(i=0;i<3;i++) { - if (i == 1) { - w >>= 1; - } - src = picture->data[i]; - for(j=0;jlinesize[i]; - } - } - break; - case PIX_FMT_YUV444P: - for(i=0;i<3;i++) { - src = picture->data[i]; - for(j=0;jlinesize[i]; - } - } - break; - case PIX_FMT_YUV422: - src = picture->data[0]; - for(j=0;jlinesize[0]; - } - break; - case PIX_FMT_RGB24: - case PIX_FMT_BGR24: - src = picture->data[0]; - for(j=0;jlinesize[0]; - } - break; - default: - return -1; - } - - return size; + return avpicture_layout((AVPicture *)data, avctx->pix_fmt, avctx->width, + avctx->height, frame, buf_size); } +AVCodec rawvideo_encoder = { + "rawvideo", + CODEC_TYPE_VIDEO, + CODEC_ID_RAWVIDEO, + sizeof(AVFrame), + raw_init_encoder, + raw_encode, +}; -AVCodec rawvideo_codec = { +AVCodec rawvideo_decoder = { "rawvideo", CODEC_TYPE_VIDEO, CODEC_ID_RAWVIDEO, sizeof(RawVideoContext), - raw_init, - raw_encode, - raw_close, + raw_init_decoder, + NULL, + raw_close_decoder, raw_decode, }; -- cgit v1.2.3