# HG changeset patch # User romansh # Date 1052334105 0 # Node ID b88dfc4bbf8c1d774d58a4f36fca474a5c70df8e # Parent 31d090bae36cff6dca99766a9efdf0269a18f6eb * 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. diff -r 31d090bae36c -r b88dfc4bbf8c allcodecs.c --- a/allcodecs.c Wed May 07 12:28:36 2003 +0000 +++ b/allcodecs.c Wed May 07 19:01:45 2003 +0000 @@ -65,7 +65,8 @@ register_avcodec(&mjpeg_encoder); register_avcodec(&huffyuv_encoder); #endif /* CONFIG_ENCODERS */ - register_avcodec(&rawvideo_codec); + register_avcodec(&rawvideo_encoder); + register_avcodec(&rawvideo_decoder); /* decoders */ #ifdef CONFIG_DECODERS diff -r 31d090bae36c -r b88dfc4bbf8c avcodec.h --- a/avcodec.h Wed May 07 12:28:36 2003 +0000 +++ b/avcodec.h Wed May 07 19:01:45 2003 +0000 @@ -1244,7 +1244,8 @@ #undef PCM_CODEC /* dummy raw video codec */ -extern AVCodec rawvideo_codec; +extern AVCodec rawvideo_encoder; +extern AVCodec rawvideo_decoder; /* the following codecs use external GPL libs */ extern AVCodec ac3_decoder; @@ -1281,9 +1282,12 @@ int avpicture_fill(AVPicture *picture, uint8_t *ptr, int pix_fmt, int width, int height); +int avpicture_layout(AVPicture* src, int pix_fmt, int width, int height, + unsigned char *dest, int dest_size); int avpicture_get_size(int pix_fmt, int width, int height); void avcodec_get_chroma_sub_sample(int pix_fmt, int *h_shift, int *v_shift); const char *avcodec_get_pix_fmt_name(int pix_fmt); +enum PixelFormat avcodec_get_pix_fmt(const char* name); #define FF_LOSS_RESOLUTION 0x0001 /* loss due to resolution change */ #define FF_LOSS_DEPTH 0x0002 /* loss due to color depth change */ diff -r 31d090bae36c -r b88dfc4bbf8c imgconvert.c --- a/imgconvert.c Wed May 07 12:28:36 2003 +0000 +++ b/imgconvert.c Wed May 07 19:01:45 2003 +0000 @@ -224,6 +224,16 @@ return pix_fmt_info[pix_fmt].name; } +enum PixelFormat avcodec_get_pix_fmt(const char* name) +{ + int i; + + for (i=0; i < PIX_FMT_NB; i++) + if (!strcmp(pix_fmt_info[i].name, name)) + break; + return i; +} + /* Picture field are filled with 'ptr' addresses. Also return size */ int avpicture_fill(AVPicture *picture, uint8_t *ptr, int pix_fmt, int width, int height) @@ -303,6 +313,47 @@ } } +int avpicture_layout(AVPicture* src, int pix_fmt, int width, int height, + unsigned char *dest, int dest_size) +{ + PixFmtInfo* pf = &pix_fmt_info[pix_fmt]; + int i, j, w, h, data_planes; + unsigned char* s; + int size = avpicture_get_size(pix_fmt, width, height); + + if (size > dest_size) + return -1; + + if (pf->pixel_type == FF_PIXEL_PACKED) { + if (pix_fmt == PIX_FMT_YUV422 || pix_fmt == PIX_FMT_RGB565 || + pix_fmt == PIX_FMT_RGB555) + w = width * 2; + else + w = width * (pf->depth * pf->nb_channels / 8); + data_planes = 1; + h = height; + } else { + data_planes = pf->nb_channels; + w = width; + h = height; + } + + for (i=0; i> pf->x_chroma_shift; + h = height >> pf->y_chroma_shift; + } + s = src->data[i]; + for(j=0; jlinesize[i]; + } + } + + return size; +} + int avpicture_get_size(int pix_fmt, int width, int height) { AVPicture dummy_pict; diff -r 31d090bae36c -r b88dfc4bbf8c raw.c --- a/raw.c Wed May 07 12:28:36 2003 +0000 +++ b/raw.c Wed May 07 19:01:45 2003 +0000 @@ -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 @@ } 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 @@ 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 @@ 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, };