dany/libwebp
1
0
Fork 0
mirror of https://github.com/webmproject/libwebp.git synced 2025-04-11 11:26:47 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge "add WebPPictureImportRGBX() and WebPPictureImportBGRX()"

Browse Source
This commit is contained in:
pascal massimino 2012-06-05 00:28:04 -07:00 committed by Gerrit Code Review
commit c67bc979dd
2 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/enc/picture.c
View File

@ -603,6 +603,16 @@ int WebPPictureImportBGRA(WebPPicture* const picture,
return Import(picture, rgba, rgba_stride, 4, 1, 1); return Import(picture, rgba, rgba_stride, 4, 1, 1);
} }
int WebPPictureImportRGBX(WebPPicture* const picture,
const uint8_t* const rgba, int rgba_stride) {
return Import(picture, rgba, rgba_stride, 4, 0, 0);
}
int WebPPictureImportBGRX(WebPPicture* const picture,
const uint8_t* const rgba, int rgba_stride) {
return Import(picture, rgba, rgba_stride, 4, 1, 0);
}
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// Helper: clean up fully transparent area to help compressibility. // Helper: clean up fully transparent area to help compressibility.

11
src/webp/encode.h
View File

@ -278,15 +278,22 @@ WEBP_EXTERN(int) WebPPictureRescale(WebPPicture* const pic,
// Returns 0 in case of memory error. // Returns 0 in case of memory error.
WEBP_EXTERN(int) WebPPictureImportRGB( WEBP_EXTERN(int) WebPPictureImportRGB(
WebPPicture* const picture, const uint8_t* const rgb, int rgb_stride); WebPPicture* const picture, const uint8_t* const rgb, int rgb_stride);
// Same, but for RGBA buffer // Same, but for RGBA buffer.
WEBP_EXTERN(int) WebPPictureImportRGBA( WEBP_EXTERN(int) WebPPictureImportRGBA(
WebPPicture* const picture, const uint8_t* const rgba, int rgba_stride); WebPPicture* const picture, const uint8_t* const rgba, int rgba_stride);
// Same, but for RGBA buffer. Imports the RGB direct from the 32-bit format
// input buffer ignoring the alpha channel. Avoids needing to copy the data
// to a temporary 24-bit RGB buffer to import the RGB only.
WEBP_EXTERN(int) WebPPictureImportRGBX(
WebPPicture* const picture, const uint8_t* const rgbx, int rgbx_stride);
// Variant of the above, but taking BGR(A) input: // Variants of the above, but taking BGR(A|X) input.
WEBP_EXTERN(int) WebPPictureImportBGR( WEBP_EXTERN(int) WebPPictureImportBGR(
WebPPicture* const picture, const uint8_t* const bgr, int bgr_stride); WebPPicture* const picture, const uint8_t* const bgr, int bgr_stride);
WEBP_EXTERN(int) WebPPictureImportBGRA( WEBP_EXTERN(int) WebPPictureImportBGRA(
WebPPicture* const picture, const uint8_t* const bgra, int bgra_stride); WebPPicture* const picture, const uint8_t* const bgra, int bgra_stride);
WEBP_EXTERN(int) WebPPictureImportBGRX(
WebPPicture* const picture, const uint8_t* const bgrx, int bgrx_stride);
// Helper function: given a width x height plane of YUV(A) samples // Helper function: given a width x height plane of YUV(A) samples
// (with stride 'stride'), clean-up the YUV samples under fully transparent // (with stride 'stride'), clean-up the YUV samples under fully transparent