On 2012-01-02 17:18:23 -0500, Justin Ruggles wrote:
> ---
> libavcodec/targa.c | 40 ++++++++++++++++++++++++++++++----------
> 1 files changed, 30 insertions(+), 10 deletions(-)
>
> diff --git a/libavcodec/targa.c b/libavcodec/targa.c
> index b821d74..089f115 100644
> --- a/libavcodec/targa.c
> +++ b/libavcodec/targa.c
> @@ -22,6 +22,7 @@
> #include "libavutil/intreadwrite.h"
> #include "libavutil/imgutils.h"
> #include "avcodec.h"
> +#include "bytestream.h"
> #include "targa.h"
>
> typedef struct TargaContext {
> @@ -172,27 +173,46 @@ static int decode_frame(AVCodecContext *avctx,
> }
>
> if(colors){
> - size_t pal_size;
> + int pal_size, pal_sample_size;
> if((colors + first_clr) > 256){
> av_log(avctx, AV_LOG_ERROR, "Incorrect palette: %i colors with
> offset %i\n", colors, first_clr);
> return -1;
> }
> - if(csize != 24){
> + switch (csize) {
> + case 24: pal_sample_size = 3; break;
> + case 16:
> + case 15: pal_sample_size = 2; break;
> + default:
> av_log(avctx, AV_LOG_ERROR, "Palette entry size %i bits is not
> supported\n", csize);
> return -1;
> }
> - pal_size = colors * ((csize + 1) >> 3);
> + pal_size = colors * pal_sample_size;
> CHECK_BUFFER_SIZE(buf, buf_end, pal_size, "color table");
> if(avctx->pix_fmt != PIX_FMT_PAL8)//should not occur but skip
> palette anyway
> buf += pal_size;
> else{
> - int r, g, b, t;
> - int32_t *pal = ((int32_t*)p->data[1]) + first_clr;
> - for(t = 0; t < colors; t++){
> - r = *buf++;
> - g = *buf++;
> - b = *buf++;
> - *pal++ = (b << 16) | (g << 8) | r;
> + int t;
> + uint32_t *pal = ((uint32_t *)p->data[1]) + first_clr;
> +
> + switch (pal_sample_size) {
> + case 3:
> + /* RGB24 */
> + for (t = 0; t < colors; t++)
> + *pal++ = (0xFFU << 24) | bytestream_get_le24(&buf);
what is the reason for setting the 8 msb? just setting alpha to 256?
please note that in the commit message then.
> + break;
> + case 2:
> + /* RGB555 */
> + for (t = 0; t < colors; t++) {
> + uint32_t v = bytestream_get_le16(&buf);
each palette entry is rounded up to full bytes?
> + *pal = ( 0xFFU << 24) |
> + ((v & 0x7C00) << 9) |
> + ((v & 0x03E0) << 6) |
> + ((v & 0x001F) << 3);
does this work for csize == 16? is that also rgb555?
> + /* left bit replication */
> + *pal |= (*pal & 0xE0E0E0E0U) >> 5;
> + pal++;
> + }
> + break;
> }
> p->palette_has_changed = 1;
> }
looks good otherwise
Janne
_______________________________________________
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel
