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

Fix linesize for rawvideo in mov.

Browse Source 
Fixes ticket #823.
This commit is contained in:
Carl Eugen Hoyos 2012-01-12 17:02:13 +01:00
parent ef3a19d595
commit 01616f12e2
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libavcodec/rawdec.c
View File

@ -106,7 +106,7 @@ static av_cold int raw_init_decoder(AVCodecContext *avctx)
if((avctx->bits_per_coded_sample == 4 || avctx->bits_per_coded_sample == 2) && if((avctx->bits_per_coded_sample == 4 || avctx->bits_per_coded_sample == 2) &&
avctx->pix_fmt==PIX_FMT_PAL8 && avctx->pix_fmt==PIX_FMT_PAL8 &&
(!avctx->codec_tag || avctx->codec_tag == MKTAG('r','a','w',' '))){ (!avctx->codec_tag || avctx->codec_tag == MKTAG('r','a','w',' '))){
context->length = avpicture_get_size(avctx->pix_fmt, (avctx->width+3)&~3, avctx->height); context->length = avpicture_get_size(avctx->pix_fmt, FFALIGN(avctx->width, 16), avctx->height);
context->buffer = av_malloc(context->length); context->buffer = av_malloc(context->length);
if (!context->buffer) if (!context->buffer)
return -1; return -1;
@ -137,6 +137,7 @@ static int raw_decode(AVCodecContext *avctx,
{ {
const uint8_t *buf = avpkt->data; const uint8_t *buf = avpkt->data;
int buf_size = avpkt->size; int buf_size = avpkt->size;
int linesize_align = 4;
RawVideoContext *context = avctx->priv_data; RawVideoContext *context = avctx->priv_data;
AVFrame * frame = (AVFrame *) data; AVFrame * frame = (AVFrame *) data;
@ -164,13 +165,16 @@ static int raw_decode(AVCodecContext *avctx,
dst[2*i+0]= buf[i]>>4; dst[2*i+0]= buf[i]>>4;
dst[2*i+1]= buf[i]&15; dst[2*i+1]= buf[i]&15;
} }
} else linesize_align = 8;
} else {
for(i=0; 4*i+3 < buf_size; i++){ for(i=0; 4*i+3 < buf_size; i++){
dst[4*i+0]= buf[i]>>6; dst[4*i+0]= buf[i]>>6;
dst[4*i+1]= buf[i]>>4&3; dst[4*i+1]= buf[i]>>4&3;
dst[4*i+2]= buf[i]>>2&3; dst[4*i+2]= buf[i]>>2&3;
dst[4*i+3]= buf[i] &3; dst[4*i+3]= buf[i] &3;
} }
linesize_align = 16;
}
buf= dst; buf= dst;
} }
@ -200,9 +204,10 @@ static int raw_decode(AVCodecContext *avctx,
avctx->pix_fmt==PIX_FMT_RGB555LE || avctx->pix_fmt==PIX_FMT_RGB555LE ||
avctx->pix_fmt==PIX_FMT_RGB555BE || avctx->pix_fmt==PIX_FMT_RGB555BE ||
avctx->pix_fmt==PIX_FMT_RGB565LE || avctx->pix_fmt==PIX_FMT_RGB565LE ||
avctx->pix_fmt==PIX_FMT_MONOWHITE ||
avctx->pix_fmt==PIX_FMT_PAL8) && avctx->pix_fmt==PIX_FMT_PAL8) &&
((frame->linesize[0]+3)&~3)*avctx->height <= buf_size) FFALIGN(frame->linesize[0], linesize_align)*avctx->height <= buf_size)
frame->linesize[0] = (frame->linesize[0]+3)&~3; frame->linesize[0] = FFALIGN(frame->linesize[0], linesize_align);
if(context->flip) if(context->flip)
flip(avctx, picture); flip(avctx, picture);