dany/libwebp
1
0
Fork 0
mirror of https://github.com/webmproject/libwebp.git synced 2025-10-31 18:35:41 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add two more color-spaces for lossless decoding.

Browse Source 
Added color-spaces (RGBA_4444 and RGB_565), required for Android device
to lossless decoding.

Change-Id: I229832edd4deca59e066f463e7454f77457c5bcd
This commit is contained in:
Vikas Arora
2012-05-23 12:08:44 +05:30
parent 27f417ab66
commit 237eab6764
2 changed files with 32 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/dec/vp8l.c
View File

@@ -946,8 +946,8 @@ int VP8LDecodeImage(VP8LDecoder* const dec) {
params = (WebPDecParams*)io->opaque; params = (WebPDecParams*)io->opaque;
assert(params != NULL); assert(params != NULL);
output = params->output; output = params->output;
// RGBA_4444 & RGB_565 are unsupported for now & YUV modes are invalid. // YUV modes are invalid.
if (output->colorspace >= MODE_RGBA_4444) { if (output->colorspace >= MODE_YUV) {
dec->status_ = VP8_STATUS_INVALID_PARAM; dec->status_ = VP8_STATUS_INVALID_PARAM;
goto Err; goto Err;
} }

34
src/dsp/lossless.c
View File

@@ -966,7 +966,7 @@ static int is_big_endian(void) {
static void ConvertBGRAToRGB(const uint32_t* src, static void ConvertBGRAToRGB(const uint32_t* src,
int num_pixels, uint8_t* dst) { int num_pixels, uint8_t* dst) {
const uint32_t* src_end = src + num_pixels; const uint32_t* const src_end = src + num_pixels;
while (src < src_end) { while (src < src_end) {
const uint32_t argb = *src++; const uint32_t argb = *src++;
*dst++ = (argb >> 16) & 0xff; *dst++ = (argb >> 16) & 0xff;
@@ -977,7 +977,7 @@ static void ConvertBGRAToRGB(const uint32_t* src,
static void ConvertBGRAToRGBA(const uint32_t* src, static void ConvertBGRAToRGBA(const uint32_t* src,
int num_pixels, uint8_t* dst) { int num_pixels, uint8_t* dst) {
const uint32_t* src_end = src + num_pixels; const uint32_t* const src_end = src + num_pixels;
while (src < src_end) { while (src < src_end) {
const uint32_t argb = *src++; const uint32_t argb = *src++;
*dst++ = (argb >> 16) & 0xff; *dst++ = (argb >> 16) & 0xff;
@@ -987,9 +987,29 @@ static void ConvertBGRAToRGBA(const uint32_t* src,
} }
} }
static void ConvertBGRAToRGBA4444(const uint32_t* src,
int num_pixels, uint8_t* dst) {
const uint32_t* const src_end = src + num_pixels;
while (src < src_end) {
const uint32_t argb = *src++;
*dst++ = ((argb >> 16) & 0xf0) | ((argb >> 12) & 0xf);
*dst++ = ((argb >> 0) & 0xf0) | ((argb >> 28) & 0xf);
}
}
static void ConvertBGRAToRGB565(const uint32_t* src,
int num_pixels, uint8_t* dst) {
const uint32_t* const src_end = src + num_pixels;
while (src < src_end) {
const uint32_t argb = *src++;
*dst++ = ((argb >> 16) & 0xf8) | ((argb >> 13) & 0x7);
*dst++ = ((argb >> 5) & 0xe0) | ((argb >> 3) & 0x1f);
}
}
static void ConvertBGRAToBGR(const uint32_t* src, static void ConvertBGRAToBGR(const uint32_t* src,
int num_pixels, uint8_t* dst) { int num_pixels, uint8_t* dst) {
const uint32_t* src_end = src + num_pixels; const uint32_t* const src_end = src + num_pixels;
while (src < src_end) { while (src < src_end) {
const uint32_t argb = *src++; const uint32_t argb = *src++;
*dst++ = (argb >> 0) & 0xff; *dst++ = (argb >> 0) & 0xff;
@@ -1001,7 +1021,7 @@ static void ConvertBGRAToBGR(const uint32_t* src,
static void CopyOrSwap(const uint32_t* src, int num_pixels, uint8_t* dst, static void CopyOrSwap(const uint32_t* src, int num_pixels, uint8_t* dst,
int swap_on_big_endian) { int swap_on_big_endian) {
if (is_big_endian() == swap_on_big_endian) { if (is_big_endian() == swap_on_big_endian) {
const uint32_t* src_end = src + num_pixels; const uint32_t* const src_end = src + num_pixels;
while (src < src_end) { while (src < src_end) {
uint32_t argb = *src++; uint32_t argb = *src++;
#if !defined(__BIG_ENDIAN__) && (defined(__i386__) || defined(__x86_64__)) #if !defined(__BIG_ENDIAN__) && (defined(__i386__) || defined(__x86_64__))
@@ -1043,6 +1063,12 @@ void VP8LConvertFromBGRA(const uint32_t* const in_data, int num_pixels,
case MODE_ARGB: case MODE_ARGB:
CopyOrSwap(in_data, num_pixels, rgba, 0); CopyOrSwap(in_data, num_pixels, rgba, 0);
break; break;
case MODE_RGBA_4444:
ConvertBGRAToRGBA4444(in_data, num_pixels, rgba);
break;
case MODE_RGB_565:
ConvertBGRAToRGB565(in_data, num_pixels, rgba);
break;
default: default:
assert(0); // Code flow should not reach here. assert(0); // Code flow should not reach here.
} }