From 25b4c651a3de58ea14c59131c650593736004686 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sat, 3 Jan 2009 19:17:18 +0000 Subject: Replace AVSubtitleRect.rgba_palette and bitmap by AVPicture. Originally committed as revision 16416 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/dvdsubdec.c | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) (limited to 'libavcodec/dvdsubdec.c') diff --git a/libavcodec/dvdsubdec.c b/libavcodec/dvdsubdec.c index 0ba11c2c3f..dac152b90f 100644 --- a/libavcodec/dvdsubdec.c +++ b/libavcodec/dvdsubdec.c @@ -319,8 +319,8 @@ static int decode_dvd_subtitles(AVSubtitle *sub_header, if (w > 0 && h > 0) { if (sub_header->rects != NULL) { for (i = 0; i < sub_header->num_rects; i++) { - av_freep(&sub_header->rects[i]->bitmap); - av_freep(&sub_header->rects[i]->rgba_palette); + av_freep(&sub_header->rects[i]->pict.data[0]); + av_freep(&sub_header->rects[i]->pict.data[1]); av_freep(&sub_header->rects[i]); } av_freep(&sub_header->rects); @@ -331,7 +331,7 @@ static int decode_dvd_subtitles(AVSubtitle *sub_header, sub_header->rects = av_mallocz(sizeof(*sub_header->rects)); sub_header->rects[0] = av_mallocz(sizeof(AVSubtitleRect)); sub_header->num_rects = 1; - sub_header->rects[0]->bitmap = bitmap; + sub_header->rects[0]->pict.data[0] = bitmap; decode_rle(bitmap, w * 2, w, (h + 1) / 2, buf, offset1, buf_size, is_8bit); decode_rle(bitmap + w, w * 2, w, h / 2, @@ -339,20 +339,20 @@ static int decode_dvd_subtitles(AVSubtitle *sub_header, if (is_8bit) { if (yuv_palette == 0) goto fail; - sub_header->rects[0]->rgba_palette = av_malloc(256 * 4); + sub_header->rects[0]->pict.data[1] = av_malloc(256 * 4); sub_header->rects[0]->nb_colors = 256; - yuv_a_to_rgba(yuv_palette, alpha, sub_header->rects[0]->rgba_palette, 256); + yuv_a_to_rgba(yuv_palette, alpha, (uint32_t*)sub_header->rects[0]->pict.data[1], 256); } else { - sub_header->rects[0]->rgba_palette = av_malloc(4 * 4); + sub_header->rects[0]->pict.data[1] = av_malloc(4 * 4); sub_header->rects[0]->nb_colors = 4; - guess_palette(sub_header->rects[0]->rgba_palette, + guess_palette((uint32_t*)sub_header->rects[0]->pict.data[1], colormap, alpha, 0xffff00); } sub_header->rects[0]->x = x1; sub_header->rects[0]->y = y1; sub_header->rects[0]->w = w; sub_header->rects[0]->h = h; - sub_header->rects[0]->linesize = w; + sub_header->rects[0]->pict.linesize[0] = w; } } if (next_cmd_pos == cmd_pos) @@ -364,8 +364,8 @@ static int decode_dvd_subtitles(AVSubtitle *sub_header, fail: if (sub_header->rects != NULL) { for (i = 0; i < sub_header->num_rects; i++) { - av_freep(&sub_header->rects[i]->bitmap); - av_freep(&sub_header->rects[i]->rgba_palette); + av_freep(&sub_header->rects[i]->pict.data[0]); + av_freep(&sub_header->rects[i]->pict.data[1]); av_freep(&sub_header->rects[i]); } av_freep(&sub_header->rects); @@ -398,29 +398,29 @@ static int find_smallest_bounding_rectangle(AVSubtitle *s) memset(transp_color, 0, 256); for(i = 0; i < s->rects[0]->nb_colors; i++) { - if ((s->rects[0]->rgba_palette[i] >> 24) == 0) + if ((((uint32_t*)s->rects[0]->pict.data[1])[i] >> 24) == 0) transp_color[i] = 1; } y1 = 0; - while (y1 < s->rects[0]->h && is_transp(s->rects[0]->bitmap + y1 * s->rects[0]->linesize, + while (y1 < s->rects[0]->h && is_transp(s->rects[0]->pict.data[0] + y1 * s->rects[0]->pict.linesize[0], 1, s->rects[0]->w, transp_color)) y1++; if (y1 == s->rects[0]->h) { - av_freep(&s->rects[0]->bitmap); + av_freep(&s->rects[0]->pict.data[0]); s->rects[0]->w = s->rects[0]->h = 0; return 0; } y2 = s->rects[0]->h - 1; - while (y2 > 0 && is_transp(s->rects[0]->bitmap + y2 * s->rects[0]->linesize, 1, + while (y2 > 0 && is_transp(s->rects[0]->pict.data[0] + y2 * s->rects[0]->pict.linesize[0], 1, s->rects[0]->w, transp_color)) y2--; x1 = 0; - while (x1 < (s->rects[0]->w - 1) && is_transp(s->rects[0]->bitmap + x1, s->rects[0]->linesize, + while (x1 < (s->rects[0]->w - 1) && is_transp(s->rects[0]->pict.data[0] + x1, s->rects[0]->pict.linesize[0], s->rects[0]->h, transp_color)) x1++; x2 = s->rects[0]->w - 1; - while (x2 > 0 && is_transp(s->rects[0]->bitmap + x2, s->rects[0]->linesize, s->rects[0]->h, + while (x2 > 0 && is_transp(s->rects[0]->pict.data[0] + x2, s->rects[0]->pict.linesize[0], s->rects[0]->h, transp_color)) x2--; w = x2 - x1 + 1; @@ -429,11 +429,11 @@ static int find_smallest_bounding_rectangle(AVSubtitle *s) if (!bitmap) return 1; for(y = 0; y < h; y++) { - memcpy(bitmap + w * y, s->rects[0]->bitmap + x1 + (y1 + y) * s->rects[0]->linesize, w); + memcpy(bitmap + w * y, s->rects[0]->pict.data[0] + x1 + (y1 + y) * s->rects[0]->pict.linesize[0], w); } - av_freep(&s->rects[0]->bitmap); - s->rects[0]->bitmap = bitmap; - s->rects[0]->linesize = w; + av_freep(&s->rects[0]->pict.data[0]); + s->rects[0]->pict.data[0] = bitmap; + s->rects[0]->pict.linesize[0] = w; s->rects[0]->w = w; s->rects[0]->h = h; s->rects[0]->x += x1; @@ -494,8 +494,8 @@ static int dvdsub_decode(AVCodecContext *avctx, av_log(NULL, AV_LOG_INFO, "start=%d ms end =%d ms\n", sub->start_display_time, sub->end_display_time); - ppm_save("/tmp/a.ppm", sub->rects[0]->bitmap, - sub->rects[0]->w, sub->rects[0]->h, sub->rects[0]->rgba_palette); + ppm_save("/tmp/a.ppm", sub->rects[0]->pict.data[0], + sub->rects[0]->w, sub->rects[0]->h, sub->rects[0]->pict.data[1]); #endif *data_size = 1; -- cgit v1.2.3