# HG changeset patch
# User stefano
# Date 1282165358 0
# Node ID 1a1faa090ff1365a06e8e62cb9c93c699f186eec
# Parent  665cb0c97133654c2a3722ce2d6535c45ccf92c2
Implement inline function av_fill_image_max_pixstep() and use it for
factorizing code.

diff -r 665cb0c97133 -r 1a1faa090ff1 avcore.h
--- a/avcore.h	Thu Aug 12 15:05:58 2010 +0000
+++ b/avcore.h	Wed Aug 18 21:02:38 2010 +0000
@@ -27,7 +27,7 @@
 #include <libavutil/avutil.h>
 
 #define LIBAVCORE_VERSION_MAJOR  0
-#define LIBAVCORE_VERSION_MINOR  4
+#define LIBAVCORE_VERSION_MINOR  5
 #define LIBAVCORE_VERSION_MICRO  0
 
 #define LIBAVCORE_VERSION_INT   AV_VERSION_INT(LIBAVCORE_VERSION_MAJOR, \
diff -r 665cb0c97133 -r 1a1faa090ff1 imgutils.c
--- a/imgutils.c	Thu Aug 12 15:05:58 2010 +0000
+++ b/imgutils.c	Wed Aug 18 21:02:38 2010 +0000
@@ -29,21 +29,12 @@
     const AVPixFmtDescriptor *desc = &av_pix_fmt_descriptors[pix_fmt];
     int max_step     [4];       /* max pixel step for each plane */
     int max_step_comp[4];       /* the component for each plane which has the max pixel step */
-    int s, i;
+    int s;
 
     if (desc->flags & PIX_FMT_BITSTREAM)
         return (width * (desc->comp[0].step_minus1+1) + 7) >> 3;
 
-    memset(max_step     , 0, sizeof(max_step     ));
-    memset(max_step_comp, 0, sizeof(max_step_comp));
-    for (i = 0; i < 4; i++) {
-        const AVComponentDescriptor *comp = &(desc->comp[i]);
-        if ((comp->step_minus1+1) > max_step[comp->plane]) {
-            max_step     [comp->plane] = comp->step_minus1+1;
-            max_step_comp[comp->plane] = i;
-        }
-    }
-
+    av_fill_image_max_pixstep(max_step, max_step_comp, desc);
     s = (max_step_comp[plane] == 1 || max_step_comp[plane] == 2) ? desc->log2_chroma_w : 0;
     return max_step[plane] * (((width + (1 << s) - 1)) >> s);
 }
@@ -65,16 +56,7 @@
         return 0;
     }
 
-    memset(max_step     , 0, sizeof(max_step     ));
-    memset(max_step_comp, 0, sizeof(max_step_comp));
-    for (i = 0; i < 4; i++) {
-        const AVComponentDescriptor *comp = &(desc->comp[i]);
-        if ((comp->step_minus1+1) > max_step[comp->plane]) {
-            max_step     [comp->plane] = comp->step_minus1+1;
-            max_step_comp[comp->plane] = i;
-        }
-    }
-
+    av_fill_image_max_pixstep(max_step, max_step_comp, desc);
     for (i = 0; i < 4; i++) {
         int s = (max_step_comp[i] == 1 || max_step_comp[i] == 2) ? desc->log2_chroma_w : 0;
         linesizes[i] = max_step[i] * (((width + (1 << s) - 1)) >> s);
diff -r 665cb0c97133 -r 1a1faa090ff1 imgutils.h
--- a/imgutils.h	Thu Aug 12 15:05:58 2010 +0000
+++ b/imgutils.h	Wed Aug 18 21:02:38 2010 +0000
@@ -24,10 +24,44 @@
  * misc image utilities
  */
 
-#include "libavutil/pixfmt.h"
+#include "libavutil/pixdesc.h"
 #include "avcore.h"
 
 /**
+ * Compute the max pixel step for each plane of an image with a
+ * format described by pixdesc
+ *
+ * The pixel step is the distance in bytes between the first byte of
+ * the group of bytes which describe a pixel component and the first
+ * byte of the successive group in the same plane for the same
+ * component.
+ *
+ * @param max_pixstep an array which is filled with the max pixel step
+ * for each plane. Since a plane may contain different pixel
+ * components, the computed max_pixstep[plane] is relative to the
+ * component in the plane with the max pixel step.
+ * @param max_pixstep_comp an array which is filled with the component
+ * for each plane which has the max pixel step. May be NULL.
+ */
+static inline void av_fill_image_max_pixstep(int max_pixstep[4], int max_pixstep_comp[4],
+                                             const AVPixFmtDescriptor *pixdesc)
+{
+    int i;
+    memset(max_pixstep, 0, 4*sizeof(max_pixstep[0]));
+    if (max_pixstep_comp)
+        memset(max_pixstep_comp, 0, 4*sizeof(max_pixstep_comp[0]));
+
+    for (i = 0; i < 4; i++) {
+        const AVComponentDescriptor *comp = &(pixdesc->comp[i]);
+        if ((comp->step_minus1+1) > max_pixstep[comp->plane]) {
+            max_pixstep[comp->plane] = comp->step_minus1+1;
+            if (max_pixstep_comp)
+                max_pixstep_comp[comp->plane] = i;
+        }
+    }
+}
+
+/**
  * Compute the size of an image line with format pix_fmt and width
  * width for the plane plane.
  *