[FFmpeg-cvslog] r25110 - trunk/libavutil/pixdesc.c

[mru]

Author: mru
Date: Sun Sep 12 23:39:54 2010
New Revision: 25110

Log:
pixdesc: use 8-bit accesses when possible in av_read/write_image_line()

This fixes out of bounds accesses for big endian formats and should be
a little faster.

Modified:
   trunk/libavutil/pixdesc.c

Modified: trunk/libavutil/pixdesc.c
==============================================================================
--- trunk/libavutil/pixdesc.c	Sun Sep 12 23:31:39 2010	(r25109)
+++ trunk/libavutil/pixdesc.c	Sun Sep 12 23:39:54 2010	(r25110)
@@ -53,9 +53,15 @@ void av_read_image_line(uint16_t *dst, c
         }
     } else {
         const uint8_t *p = data[plane]+ y*linesize[plane] + x*step + comp.offset_plus1-1;
+        int is_8bit = 0;
 
+        if (shift + depth <= 8) {
+            p += !!(flags & PIX_FMT_BE);
+            is_8bit = 1;
+        }
         while(w--){
-            int val = flags & PIX_FMT_BE ? AV_RB16(p) : AV_RL16(p);
+            int val = is_8bit ? *p :
+                flags & PIX_FMT_BE ? AV_RB16(p) : AV_RL16(p);
             val = (val>>shift) & mask;
             if(read_pal_component)
                 val= data[1][4*val + c];
@@ -89,6 +95,13 @@ void av_write_image_line(const uint16_t 
         int shift = comp.shift;
         uint8_t *p = data[plane]+ y*linesize[plane] + x*step + comp.offset_plus1-1;
 
+        if (shift + depth <= 8) {
+            p += !!(flags & PIX_FMT_BE);
+            while (w--) {
+                *p |= (*src++<<shift);
+                p += step;
+            }
+        } else {
         while (w--) {
             if (flags & PIX_FMT_BE) {
                 uint16_t val = AV_RB16(p) | (*src++<<shift);
@@ -99,6 +112,7 @@ void av_write_image_line(const uint16_t 
             }
             p+= step;
         }
+        }
     }
 }