generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

PAL8 support (fixed BLUR8.AVI)

Browse Source 
cleanup

Originally committed as revision 5105 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer
2006-03-03 21:33:06 +00:00
parent b5c85991f6
commit ae9e417358
1 changed files with 13 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
libavcodec/raw.c
View File

@@ -26,7 +26,6 @@
typedef struct RawVideoContext { typedef struct RawVideoContext {
unsigned char * buffer; /* block of memory for holding one frame */ unsigned char * buffer; /* block of memory for holding one frame */
unsigned char * p; /* current position in buffer */
int length; /* number of bytes in buffer */ int length; /* number of bytes in buffer */
AVFrame pic; ///< AVCodecContext.coded_frame AVFrame pic; ///< AVCodecContext.coded_frame
} RawVideoContext; } RawVideoContext;
@@ -86,6 +85,7 @@ static int raw_init_decoder(AVCodecContext *avctx)
avctx->pix_fmt = findPixelFormat(avctx->codec_tag); avctx->pix_fmt = findPixelFormat(avctx->codec_tag);
else if (avctx->bits_per_sample){ else if (avctx->bits_per_sample){
switch(avctx->bits_per_sample){ switch(avctx->bits_per_sample){
case 8: avctx->pix_fmt= PIX_FMT_PAL8 ; break;
case 15: avctx->pix_fmt= PIX_FMT_RGB555; break; case 15: avctx->pix_fmt= PIX_FMT_RGB555; break;
case 16: avctx->pix_fmt= PIX_FMT_RGB565; break; case 16: avctx->pix_fmt= PIX_FMT_RGB565; break;
case 24: avctx->pix_fmt= PIX_FMT_BGR24 ; break; case 24: avctx->pix_fmt= PIX_FMT_BGR24 ; break;
@@ -95,7 +95,6 @@ static int raw_init_decoder(AVCodecContext *avctx)
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);
context->p = context->buffer;
context->pic.pict_type = FF_I_TYPE; context->pic.pict_type = FF_I_TYPE;
context->pic.key_frame = 1; context->pic.key_frame = 1;
@@ -108,7 +107,7 @@ static int raw_init_decoder(AVCodecContext *avctx)
} }
static void flip(AVCodecContext *avctx, AVPicture * picture){ static void flip(AVCodecContext *avctx, AVPicture * picture){
if(!avctx->codec_tag && avctx->bits_per_sample && picture->linesize[1]==0){ if(!avctx->codec_tag && avctx->bits_per_sample && picture->linesize[2]==0){
picture->data[0] += picture->linesize[0] * (avctx->height-1); picture->data[0] += picture->linesize[0] * (avctx->height-1);
picture->linesize[0] *= -1; picture->linesize[0] *= -1;
} }
@@ -119,7 +118,6 @@ static int raw_decode(AVCodecContext *avctx,
uint8_t *buf, int buf_size) uint8_t *buf, int buf_size)
{ {
RawVideoContext *context = avctx->priv_data; RawVideoContext *context = avctx->priv_data;
int bytesNeeded;
AVFrame * frame = (AVFrame *) data; AVFrame * frame = (AVFrame *) data;
AVPicture * picture = (AVPicture *) data; AVPicture * picture = (AVPicture *) data;
@@ -127,29 +125,23 @@ static int raw_decode(AVCodecContext *avctx,
frame->interlaced_frame = avctx->coded_frame->interlaced_frame; frame->interlaced_frame = avctx->coded_frame->interlaced_frame;
frame->top_field_first = avctx->coded_frame->top_field_first; frame->top_field_first = avctx->coded_frame->top_field_first;
/* Early out without copy if packet size == frame size */ if(buf_size < context->length - (avctx->pix_fmt==PIX_FMT_PAL8 ? 256*4 : 0))
if (buf_size == context->length && context->p == context->buffer) { return -1;
avpicture_fill(picture, buf, avctx->pix_fmt, avctx->width, avctx->height); avpicture_fill(picture, buf, avctx->pix_fmt, avctx->width, avctx->height);
if(avctx->pix_fmt==PIX_FMT_PAL8 && buf_size < context->length){
frame->data[1]= context->buffer;
}
if (avctx->palctrl && avctx->palctrl->palette_changed) {
memcpy(frame->data[1], avctx->palctrl->palette, AVPALETTE_SIZE);
avctx->palctrl->palette_changed = 0;
}
flip(avctx, picture); flip(avctx, picture);
*data_size = sizeof(AVPicture); *data_size = sizeof(AVPicture);
return buf_size; return buf_size;
} }
bytesNeeded = context->length - (context->p - context->buffer);
if (buf_size < bytesNeeded) {
memcpy(context->p, buf, buf_size);
context->p += buf_size;
return buf_size;
}
memcpy(context->p, buf, bytesNeeded);
context->p = context->buffer;
avpicture_fill(picture, context->buffer, avctx->pix_fmt, avctx->width, avctx->height);
flip(avctx, picture);
*data_size = sizeof(AVPicture);
return bytesNeeded;
}
static int raw_close_decoder(AVCodecContext *avctx) static int raw_close_decoder(AVCodecContext *avctx)
{ {
RawVideoContext *context = avctx->priv_data; RawVideoContext *context = avctx->priv_data;