--- image.h 2003/06/09 13:53:56 1.11.2.2 +++ image.h 2006/10/13 07:38:09 1.17 @@ -3,7 +3,7 @@ * XVID MPEG-4 VIDEO CODEC * - Image related header - * - * Copyright(C) 2001-2003 Peter Ross + * Copyright(C) 2001-2004 Peter Ross * * This program is free software ; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -19,7 +19,7 @@ * along with this program ; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * $Id: image.h,v 1.11.2.2 2003/06/09 13:53:56 edgomez Exp $ + * $Id: image.h,v 1.17 2006/10/13 07:38:09 Skal Exp $ * ****************************************************************************/ @@ -53,22 +53,23 @@ void image_swap(IMAGE * image1, IMAGE * image2); - + void image_copy(IMAGE * image1, IMAGE * image2, uint32_t edged_width, uint32_t height); - + void image_setedges(IMAGE * image, uint32_t edged_width, uint32_t edged_height, uint32_t width, - uint32_t height); - -void image_interpolate(const IMAGE * refn, - IMAGE * refh, - IMAGE * refv, - IMAGE * refhv, + uint32_t height, + int bs_version); + +void image_interpolate(const uint8_t * refn, + uint8_t * refh, + uint8_t * refv, + uint8_t * refhv, uint32_t edged_width, uint32_t edged_height, uint32_t quarterpel, @@ -107,7 +108,7 @@ int height, uint32_t edged_width, uint8_t * dst[4], - uint32_t dst_stride[4], + int dst_stride[4], int csp, int interlaced); @@ -126,7 +127,7 @@ uint32_t height); void -output_slice(IMAGE * cur, int edged_width, int width, xvid_image_t* out_frm, int mbx, int mby,int mbl); +output_slice(IMAGE * cur, int stride, int width, xvid_image_t* out_frm, int mbx, int mby,int mbl); void @@ -140,4 +141,10 @@ int block, int flags); + /* helper function: deinterlace image. + Only for YUV 4:2:0 planar format. Use bottom_first!=0 if main + field is the bottom one. + returns 1 if everything went ok, 0 otherwise. */ +extern int xvid_image_deinterlace(xvid_image_t* img, int width, int height, int bottom_first); + #endif /* _IMAGE_H_ */