[FFmpeg-devel] remove palette8torgb15 and palette8torgb15, was: make swscale's palette functions public

[Michael Niedermayer]

On Tue, Jun 01, 2010 at 01:17:18PM +0200, Reinhard Tartler wrote:
[...]
> Index: libswscale/swscale.h
> ===================================================================
> --- libswscale/swscale.h	(revision 31298)
> +++ libswscale/swscale.h	(working copy)
> @@ -30,7 +30,7 @@
>  #include "libavutil/avutil.h"
>  
>  #define LIBSWSCALE_VERSION_MAJOR 0
> -#define LIBSWSCALE_VERSION_MINOR 10
> +#define LIBSWSCALE_VERSION_MINOR 11
>  #define LIBSWSCALE_VERSION_MICRO 0
>  
>  #define LIBSWSCALE_VERSION_INT  AV_VERSION_INT(LIBSWSCALE_VERSION_MAJOR, \
> @@ -303,4 +303,29 @@
>                                          int flags, SwsFilter *srcFilter,
>                                          SwsFilter *dstFilter, const double *param);
>  
> +/**
> + * Converts an 8bit paletted frame into a frame with a color depth of 32-bits.
> + *
> + * The output frame will have the same packed format as the palette.
> + *
> + * @param src        source frame buffer
> + * @param dst        destination frame buffer
> + * @param num_pixels number of pixels to convert
> + * @param palette    array with [256] entries, which must match color arrangement (RGB or BGR) of src
> + */
> +void sws_convertPalette8ToPacked32(const uint8_t *src, uint8_t *dst, long num_pixels, const uint8_t *palette);

the doxy says correctly 8bit paletted, but the function name says Palette


[...]
> @@ -28,6 +28,8 @@
>  
>  #include <inttypes.h>
>  
> +#include "libavutil/avutil.h"
> +
>  /* A full collection of RGB to RGB(BGR) converters */
>  extern void (*rgb24tobgr32)(const uint8_t *src, uint8_t *dst, long src_size);
>  extern void (*rgb24tobgr16)(const uint8_t *src, uint8_t *dst, long src_size);
> @@ -66,11 +68,16 @@
>  void shuffle_bytes_3012(const uint8_t *src, uint8_t *dst, long src_size);
>  void shuffle_bytes_3210(const uint8_t *src, uint8_t *dst, long src_size);
>  
> -void palette8topacked32(const uint8_t *src, uint8_t *dst, long num_pixels, const uint8_t *palette);
> -void palette8topacked24(const uint8_t *src, uint8_t *dst, long num_pixels, const uint8_t *palette);
> -void palette8torgb16(const uint8_t *src, uint8_t *dst, long num_pixels, const uint8_t *palette);
> -void palette8tobgr16(const uint8_t *src, uint8_t *dst, long num_pixels, const uint8_t *palette);
> +#if LIBSWCALE_VERSION_MAJOR < 1
> +/* deprecated, use the public versions in swscale.h */
> +attribute_deprecated void palette8topacked32(const uint8_t *src, uint8_t *dst, long num_pixels, const uint8_t *palette);
> +attribute_deprecated void palette8topacked24(const uint8_t *src, uint8_t *dst, long num_pixels, const uint8_t *palette);
>  
> +/* totally deprecated, please fix code that use this */
> +attribute_deprecated void palette8torgb16(const uint8_t *src, uint8_t *dst, long num_pixels, const uint8_t *palette);
> +attribute_deprecated void palette8tobgr16(const uint8_t *src, uint8_t *dst, long num_pixels, const uint8_t *palette);
> +#endif

i dont think 16bit support should be droped

[...]

-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

If you think the mosad wants you dead since a long time then you are either
wrong or dead since a long time.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: Digital signature
URL: <http://lists.mplayerhq.hu/pipermail/ffmpeg-devel/attachments/20100602/6453b376/attachment.pgp>