diff options
author | S.N. Hemanth Meenakshisundaram <smeenaks@ucsd.edu> | 2010-08-11 18:18:52 +0400 |
---|---|---|
committer | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2010-08-11 18:18:52 +0400 |
commit | 9f08d80363d2da5cba8dff74003b26d105f93a7a (patch) | |
tree | c148b939a15333c2a86707b68a3b927d073b16f2 /libavcodec/imgconvert.c | |
parent | 4bf2d6e8d46342f2be615153c79a32fabe683573 (diff) |
Add av_picture_data_copy() and reimplement av_picture_copy() as a
wrapper of it.
The new function is more generic, and does not depend on the
definition of the AVPicture struct.
Patch by S.N. Hemanth Meenakshisundaram s + "meenakshisundaram".substr(0, 7) + "@ucsd.edu".
Originally committed as revision 24768 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/imgconvert.c')
-rw-r--r-- | libavcodec/imgconvert.c | 26 |
1 files changed, 17 insertions, 9 deletions
diff --git a/libavcodec/imgconvert.c b/libavcodec/imgconvert.c index 60f3a65c7e..aacc4f84f9 100644 --- a/libavcodec/imgconvert.c +++ b/libavcodec/imgconvert.c @@ -845,8 +845,9 @@ int ff_get_plane_bytewidth(enum PixelFormat pix_fmt, int width, int plane) return -1; } -void av_picture_copy(AVPicture *dst, const AVPicture *src, - enum PixelFormat pix_fmt, int width, int height) +void av_picture_data_copy(uint8_t *dst_data[4], int dst_linesize[4], + uint8_t *src_data[4], int src_linesize[4], + enum PixelFormat pix_fmt, int width, int height) { int i; const PixFmtInfo *pf = &pix_fmt_info[pix_fmt]; @@ -862,21 +863,28 @@ void av_picture_copy(AVPicture *dst, const AVPicture *src, if (i == 1 || i == 2) { h= -((-height)>>desc->log2_chroma_h); } - ff_img_copy_plane(dst->data[i], dst->linesize[i], - src->data[i], src->linesize[i], - bwidth, h); + ff_img_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], - src->data[0], src->linesize[0], - width, height); + ff_img_copy_plane(dst_data[0], dst_linesize[0], + src_data[0], src_linesize[0], + width, height); /* copy the palette */ - memcpy(dst->data[1], src->data[1], 4*256); + memcpy(dst_data[1], src_data[1], 4*256); break; } } +void av_picture_copy(AVPicture *dst, const AVPicture *src, + enum PixelFormat pix_fmt, int width, int height) +{ + av_picture_data_copy(dst->data, dst->linesize, src->data, + src->linesize, pix_fmt, width, height); +} + /* 2x2 -> 1x1 */ void ff_shrink22(uint8_t *dst, int dst_wrap, const uint8_t *src, int src_wrap, |