RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

dvdsubdec: Move colormap and alpha to context 

This makes it rememember old values should the stream not
contain new values for these for each subtitle.
This commit is contained in:
Joakim Plate 2011-09-12 21:11:15 +02:00
parent f98edc73c5
commit 32c0c562e7
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavcodec/dvdsubdec.c
View File

@ -29,6 +29,8 @@ typedef struct DVDSubContext
{
uint32_t palette[16];
int has_palette;
uint8_t colormap[4];
uint8_t alpha[256];
} DVDSubContext;
static void yuv_a_to_rgba(const uint8_t *ycbcr, const uint8_t *alpha, uint32_t *rgba, int num_values)
@ -123,8 +125,6 @@ static int decode_rle(uint8_t *bitmap, int linesize, int w, int h,
static void guess_palette(uint32_t *rgba_palette,
DVDSubContext* ctx,
uint8_t *colormap,
uint8_t *alpha,
uint32_t subtitle_color)
{
static const uint8_t level_map[4][4] = {
@ -137,6 +137,7 @@ static void guess_palette(uint32_t *rgba_palette,
};
uint8_t color_used[16];
int nb_opaque_colors, i, level, j, r, g, b;
uint8_t *colormap = ctx->colormap, *alpha = ctx->alpha;
if(ctx->has_palette) {
for(i = 0; i < 4; i++)
@ -188,7 +189,7 @@ static int decode_dvd_subtitles(DVDSubContext *ctx, AVSubtitle *sub_header,
int cmd_pos, pos, cmd, x1, y1, x2, y2, offset1, offset2, next_cmd_pos;
int big_offsets, offset_size, is_8bit = 0;
const uint8_t *yuv_palette = 0;
uint8_t colormap[4], alpha[256];
uint8_t *colormap = ctx->colormap, *alpha = ctx->alpha;
int date;
int i;
int is_menu = 0;
@ -348,7 +349,7 @@ static int decode_dvd_subtitles(DVDSubContext *ctx, AVSubtitle *sub_header,
} else {
sub_header->rects[0]->nb_colors = 4;
guess_palette((uint32_t*)sub_header->rects[0]->pict.data[1], ctx,
colormap, alpha, 0xffff00);
0xffff00);
}
sub_header->rects[0]->x = x1;
sub_header->rects[0]->y = y1;