X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fraw.c;h=ee3edb6da7d4aa6a87a891874ca6ea4194faf3ee;hb=94f28061f572b5946275cd29be0683c22cd58a18;hp=8c38b8e8c1e943b0b60f5ca960423df6399ff349;hpb=631670888d4ff9ca08c9d0804082511a1bc587a5;p=ffmpeg diff --git a/libavcodec/raw.c b/libavcodec/raw.c index 8c38b8e8c1e..ee3edb6da7d 100644 --- a/libavcodec/raw.c +++ b/libavcodec/raw.c @@ -1,176 +1,80 @@ /* * Raw Video Codec - * Copyright (c) 2001 Fabrice Bellard. + * Copyright (c) 2001 Fabrice Bellard * - * This library is free software; you can redistribute it and/or + * 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 of the License, or (at your option) any later version. + * version 2.1 of the License, or (at your option) any later version. * - * This library is distributed in the hope that it will be useful, + * 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 this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - + /** - * @file raw.c + * @file libavcodec/raw.c * Raw Video Codec */ - -#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; - unsigned int fourcc; -} PixelFormatTag; +#include "avcodec.h" +#include "raw.h" -const PixelFormatTag pixelFormatTags[] = { +const PixelFormatTag ff_raw_pixelFormatTags[] = { { PIX_FMT_YUV420P, MKTAG('I', '4', '2', '0') }, /* Planar formats */ { PIX_FMT_YUV420P, MKTAG('I', 'Y', 'U', 'V') }, + { PIX_FMT_YUV420P, MKTAG('Y', 'V', '1', '2') }, { PIX_FMT_YUV410P, MKTAG('Y', 'U', 'V', '9') }, + { PIX_FMT_YUV410P, MKTAG('Y', 'V', 'U', '9') }, { PIX_FMT_YUV411P, MKTAG('Y', '4', '1', 'B') }, { PIX_FMT_YUV422P, MKTAG('Y', '4', '2', 'B') }, + { PIX_FMT_YUV422P, MKTAG('P', '4', '2', '2') }, { 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_YUYV422, MKTAG('Y', 'U', 'Y', '2') }, /* Packed formats */ + { PIX_FMT_YUYV422, MKTAG('Y', '4', '2', '2') }, + { PIX_FMT_YUYV422, MKTAG('V', '4', '2', '2') }, + { PIX_FMT_YUYV422, MKTAG('V', 'Y', 'U', 'Y') }, + { PIX_FMT_YUYV422, MKTAG('Y', 'U', 'N', 'V') }, + { PIX_FMT_UYVY422, MKTAG('U', 'Y', 'V', 'Y') }, + { PIX_FMT_UYVY422, MKTAG('H', 'D', 'Y', 'C') }, + { PIX_FMT_UYVY422, MKTAG('U', 'Y', 'N', 'V') }, + { PIX_FMT_UYVY422, MKTAG('U', 'Y', 'N', 'Y') }, + { PIX_FMT_UYVY422, MKTAG('u', 'y', 'v', '1') }, + { PIX_FMT_UYVY422, MKTAG('2', 'V', 'u', '1') }, { PIX_FMT_GRAY8, MKTAG('G', 'R', 'E', 'Y') }, - - { -1, 0 }, + { PIX_FMT_RGB555, MKTAG('R', 'G', 'B', 15) }, + { PIX_FMT_BGR555, MKTAG('B', 'G', 'R', 15) }, + { PIX_FMT_RGB565, MKTAG('R', 'G', 'B', 16) }, + { PIX_FMT_BGR565, MKTAG('B', 'G', 'R', 16) }, + { PIX_FMT_RGB565, MKTAG( 3 , 0 , 0 , 0 ) }, + + /* quicktime */ + { PIX_FMT_UYVY422, MKTAG('2', 'v', 'u', 'y') }, + { PIX_FMT_UYVY422, MKTAG('A', 'V', 'U', 'I') }, /* FIXME merge both fields */ + { PIX_FMT_YUYV422, MKTAG('y', 'u', 'v', '2') }, + { PIX_FMT_YUYV422, MKTAG('y', 'u', 'v', 's') }, + { PIX_FMT_PAL8, MKTAG('W', 'R', 'A', 'W') }, + + { PIX_FMT_NONE, 0 }, }; -static int findPixelFormat(unsigned int fourcc) -{ - const PixelFormatTag * tags = pixelFormatTags; - while (tags->pix_fmt >= 0) { - if (tags->fourcc == fourcc) - return tags->pix_fmt; - tags++; - } - return PIX_FMT_YUV420P; -} - -static unsigned int findFourCC(int fmt) +unsigned int avcodec_pix_fmt_to_codec_tag(enum PixelFormat fmt) { - const PixelFormatTag * tags = pixelFormatTags; + const PixelFormatTag * tags = ff_raw_pixelFormatTags; while (tags->pix_fmt >= 0) { if (tags->pix_fmt == fmt) - return tags->fourcc; - tags++; - } - return 0; -} - -/* RAW Decoder Implementation */ - -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; - - avctx->coded_frame= &context->pic; - - if (!context->buffer) - return -1; - - return 0; -} - -static int raw_decode(AVCodecContext *avctx, - void *data, int *data_size, - uint8_t *buf, int buf_size) -{ - RawVideoContext *context = avctx->priv_data; - int bytesNeeded; - - AVPicture * picture = (AVPicture *) data; - - /* Early out without copy if packet size == frame size */ - if (buf_size == context->length && context->p == context->buffer) { - avpicture_fill(picture, buf, avctx->pix_fmt, avctx->width, avctx->height); - *data_size = sizeof(AVPicture); - return buf_size; - } - - bytesNeeded = context->length - (context->p - context->buffer); - if (buf_size < bytesNeeded) { - memcpy(context->p, buf, buf_size); - context->p += buf_size; - *data_size = 0; - return buf_size; + return tags->fourcc; + tags++; } - - memcpy(context->p, buf, bytesNeeded); - context->p = context->buffer; - avpicture_fill(picture, context->buffer, avctx->pix_fmt, avctx->width, avctx->height); - *data_size = sizeof(AVPicture); - return bytesNeeded; -} - -static int raw_close_decoder(AVCodecContext *avctx) -{ - RawVideoContext *context = avctx->priv_data; - - av_freep(&context->buffer); - return 0; -} - -/* 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) -{ - 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_decoder = { - "rawvideo", - CODEC_TYPE_VIDEO, - CODEC_ID_RAWVIDEO, - sizeof(RawVideoContext), - raw_init_decoder, - NULL, - raw_close_decoder, - raw_decode, -};