[PATCH 1/6] Reimplement ff_img_copy_plane() as av_copy_image_plane() in libavcore, and deprecate the old function.

Stefano Sabatini stefano.sabatini-lala
Thu Aug 19 12:22:08 CEST 2010


---
 libavcodec/dsputil.c    |    3 ++-
 libavcodec/dsputil.h    |    7 +++++++
 libavcodec/imgconvert.c |   15 +++++----------
 libavcore/imgutils.c    |   14 ++++++++++++++
 libavcore/imgutils.h    |   13 +++++++++++++
 5 files changed, 41 insertions(+), 11 deletions(-)

diff --git a/libavcodec/dsputil.c b/libavcodec/dsputil.c
index 2b6cd16..f518354 100644
--- a/libavcodec/dsputil.c
+++ b/libavcodec/dsputil.c
@@ -27,6 +27,7 @@
  * DSP utils
  */
 
+#include "libavcore/imgutils.h"
 #include "avcodec.h"
 #include "dsputil.h"
 #include "simple_idct.h"
@@ -4454,7 +4455,7 @@ av_cold void dsputil_init(DSPContext* c, AVCodecContext *avctx)
     c->sv_fmul_scalar[0] = sv_fmul_scalar_2_c;
     c->sv_fmul_scalar[1] = sv_fmul_scalar_4_c;
 
-    c->shrink[0]= ff_img_copy_plane;
+    c->shrink[0]= av_copy_image_plane;
     c->shrink[1]= ff_shrink22;
     c->shrink[2]= ff_shrink44;
     c->shrink[3]= ff_shrink88;
diff --git a/libavcodec/dsputil.h b/libavcodec/dsputil.h
index 3b5ca12..5fdfc4d 100644
--- a/libavcodec/dsputil.h
+++ b/libavcodec/dsputil.h
@@ -105,7 +105,14 @@ void ff_bink_idct_put_c(uint8_t *dest, int linesize, DCTELEM *block);
 void ff_ea_idct_put_c(uint8_t *dest, int linesize, DCTELEM *block);
 
 /* 1/2^n downscaling functions from imgconvert.c */
+#if LIBAVCODEC_VERSION_MAJOR < 53
+/**
+ * @deprecated Use av_copy_image_plane() instead.
+ */
+attribute_deprecated
 void ff_img_copy_plane(uint8_t *dst, int dst_wrap, const uint8_t *src, int src_wrap, int width, int height);
+#endif
+
 void ff_shrink22(uint8_t *dst, int dst_wrap, const uint8_t *src, int src_wrap, int width, int height);
 void ff_shrink44(uint8_t *dst, int dst_wrap, const uint8_t *src, int src_wrap, int width, int height);
 void ff_shrink88(uint8_t *dst, int dst_wrap, const uint8_t *src, int src_wrap, int width, int height);
diff --git a/libavcodec/imgconvert.c b/libavcodec/imgconvert.c
index c29d92b..32d54d3 100644
--- a/libavcodec/imgconvert.c
+++ b/libavcodec/imgconvert.c
@@ -37,6 +37,7 @@
 #include "libavutil/colorspace.h"
 #include "libavutil/pixdesc.h"
 #include "libavcore/imgutils.h"
+#include "libavcore/internal.h"
 
 #if HAVE_MMX && HAVE_YASM
 #include "x86/dsputil_mmx.h"
@@ -781,20 +782,14 @@ enum PixelFormat avcodec_find_best_pix_fmt(int64_t pix_fmt_mask, enum PixelForma
     return dst_pix_fmt;
 }
 
+#if LIBAVCODEC_VERSION_MAJOR < 53
 void ff_img_copy_plane(uint8_t *dst, int dst_wrap,
                            const uint8_t *src, int src_wrap,
                            int width, int height)
 {
-    if (!dst || !src)
-        return;
-    for(;height > 0; height--) {
-        memcpy(dst, src, width);
-        dst += dst_wrap;
-        src += src_wrap;
-    }
+    av_copy_image_plane(dst, dst_wrap, src, src_wrap, width, height);
 }
 
-#if LIBAVCODEC_VERSION_MAJOR < 53
 int ff_get_plane_bytewidth(enum PixelFormat pix_fmt, int width, int plane)
 {
     return av_get_image_linesize(pix_fmt, width, plane);
@@ -819,13 +814,13 @@ void av_picture_data_copy(uint8_t *dst_data[4], int dst_linesize[4],
             if (i == 1 || i == 2) {
                 h= -((-height)>>desc->log2_chroma_h);
             }
-            ff_img_copy_plane(dst_data[i], dst_linesize[i],
+            av_copy_image_plane(dst_data[i], dst_linesize[i],
                               src_data[i], src_linesize[i],
                               bwidth, h);
         }
         break;
     case FF_PIXEL_PALETTE:
-        ff_img_copy_plane(dst_data[0], dst_linesize[0],
+        av_copy_image_plane(dst_data[0], dst_linesize[0],
                           src_data[0], src_linesize[0],
                           width, height);
         /* copy the palette */
diff --git a/libavcore/imgutils.c b/libavcore/imgutils.c
index ebaeff1..96e4f9d 100644
--- a/libavcore/imgutils.c
+++ b/libavcore/imgutils.c
@@ -21,6 +21,7 @@
  * misc image utilities
  */
 
+#include "internal.h"
 #include "imgutils.h"
 #include "libavutil/pixdesc.h"
 
@@ -120,3 +121,16 @@ int av_check_image_size(unsigned int w, unsigned int h, int log_offset, void *lo
     av_log(&imgutils, AV_LOG_ERROR, "Picture size %ux%u is invalid\n", w, h);
     return AVERROR(EINVAL);
 }
+
+void av_copy_image_plane(uint8_t       *dst, int dst_linesize,
+                         const uint8_t *src, int src_linesize,
+                         int bytewidth, int height)
+{
+    if (!dst || !src)
+        return;
+    for (;height > 0; height--) {
+        memcpy(dst, src, bytewidth);
+        dst += dst_linesize;
+        src += src_linesize;
+    }
+}
diff --git a/libavcore/imgutils.h b/libavcore/imgutils.h
index 174a179..a2b9d29 100644
--- a/libavcore/imgutils.h
+++ b/libavcore/imgutils.h
@@ -70,6 +70,19 @@ static inline void av_fill_image_max_pixsteps(int max_pixsteps[4], int max_pixst
 int av_get_image_linesize(enum PixelFormat pix_fmt, int width, int plane);
 
 /**
+ * Copy image plane from src to dst.
+ * That is, copy "height" number of lines of "bytewidth" bytes each.
+ * The first byte of each successive line is separated by *_linesize
+ * bytes.
+ *
+ * @param dst_linesize linesize for the image plane in dst
+ * @param src_linesize linesize for the image plane in src
+ */
+void av_copy_image_plane(uint8_t       *dst, int dst_linesize,
+                         const uint8_t *src, int src_linesize,
+                         int bytewidth, int height);
+
+/**
  * Fill plane linesizes for an image with pixel format pix_fmt and
  * width width.
  *
-- 
1.7.1


--Nq2Wo0NMKNjxTN9z--



More information about the ffmpeg-devel mailing list