RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-01-04 06:02:12 +00:00
Code Issues Projects Releases Wiki Activity

swscale: Set alpha to opaque for internal palettes.

Browse Source 
Fixes conversion of pal8 to rgb formats with alpha.

Updated references for 2 FATE tests which previously encoded fully
transparent images.

Based on a patch by Baptiste Coudurier <baptiste.coudurier@gmail.com>
This commit is contained in:
Justin Ruggles 2014-04-05 14:14:30 -04:00
parent 20c38c9c18
commit d9a542ace1
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libswscale/swscale_unscaled.c
View File

@ -1217,33 +1217,33 @@ int attribute_align_arg sws_scale(struct SwsContext *c,
y = av_clip_uint8((RY * r + GY * g + BY * b + ( 33 << (RGB2YUV_SHIFT - 1))) >> RGB2YUV_SHIFT); y = av_clip_uint8((RY * r + GY * g + BY * b + ( 33 << (RGB2YUV_SHIFT - 1))) >> RGB2YUV_SHIFT);
u = av_clip_uint8((RU * r + GU * g + BU * b + (257 << (RGB2YUV_SHIFT - 1))) >> RGB2YUV_SHIFT); u = av_clip_uint8((RU * r + GU * g + BU * b + (257 << (RGB2YUV_SHIFT - 1))) >> RGB2YUV_SHIFT);
v = av_clip_uint8((RV * r + GV * g + BV * b + (257 << (RGB2YUV_SHIFT - 1))) >> RGB2YUV_SHIFT); v = av_clip_uint8((RV * r + GV * g + BV * b + (257 << (RGB2YUV_SHIFT - 1))) >> RGB2YUV_SHIFT);
c->pal_yuv[i] = y + (u << 8) + (v << 16); c->pal_yuv[i] = y + (u << 8) + (v << 16) + (0xFFU << 24);
switch (c->dstFormat) { switch (c->dstFormat) {
case AV_PIX_FMT_BGR32: case AV_PIX_FMT_BGR32:
#if !HAVE_BIGENDIAN #if !HAVE_BIGENDIAN
case AV_PIX_FMT_RGB24: case AV_PIX_FMT_RGB24:
#endif #endif
c->pal_rgb[i] = r + (g << 8) + (b << 16); c->pal_rgb[i] = r + (g << 8) + (b << 16) + (0xFFU << 24);
break; break;
case AV_PIX_FMT_BGR32_1: case AV_PIX_FMT_BGR32_1:
#if HAVE_BIGENDIAN #if HAVE_BIGENDIAN
case AV_PIX_FMT_BGR24: case AV_PIX_FMT_BGR24:
#endif #endif
c->pal_rgb[i] = (r << 8) + (g << 16) + ((unsigned)b << 24); c->pal_rgb[i] = 0xFF + (r << 8) + (g << 16) + ((unsigned)b << 24);
break; break;
case AV_PIX_FMT_RGB32_1: case AV_PIX_FMT_RGB32_1:
#if HAVE_BIGENDIAN #if HAVE_BIGENDIAN
case AV_PIX_FMT_RGB24: case AV_PIX_FMT_RGB24:
#endif #endif
c->pal_rgb[i] = (b << 8) + (g << 16) + ((unsigned)r << 24); c->pal_rgb[i] = 0xFF + (b << 8) + (g << 16) + ((unsigned)r << 24);
break; break;
case AV_PIX_FMT_RGB32: case AV_PIX_FMT_RGB32:
#if !HAVE_BIGENDIAN #if !HAVE_BIGENDIAN
case AV_PIX_FMT_BGR24: case AV_PIX_FMT_BGR24:
#endif #endif
default: default:
c->pal_rgb[i] = b + (g << 8) + (r << 16); c->pal_rgb[i] = b + (g << 8) + (r << 16) + (0xFFU << 24);
} }
} }
} }

2
tests/ref/fate/targa-conformance-CCM8
View File

@ -1,2 +1,2 @@
#tb 0: 1/25 #tb 0: 1/25
0, 0, 0, 1, 65536, 0xcf98bc29 0, 0, 0, 1, 65536, 0x47e97fe9

2
tests/ref/fate/targa-conformance-UCM8
View File

@ -1,2 +1,2 @@
#tb 0: 1/25 #tb 0: 1/25
0, 0, 0, 1, 65536, 0xcf98bc29 0, 0, 0, 1, 65536, 0x47e97fe9