[FFmpeg-devel] [PATCH]Fix rawvideo linesize
Carl Eugen Hoyos
cehoyos at ag.or.at
Mon Jan 2 02:08:27 CET 2012
On Saturday 24 December 2011 01:22:21 am Carl Eugen Hoyos wrote:
> Attached patch fixes the samples from ticket #823 for me.
Updated patch attached.
Please comment, Carl Eugen
-------------- next part --------------
diff --git a/libavcodec/rawdec.c b/libavcodec/rawdec.c
index acaa0ea..094058a 100644
--- a/libavcodec/rawdec.c
+++ b/libavcodec/rawdec.c
@@ -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) &&
avctx->pix_fmt==PIX_FMT_PAL8 &&
(!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);
if (!context->buffer)
return -1;
@@ -136,6 +136,7 @@ static int raw_decode(AVCodecContext *avctx,
{
const uint8_t *buf = avpkt->data;
int buf_size = avpkt->size;
+ int linesize_align = 4;
RawVideoContext *context = avctx->priv_data;
AVFrame * frame = (AVFrame *) data;
@@ -163,13 +164,16 @@ static int raw_decode(AVCodecContext *avctx,
dst[2*i+0]= buf[i]>>4;
dst[2*i+1]= buf[i]&15;
}
+ linesize_align = 8;
- } else
+ } else {
for(i=0; 4*i+3 < buf_size; i++){
dst[4*i+0]= buf[i]>>6;
dst[4*i+1]= buf[i]>>4&3;
dst[4*i+2]= buf[i]>>2&3;
dst[4*i+3]= buf[i] &3;
}
+ linesize_align = 16;
+ }
buf= dst;
}
@@ -199,9 +203,10 @@ static int raw_decode(AVCodecContext *avctx,
avctx->pix_fmt==PIX_FMT_RGB555LE ||
avctx->pix_fmt==PIX_FMT_RGB555BE ||
avctx->pix_fmt==PIX_FMT_RGB565LE ||
+ avctx->pix_fmt==PIX_FMT_MONOWHITE ||
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)
flip(avctx, picture);
More information about the ffmpeg-devel
mailing list