[FFmpeg-cvslog] r25064 - in trunk: libavcodec/avcodec.h libavcodec/dsputil.c libavcodec/dsputil.h libavcodec/imgconvert.c libavcore/avcore.h libavcore/imgutils.c libavcore/imgutils.h
stefano
subversion
Tue Sep 7 23:23:45 CEST 2010
Author: stefano
Date: Tue Sep 7 23:23:45 2010
New Revision: 25064
Log:
Reimplement ff_img_copy_plane() as av_image_copy_plane() in libavcore,
and deprecate the old function.
Modified:
trunk/libavcodec/avcodec.h
trunk/libavcodec/dsputil.c
trunk/libavcodec/dsputil.h
trunk/libavcodec/imgconvert.c
trunk/libavcore/avcore.h
trunk/libavcore/imgutils.c
trunk/libavcore/imgutils.h
Modified: trunk/libavcodec/avcodec.h
==============================================================================
--- trunk/libavcodec/avcodec.h Tue Sep 7 23:06:21 2010 (r25063)
+++ trunk/libavcodec/avcodec.h Tue Sep 7 23:23:45 2010 (r25064)
@@ -32,7 +32,7 @@
#define LIBAVCODEC_VERSION_MAJOR 52
#define LIBAVCODEC_VERSION_MINOR 87
-#define LIBAVCODEC_VERSION_MICRO 2
+#define LIBAVCODEC_VERSION_MICRO 3
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
LIBAVCODEC_VERSION_MINOR, \
Modified: trunk/libavcodec/dsputil.c
==============================================================================
--- trunk/libavcodec/dsputil.c Tue Sep 7 23:06:21 2010 (r25063)
+++ trunk/libavcodec/dsputil.c Tue Sep 7 23:23:45 2010 (r25064)
@@ -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,
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_image_copy_plane;
c->shrink[1]= ff_shrink22;
c->shrink[2]= ff_shrink44;
c->shrink[3]= ff_shrink88;
Modified: trunk/libavcodec/dsputil.h
==============================================================================
--- trunk/libavcodec/dsputil.h Tue Sep 7 23:06:21 2010 (r25063)
+++ trunk/libavcodec/dsputil.h Tue Sep 7 23:23:45 2010 (r25064)
@@ -105,7 +105,14 @@ void ff_bink_idct_put_c(uint8_t *dest, i
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_image_copy_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);
Modified: trunk/libavcodec/imgconvert.c
==============================================================================
--- trunk/libavcodec/imgconvert.c Tue Sep 7 23:06:21 2010 (r25063)
+++ trunk/libavcodec/imgconvert.c Tue Sep 7 23:23:45 2010 (r25064)
@@ -781,20 +781,14 @@ enum PixelFormat avcodec_find_best_pix_f
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_image_copy_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_image_get_linesize(pix_fmt, width, plane);
@@ -819,13 +813,13 @@ void av_picture_data_copy(uint8_t *dst_d
if (i == 1 || i == 2) {
h= -((-height)>>desc->log2_chroma_h);
}
- ff_img_copy_plane(dst_data[i], dst_linesize[i],
+ av_image_copy_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_image_copy_plane(dst_data[0], dst_linesize[0],
src_data[0], src_linesize[0],
width, height);
/* copy the palette */
Modified: trunk/libavcore/avcore.h
==============================================================================
--- trunk/libavcore/avcore.h Tue Sep 7 23:06:21 2010 (r25063)
+++ trunk/libavcore/avcore.h Tue Sep 7 23:23:45 2010 (r25064)
@@ -27,7 +27,7 @@
#include "libavutil/avutil.h"
#define LIBAVCORE_VERSION_MAJOR 0
-#define LIBAVCORE_VERSION_MINOR 7
+#define LIBAVCORE_VERSION_MINOR 8
#define LIBAVCORE_VERSION_MICRO 0
#define LIBAVCORE_VERSION_INT AV_VERSION_INT(LIBAVCORE_VERSION_MAJOR, \
Modified: trunk/libavcore/imgutils.c
==============================================================================
--- trunk/libavcore/imgutils.c Tue Sep 7 23:06:21 2010 (r25063)
+++ trunk/libavcore/imgutils.c Tue Sep 7 23:23:45 2010 (r25064)
@@ -139,6 +139,19 @@ int av_image_check_size(unsigned int w,
return AVERROR(EINVAL);
}
+void av_image_copy_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;
+ }
+}
+
#if FF_API_OLD_IMAGE_NAMES
void av_fill_image_max_pixsteps(int max_pixsteps[4], int max_pixstep_comps[4],
const AVPixFmtDescriptor *pixdesc)
Modified: trunk/libavcore/imgutils.h
==============================================================================
--- trunk/libavcore/imgutils.h Tue Sep 7 23:06:21 2010 (r25063)
+++ trunk/libavcore/imgutils.h Tue Sep 7 23:23:45 2010 (r25064)
@@ -78,6 +78,19 @@ int av_image_fill_pointers(uint8_t *data
uint8_t *ptr, const int linesizes[4]);
/**
+ * 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_image_copy_plane(uint8_t *dst, int dst_linesize,
+ const uint8_t *src, int src_linesize,
+ int bytewidth, int height);
+
+/**
* Check if the given dimension of an image is valid, meaning that all
* bytes of the image can be addressed with a signed int.
*
More information about the ffmpeg-cvslog
mailing list