From 636d6a4a472d756cfb0ee845249e1e4f303e2134 Mon Sep 17 00:00:00 2001 From: Panagiotis Issaris Date: Sun, 4 Mar 2007 11:53:11 +0000 Subject: [PATCH] Add the prefix "av_" to img_crop(), img_copy() and img_pad(), and rename "img" to "picture" as suggested by Baptiste Coudurier. Originally committed as revision 8220 to svn://svn.ffmpeg.org/ffmpeg/trunk --- ffmpeg.c | 8 ++++---- libavcodec/avcodec.h | 17 ++++++++++++++--- libavcodec/imgconvert.c | 29 +++++++++++++++++++++++++---- libavcodec/imgresample.c | 2 +- libavcodec/nuv.c | 2 +- libavcodec/utils.c | 2 +- 6 files changed, 46 insertions(+), 14 deletions(-) diff --git a/ffmpeg.c b/ffmpeg.c index 122017b7da..027eb68ef1 100644 --- a/ffmpeg.c +++ b/ffmpeg.c @@ -596,7 +596,7 @@ static void pre_process_video_frame(AVInputStream *ist, AVPicture *picture, void picture2 = picture; } } else { - img_copy(picture2, picture, dec->pix_fmt, dec->width, dec->height); + av_picture_copy(picture2, picture, dec->pix_fmt, dec->width, dec->height); } } else { picture2 = picture; @@ -716,7 +716,7 @@ static void do_video_out(AVFormatContext *s, return; if (ost->video_crop) { - if (img_crop((AVPicture *)&picture_crop_temp, (AVPicture *)in_picture, dec->pix_fmt, ost->topBand, ost->leftBand) < 0) { + if (av_picture_crop((AVPicture *)&picture_crop_temp, (AVPicture *)in_picture, dec->pix_fmt, ost->topBand, ost->leftBand) < 0) { av_log(NULL, AV_LOG_ERROR, "error cropping picture\n"); goto the_end; } @@ -731,7 +731,7 @@ static void do_video_out(AVFormatContext *s, if (ost->video_pad) { final_picture = &ost->pict_tmp; if (ost->video_resample) { - if (img_crop((AVPicture *)&picture_pad_temp, (AVPicture *)final_picture, enc->pix_fmt, ost->padtop, ost->padleft) < 0) { + if (av_picture_crop((AVPicture *)&picture_pad_temp, (AVPicture *)final_picture, enc->pix_fmt, ost->padtop, ost->padleft) < 0) { av_log(NULL, AV_LOG_ERROR, "error padding picture\n"); goto the_end; } @@ -747,7 +747,7 @@ static void do_video_out(AVFormatContext *s, } if (ost->video_pad) { - img_pad((AVPicture*)final_picture, (AVPicture *)padding_src, + av_picture_pad((AVPicture*)final_picture, (AVPicture *)padding_src, enc->height, enc->width, enc->pix_fmt, ost->padtop, ost->padbottom, ost->padleft, ost->padright, padcolor); } diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 78897ce1dd..a26534a1db 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -3008,21 +3008,32 @@ void *av_mallocz_static(unsigned int size); /** * Copy image 'src' to 'dst'. */ -void img_copy(AVPicture *dst, const AVPicture *src, +void av_picture_copy(AVPicture *dst, const AVPicture *src, int pix_fmt, int width, int height); /** * Crop image top and left side */ -int img_crop(AVPicture *dst, const AVPicture *src, +int av_picture_crop(AVPicture *dst, const AVPicture *src, int pix_fmt, int top_band, int left_band); /** * Pad image */ -int img_pad(AVPicture *dst, const AVPicture *src, int height, int width, int pix_fmt, +int av_picture_pad(AVPicture *dst, const AVPicture *src, int height, int width, int pix_fmt, int padtop, int padbottom, int padleft, int padright, int *color); +#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) +attribute_deprecated void img_copy(AVPicture *dst, const AVPicture *src, + int pix_fmt, int width, int height); + +attribute_deprecated int img_crop(AVPicture *dst, const AVPicture *src, + int pix_fmt, int top_band, int left_band); + +attribute_deprecated int img_pad(AVPicture *dst, const AVPicture *src, int height, int width, int pix_fmt, + int padtop, int padbottom, int padleft, int padright, int *color); +#endif + extern unsigned int av_xiphlacing(unsigned char *s, unsigned int v); /* error handling */ diff --git a/libavcodec/imgconvert.c b/libavcodec/imgconvert.c index 7df366b9ce..2971afaa89 100644 --- a/libavcodec/imgconvert.c +++ b/libavcodec/imgconvert.c @@ -733,7 +733,7 @@ void ff_img_copy_plane(uint8_t *dst, int dst_wrap, } } -void img_copy(AVPicture *dst, const AVPicture *src, +void av_picture_copy(AVPicture *dst, const AVPicture *src, int pix_fmt, int width, int height) { int bwidth, bits, i; @@ -2214,7 +2214,7 @@ static inline int is_yuv_planar(const PixFmtInfo *ps) ps->pixel_type == FF_PIXEL_PLANAR; } -int img_crop(AVPicture *dst, const AVPicture *src, +int av_picture_crop(AVPicture *dst, const AVPicture *src, int pix_fmt, int top_band, int left_band) { int y_shift; @@ -2236,7 +2236,7 @@ int img_crop(AVPicture *dst, const AVPicture *src, return 0; } -int img_pad(AVPicture *dst, const AVPicture *src, int height, int width, +int av_picture_pad(AVPicture *dst, const AVPicture *src, int height, int width, int pix_fmt, int padtop, int padbottom, int padleft, int padright, int *color) { @@ -2296,6 +2296,27 @@ int img_pad(AVPicture *dst, const AVPicture *src, int height, int width, return 0; } +#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) +void img_copy(AVPicture *dst, const AVPicture *src, + int pix_fmt, int width, int height) +{ + av_picture_copy(dst, src, pix_fmt, width, height); +} + +int img_crop(AVPicture *dst, const AVPicture *src, + int pix_fmt, int top_band, int left_band) +{ + return av_picture_crop(dst, src, pix_fmt, top_band, left_band); +} + +int img_pad(AVPicture *dst, const AVPicture *src, int height, int width, + int pix_fmt, int padtop, int padbottom, int padleft, int padright, + int *color) +{ + return av_picture_pad(dst, src, height, width, pix_fmt, padtop, padbottom, padleft, padright, color); +} +#endif + #ifndef CONFIG_SWSCALER /* XXX: always use linesize. Return -1 if not supported */ int img_convert(AVPicture *dst, int dst_pix_fmt, @@ -2326,7 +2347,7 @@ int img_convert(AVPicture *dst, int dst_pix_fmt, src_pix = &pix_fmt_info[src_pix_fmt]; if (src_pix_fmt == dst_pix_fmt) { /* no conversion needed: just copy */ - img_copy(dst, src, dst_pix_fmt, dst_width, dst_height); + av_picture_copy(dst, src, dst_pix_fmt, dst_width, dst_height); return 0; } diff --git a/libavcodec/imgresample.c b/libavcodec/imgresample.c index adcfd04812..2722d5acf7 100644 --- a/libavcodec/imgresample.c +++ b/libavcodec/imgresample.c @@ -802,7 +802,7 @@ int sws_scale(struct SwsContext *ctx, uint8_t* src[], int srcStride[], goto the_end; } } else if (resampled_picture != &dst_pict) { - img_copy(&dst_pict, resampled_picture, current_pix_fmt, + av_picture_copy(&dst_pict, resampled_picture, current_pix_fmt, ctx->resampling_ctx->owidth, ctx->resampling_ctx->oheight); } diff --git a/libavcodec/nuv.c b/libavcodec/nuv.c index 19e3430566..5989c6cc20 100644 --- a/libavcodec/nuv.c +++ b/libavcodec/nuv.c @@ -50,7 +50,7 @@ static void copy_frame(AVFrame *f, uint8_t *src, int width, int height) { AVPicture pic; avpicture_fill(&pic, src, PIX_FMT_YUV420P, width, height); - img_copy((AVPicture *)f, &pic, PIX_FMT_YUV420P, width, height); + av_picture_copy((AVPicture *)f, &pic, PIX_FMT_YUV420P, width, height); } /** diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 3ab6bd8916..cc9d77a78f 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -370,7 +370,7 @@ int avcodec_default_reget_buffer(AVCodecContext *s, AVFrame *pic){ if (s->get_buffer(s, pic)) return -1; /* Copy image data from old buffer to new buffer */ - img_copy((AVPicture*)pic, (AVPicture*)&temp_pic, s->pix_fmt, s->width, + av_picture_copy((AVPicture*)pic, (AVPicture*)&temp_pic, s->pix_fmt, s->width, s->height); s->release_buffer(s, &temp_pic); // Release old frame return 0;