[SCM] libav/experimental: 10l (forgot to commit this yesterday) DVB subtitle decoder by (Ian Caulfield: imc25, cam ac uk)
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 15:44:40 UTC 2013
The following commit has been merged in the experimental branch:
commit 50e2450bc1a51cd8e299437c6ec0f1083d894fee
Author: Michael Niedermayer <michaelni at gmx.at>
Date: Sun Jul 17 09:22:51 2005 +0000
10l (forgot to commit this yesterday)
DVB subtitle decoder by (Ian Caulfield: imc25, cam ac uk)
Originally committed as revision 4449 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/libavcodec/dvdsub.c b/libavcodec/dvdsub.c
index af5d9ac..3300d0d 100644
--- a/libavcodec/dvdsub.c
+++ b/libavcodec/dvdsub.c
@@ -132,11 +132,12 @@ static int decode_dvd_subtitles(AVSubtitle *sub_header,
int cmd_pos, pos, cmd, x1, y1, x2, y2, offset1, offset2, next_cmd_pos;
uint8_t palette[4], alpha[4];
int date;
+ int i;
if (buf_size < 4)
return -1;
- sub_header->bitmap = NULL;
- sub_header->rgba_palette = NULL;
+ sub_header->rects = NULL;
+ sub_header->num_rects = 0;
sub_header->start_display_time = 0;
sub_header->end_display_time = 0;
@@ -230,30 +231,39 @@ static int decode_dvd_subtitles(AVSubtitle *sub_header,
if (h < 0)
h = 0;
if (w > 0 && h > 0) {
- av_freep(&sub_header->bitmap);
- av_freep(&sub_header->rgba_palette);
+ if (sub_header->rects != NULL) {
+ for (i = 0; i < sub_header->num_rects; i++) {
+ av_free(sub_header->rects[i].bitmap);
+ av_free(sub_header->rects[i].rgba_palette);
+ }
+ av_freep(&sub_header->rects);
+ sub_header->num_rects = 0;
+ }
+
bitmap = av_malloc(w * h);
- sub_header->rgba_palette = av_malloc(4 * 4);
+ sub_header->rects = av_mallocz(sizeof(AVSubtitleRect));
+ sub_header->num_rects = 1;
+ sub_header->rects[0].rgba_palette = av_malloc(4 * 4);
decode_rle(bitmap, w * 2, w, h / 2,
buf, offset1 * 2, buf_size);
decode_rle(bitmap + w, w * 2, w, h / 2,
buf, offset2 * 2, buf_size);
- guess_palette(sub_header->rgba_palette,
+ guess_palette(sub_header->rects[0].rgba_palette,
palette, alpha, 0xffff00);
- sub_header->x = x1;
- sub_header->y = y1;
- sub_header->w = w;
- sub_header->h = h;
- sub_header->nb_colors = 4;
- sub_header->linesize = w;
- sub_header->bitmap = bitmap;
+ 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].nb_colors = 4;
+ sub_header->rects[0].linesize = w;
+ sub_header->rects[0].bitmap = bitmap;
}
}
if (next_cmd_pos == cmd_pos)
break;
cmd_pos = next_cmd_pos;
}
- if (sub_header->bitmap)
+ if (sub_header->num_rects > 0)
return 0;
fail:
return -1;
@@ -278,34 +288,34 @@ static int find_smallest_bouding_rectangle(AVSubtitle *s)
int y1, y2, x1, x2, y, w, h, i;
uint8_t *bitmap;
- if (s->w <= 0 || s->h <= 0)
+ if (s->num_rects == 0 || s->rects == NULL || s->rects[0].w <= 0 || s->rects[0].h <= 0)
return 0;
memset(transp_color, 0, 256);
- for(i = 0; i < s->nb_colors; i++) {
- if ((s->rgba_palette[i] >> 24) == 0)
+ for(i = 0; i < s->rects[0].nb_colors; i++) {
+ if ((s->rects[0].rgba_palette[i] >> 24) == 0)
transp_color[i] = 1;
}
y1 = 0;
- while (y1 < s->h && is_transp(s->bitmap + y1 * s->linesize, 1, s->w,
- transp_color))
+ while (y1 < s->rects[0].h && is_transp(s->rects[0].bitmap + y1 * s->rects[0].linesize,
+ 1, s->rects[0].w, transp_color))
y1++;
- if (y1 == s->h) {
- av_freep(&s->bitmap);
- s->w = s->h = 0;
+ if (y1 == s->rects[0].h) {
+ av_freep(&s->rects[0].bitmap);
+ s->rects[0].w = s->rects[0].h = 0;
return 0;
}
- y2 = s->h - 1;
- while (y2 > 0 && is_transp(s->bitmap + y2 * s->linesize, 1, s->w,
- transp_color))
+ y2 = s->rects[0].h - 1;
+ while (y2 > 0 && is_transp(s->rects[0].bitmap + y2 * s->rects[0].linesize, 1,
+ s->rects[0].w, transp_color))
y2--;
x1 = 0;
- while (x1 < (s->w - 1) && is_transp(s->bitmap + x1, s->linesize, s->h,
- transp_color))
+ while (x1 < (s->rects[0].w - 1) && is_transp(s->rects[0].bitmap + x1, s->rects[0].linesize,
+ s->rects[0].h, transp_color))
x1++;
- x2 = s->w - 1;
- while (x2 > 0 && is_transp(s->bitmap + x2, s->linesize, s->h,
+ x2 = s->rects[0].w - 1;
+ while (x2 > 0 && is_transp(s->rects[0].bitmap + x2, s->rects[0].linesize, s->rects[0].h,
transp_color))
x2--;
w = x2 - x1 + 1;
@@ -314,15 +324,15 @@ static int find_smallest_bouding_rectangle(AVSubtitle *s)
if (!bitmap)
return 1;
for(y = 0; y < h; y++) {
- memcpy(bitmap + w * y, s->bitmap + x1 + (y1 + y) * s->linesize, w);
+ memcpy(bitmap + w * y, s->rects[0].bitmap + x1 + (y1 + y) * s->rects[0].linesize, w);
}
- av_freep(&s->bitmap);
- s->bitmap = bitmap;
- s->linesize = w;
- s->w = w;
- s->h = h;
- s->x += x1;
- s->y += y1;
+ av_freep(&s->rects[0].bitmap);
+ s->rects[0].bitmap = bitmap;
+ s->rects[0].linesize = w;
+ s->rects[0].w = w;
+ s->rects[0].h = h;
+ s->rects[0].x += x1;
+ s->rects[0].y += y1;
return 1;
}
@@ -379,8 +389,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->bitmap,
- sub->w, sub->h, sub->rgba_palette);
+ ppm_save("/tmp/a.ppm", sub->rects[0].bitmap,
+ sub->rects[0].w, sub->rects[0].h, sub->rects[0].rgba_palette);
#endif
*data_size = 1;
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list