[FFmpeg-devel] [PATCH 6/7] utvideoenc: align mangled buffer starts.

[Michael Niedermayer]

This is essential for fast SIMD accesses.
The same should be done with the predict output.

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
---
 libavcodec/utvideo.h    |    1 +
 libavcodec/utvideoenc.c |   14 ++++++++------
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/libavcodec/utvideo.h b/libavcodec/utvideo.h
index 2441375..135e927 100644
--- a/libavcodec/utvideo.h
+++ b/libavcodec/utvideo.h
@@ -75,6 +75,7 @@ typedef struct UtvideoContext {
     int      interlaced;
     int      frame_pred;
 
+    int slice_stride;
     uint8_t *slice_bits, *slice_buffer[4];
     int      slice_bits_size;
 } UtvideoContext;
diff --git a/libavcodec/utvideoenc.c b/libavcodec/utvideoenc.c
index ee3ed83..cb2e777 100644
--- a/libavcodec/utvideoenc.c
+++ b/libavcodec/utvideoenc.c
@@ -145,7 +145,8 @@ static av_cold int utvideo_encode_init(AVCodecContext *avctx)
     }
 
     for(i=0; i<c->planes; i++) {
-        c->slice_buffer[i] = av_malloc(avctx->width * (avctx->height+1) +
+        c->slice_stride = FFALIGN(avctx->width, 32);
+        c->slice_buffer[i] = av_malloc(c->slice_stride * (avctx->height+2) +
                                        FF_INPUT_BUFFER_PADDING_SIZE);
         if (!c->slice_buffer[i]) {
             av_log(avctx, AV_LOG_ERROR, "Cannot allocate temporary buffer 1.\n");
@@ -196,11 +197,11 @@ static av_cold int utvideo_encode_init(AVCodecContext *avctx)
     return 0;
 }
 
-static void mangle_rgb_planes(uint8_t *dst[4], uint8_t *src, int step, int stride, int width,
+static void mangle_rgb_planes(uint8_t *dst[4], int dst_stride, uint8_t *src, int step, int stride, int width,
                               int height)
 {
     int i, j;
-    int k=width;
+    int k = 2*dst_stride;
     for (j = 0; j < height; j++) {
         if(step==3) {
             for (i = 0; i < width*step; i += step,k++) {
@@ -220,6 +221,7 @@ static void mangle_rgb_planes(uint8_t *dst[4], uint8_t *src, int step, int strid
                 dst[3][k] = src[i + 3];
             }
         }
+        k += dst_stride - width;
         src += stride;
     }
 }
@@ -543,7 +545,7 @@ static int utvideo_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
 
     /* In case of RGB, mangle the planes to Ut Video's format */
     if (avctx->pix_fmt == PIX_FMT_RGBA || avctx->pix_fmt == PIX_FMT_RGB24)
-        mangle_rgb_planes(c->slice_buffer, pic->data[0], c->planes, pic->linesize[0], width,
+        mangle_rgb_planes(c->slice_buffer, c->slice_stride, pic->data[0], c->planes, pic->linesize[0], width,
                           height);
 
     /* Deal with the planes */
@@ -551,8 +553,8 @@ static int utvideo_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
     case PIX_FMT_RGB24:
     case PIX_FMT_RGBA:
         for (i = 0; i < c->planes; i++) {
-            ret = encode_plane(avctx, c->slice_buffer[i] + width,
-                               c->slice_buffer[i], width,
+            ret = encode_plane(avctx, c->slice_buffer[i] + 2*c->slice_stride,
+                               c->slice_buffer[i], c->slice_stride,
                                width, height, &pb);
 
             if (ret) {
-- 
1.7.9.5