[vlc-commits] Used vlc_memalign in opengl.c

[Laurent Aimar]

vlc | branch: master | Laurent Aimar <fenrir at videolan.org> | Wed May 25 23:06:42 2011 +0200| [eaad1ce32cb21dcc531ca1d3e9f422e9ac3a9c82] | committer: Laurent Aimar

Used vlc_memalign in opengl.c

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=eaad1ce32cb21dcc531ca1d3e9f422e9ac3a9c82
---

 modules/video_output/opengl.c |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/modules/video_output/opengl.c b/modules/video_output/opengl.c
index ca7c324..274e8fe 100644
--- a/modules/video_output/opengl.c
+++ b/modules/video_output/opengl.c
@@ -103,6 +103,7 @@ struct vout_display_opengl_t {
 
     GLuint     texture[VLCGL_TEXTURE_COUNT];
     uint8_t    *buffer[VLCGL_TEXTURE_COUNT];
+    void       *buffer_base[VLCGL_TEXTURE_COUNT];
 
     picture_pool_t *pool;
 };
@@ -212,6 +213,7 @@ vout_display_opengl_t *vout_display_opengl_New(video_format_t *fmt,
     for (int i = 0; i < VLCGL_TEXTURE_COUNT; i++) {
         vgl->texture[i] = 0;
         vgl->buffer[i]  = NULL;
+        vgl->buffer_base[i]  = NULL;
     }
     vgl->pool = NULL;
 
@@ -233,7 +235,7 @@ void vout_display_opengl_Delete(vout_display_opengl_t *vgl)
     if (vgl->pool) {
         picture_pool_Delete(vgl->pool);
         for (int i = 0; i < VLCGL_TEXTURE_COUNT; i++)
-            free(vgl->buffer[i]);
+            free(vgl->buffer_base[i]);
     }
     free(vgl);
 }
@@ -283,9 +285,8 @@ picture_pool_t *vout_display_opengl_GetPool(vout_display_opengl_t *vgl)
 
     int i;
     for (i = 0; i < VLCGL_TEXTURE_COUNT; i++) {
-
-        /* TODO memalign would be way better */
-        vgl->buffer[i] = malloc(vgl->tex_width * vgl->tex_height * vgl->chroma->pixel_size);
+        vgl->buffer[i] = vlc_memalign(&vgl->buffer_base[i], 16,
+                                      vgl->tex_width * vgl->tex_height * vgl->chroma->pixel_size);
         if (!vgl->buffer[i])
             break;