avutil/frame: Try to align width to achive linesize[0] alignment
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 18 Jun 2013 14:39:23 +0000 (16:39 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 18 Jun 2013 14:50:07 +0000 (16:50 +0200)
This results in more alignment for pixel formats that have "odd" pixel
sizes like RGB24. It makes access through SIMD easier

Works around Issue described in Ticket1031

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavutil/frame.c

index 24ad0dd..7584ae3 100644 (file)
@@ -126,10 +126,14 @@ static int get_video_buffer(AVFrame *frame, int align)
         return ret;
 
     if (!frame->linesize[0]) {
-        ret = av_image_fill_linesizes(frame->linesize, frame->format,
-                                      frame->width);
-        if (ret < 0)
-            return ret;
+        for(i=1; i<=align; i+=i) {
+            ret = av_image_fill_linesizes(frame->linesize, frame->format,
+                                          FFALIGN(frame->width, i));
+            if (ret < 0)
+                return ret;
+            if (!(frame->linesize[0] & (align-1)))
+                break;
+        }
 
         for (i = 0; i < 4 && frame->linesize[i]; i++)
             frame->linesize[i] = FFALIGN(frame->linesize[i], align);