virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-13 21:28:01 +02:00
Code Issues Releases Activity

quicktime 'raw ' support

Browse Source 
Originally committed as revision 8168 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Baptiste Coudurier 2007-03-01 13:03:33 +00:00
parent 6b936ec662
commit c828c70916
2 changed files with 27 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
libavcodec/raw.c
View File

@ -63,9 +63,27 @@ static const PixelFormatTag pixelFormatTags[] = {
{ -1, 0 }, { -1, 0 },
}; };
static int findPixelFormat(unsigned int fourcc) static const PixelFormatTag pixelFormatBpsAVI[] = {
{ PIX_FMT_PAL8, 8 },
{ PIX_FMT_RGB555, 15 },
{ PIX_FMT_RGB555, 16 },
{ PIX_FMT_BGR24, 24 },
{ PIX_FMT_RGB32, 32 },
{ -1, 0 },
};
static const PixelFormatTag pixelFormatBpsMOV[] = {
/* FIXME fix swscaler to support those */
/* http://developer.apple.com/documentation/QuickTime/QTFF/QTFFChap3/chapter_4_section_2.html */
{ PIX_FMT_PAL8, 8 },
{ PIX_FMT_BGR555, 16 },
{ PIX_FMT_RGB24, 24 },
{ PIX_FMT_BGR32_1, 32 },
{ -1, 0 },
};
static int findPixelFormat(const PixelFormatTag *tags, unsigned int fourcc)
{ {
const PixelFormatTag * tags = pixelFormatTags;
while (tags->pix_fmt >= 0) { while (tags->pix_fmt >= 0) {
if (tags->fourcc == fourcc) if (tags->fourcc == fourcc)
return tags->pix_fmt; return tags->pix_fmt;
@ -91,17 +109,12 @@ static int raw_init_decoder(AVCodecContext *avctx)
{ {
RawVideoContext *context = avctx->priv_data; RawVideoContext *context = avctx->priv_data;
if (avctx->codec_tag) if (avctx->codec_tag == MKTAG('r','a','w',' '))
avctx->pix_fmt = findPixelFormat(avctx->codec_tag); avctx->pix_fmt = findPixelFormat(pixelFormatBpsMOV, avctx->bits_per_sample);
else if (avctx->bits_per_sample){ else if (avctx->codec_tag)
switch(avctx->bits_per_sample){ avctx->pix_fmt = findPixelFormat(pixelFormatTags, avctx->codec_tag);
case 8: avctx->pix_fmt= PIX_FMT_PAL8 ; break; else if (avctx->bits_per_sample)
case 15: avctx->pix_fmt= PIX_FMT_RGB555; break; avctx->pix_fmt = findPixelFormat(pixelFormatBpsAVI, avctx->bits_per_sample);
case 16: avctx->pix_fmt= PIX_FMT_RGB555; break;
case 24: avctx->pix_fmt= PIX_FMT_BGR24 ; break;
case 32: avctx->pix_fmt= PIX_FMT_RGB32; break;
}
}
context->length = avpicture_get_size(avctx->pix_fmt, avctx->width, avctx->height); context->length = avpicture_get_size(avctx->pix_fmt, avctx->width, avctx->height);
context->buffer = av_malloc(context->length); context->buffer = av_malloc(context->length);

2
libavformat/mov.c
View File

@ -68,7 +68,7 @@
static const AVCodecTag mov_video_tags[] = { static const AVCodecTag mov_video_tags[] = {
/* { CODEC_ID_, MKTAG('c', 'v', 'i', 'd') }, *//* Cinepak */ /* { CODEC_ID_, MKTAG('c', 'v', 'i', 'd') }, *//* Cinepak */
/* { CODEC_ID_H263, MKTAG('r', 'a', 'w', ' ') }, *//* Uncompressed RGB */ { CODEC_ID_RAWVIDEO, MKTAG('r', 'a', 'w', ' ') }, /* Uncompressed RGB */
/* { CODEC_ID_H263, MKTAG('Y', 'u', 'v', '2') }, *//* Uncompressed YUV422 */ /* { CODEC_ID_H263, MKTAG('Y', 'u', 'v', '2') }, *//* Uncompressed YUV422 */
/* { CODEC_ID_RAWVIDEO, MKTAG('A', 'V', 'U', 'I') }, *//* YUV with alpha-channel (AVID Uncompressed) */ /* { CODEC_ID_RAWVIDEO, MKTAG('A', 'V', 'U', 'I') }, *//* YUV with alpha-channel (AVID Uncompressed) */
/* Graphics */ /* Graphics */