/*
- * DVD subtitle decoding for ffmpeg
- * Copyright (c) 2005 Fabrice Bellard.
+ * DVD subtitle decoding
+ * Copyright (c) 2005 Fabrice Bellard
*
- * This file is part of FFmpeg.
+ * This file is part of Libav.
*
- * FFmpeg is free software; you can redistribute it and/or
+ * Libav is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
- * FFmpeg is distributed in the hope that it will be useful,
+ * Libav is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
+ * License along with Libav; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "avcodec.h"
-#include "bitstream.h"
-#include "colorspace.h"
+#include "get_bits.h"
#include "dsputil.h"
+#include "libavutil/colorspace.h"
//#define DEBUG
for (i = num_values; i > 0; i--) {
y = *ycbcr++;
- cb = *ycbcr++;
cr = *ycbcr++;
+ cb = *ycbcr++;
YUV_TO_RGB1_CCIR(cb, cr);
YUV_TO_RGB2_CCIR(r, g, b, y);
*rgba++ = (*alpha++ << 24) | (r << 16) | (g << 8) | b;
if (buf_size < 10)
return -1;
- sub_header->rects = NULL;
- sub_header->num_rects = 0;
- sub_header->start_display_time = 0;
- sub_header->end_display_time = 0;
+ memset(sub_header, 0, sizeof(*sub_header));
if (AV_RB16(buf) == 0) { /* HD subpicture with 4-byte offsets */
big_offsets = 1;
cmd_pos = READ_OFFSET(buf + cmd_pos);
- while ((cmd_pos + 2 + offset_size) < buf_size) {
+ while (cmd_pos > 0 && cmd_pos < buf_size - 2 - offset_size) {
date = AV_RB16(buf + cmd_pos);
next_cmd_pos = READ_OFFSET(buf + cmd_pos + 2);
-#ifdef DEBUG
- av_log(NULL, AV_LOG_INFO, "cmd_pos=0x%04x next=0x%04x date=%d\n",
- cmd_pos, next_cmd_pos, date);
-#endif
+ av_dlog(NULL, "cmd_pos=0x%04x next=0x%04x date=%d\n",
+ cmd_pos, next_cmd_pos, date);
pos = cmd_pos + 2 + offset_size;
offset1 = -1;
offset2 = -1;
x1 = y1 = x2 = y2 = 0;
while (pos < buf_size) {
cmd = buf[pos++];
-#ifdef DEBUG
- av_log(NULL, AV_LOG_INFO, "cmd=%02x\n", cmd);
-#endif
+ av_dlog(NULL, "cmd=%02x\n", cmd);
switch(cmd) {
case 0x00:
/* menu subpicture */
alpha[1] = buf[pos + 1] >> 4;
alpha[0] = buf[pos + 1] & 0x0f;
pos += 2;
-#ifdef DEBUG
- av_log(NULL, AV_LOG_INFO, "alpha=%x%x%x%x\n", alpha[0],alpha[1],alpha[2],alpha[3]);
-#endif
+ av_dlog(NULL, "alpha=%x%x%x%x\n", alpha[0],alpha[1],alpha[2],alpha[3]);
break;
case 0x05:
case 0x85:
y2 = ((buf[pos + 4] & 0x0f) << 8) | buf[pos + 5];
if (cmd & 0x80)
is_8bit = 1;
-#ifdef DEBUG
- av_log(NULL, AV_LOG_INFO, "x1=%d x2=%d y1=%d y2=%d\n",
- x1, x2, y1, y2);
-#endif
+ av_dlog(NULL, "x1=%d x2=%d y1=%d y2=%d\n", x1, x2, y1, y2);
pos += 6;
break;
case 0x06:
goto fail;
offset1 = AV_RB16(buf + pos);
offset2 = AV_RB16(buf + pos + 2);
-#ifdef DEBUG
- av_log(NULL, AV_LOG_INFO, "offset1=0x%04x offset2=0x%04x\n", offset1, offset2);
-#endif
+ av_dlog(NULL, "offset1=0x%04x offset2=0x%04x\n", offset1, offset2);
pos += 4;
break;
case 0x86:
goto fail;
offset1 = AV_RB32(buf + pos);
offset2 = AV_RB32(buf + pos + 4);
-#ifdef DEBUG
- av_log(NULL, AV_LOG_INFO, "offset1=0x%04x offset2=0x%04x\n", offset1, offset2);
-#endif
+ av_dlog(NULL, "offset1=0x%04x offset2=0x%04x\n", offset1, offset2);
pos += 8;
break;
case 0xff:
goto the_end;
default:
-#ifdef DEBUG
- av_log(NULL, AV_LOG_INFO, "unrecognised subpicture command 0x%x\n", cmd);
-#endif
+ av_dlog(NULL, "unrecognised subpicture command 0x%x\n", cmd);
goto the_end;
}
}
if (w > 0 && h > 0) {
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[i]->pict.data[0]);
+ av_freep(&sub_header->rects[i]->pict.data[1]);
+ av_freep(&sub_header->rects[i]);
}
av_freep(&sub_header->rects);
sub_header->num_rects = 0;
}
bitmap = av_malloc(w * h);
- sub_header->rects = av_mallocz(sizeof(AVSubtitleRect));
+ 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,
buf, offset2, buf_size, is_8bit);
+ sub_header->rects[0]->pict.data[1] = av_mallocz(AVPALETTE_SIZE);
if (is_8bit) {
if (yuv_palette == 0)
goto fail;
- sub_header->rects[0].rgba_palette = 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);
+ sub_header->rects[0]->nb_colors = 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].nb_colors = 4;
- guess_palette(sub_header->rects[0].rgba_palette,
+ sub_header->rects[0]->nb_colors = 4;
+ 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]->x = x1;
+ sub_header->rects[0]->y = y1;
+ sub_header->rects[0]->w = w;
+ sub_header->rects[0]->h = h;
+ sub_header->rects[0]->type = SUBTITLE_BITMAP;
+ sub_header->rects[0]->pict.linesize[0] = w;
}
}
if (next_cmd_pos == cmd_pos)
fail:
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[i]->pict.data[0]);
+ av_freep(&sub_header->rects[i]->pict.data[1]);
+ av_freep(&sub_header->rects[i]);
}
av_freep(&sub_header->rects);
sub_header->num_rects = 0;
int y1, y2, x1, x2, y, w, h, i;
uint8_t *bitmap;
- if (s->num_rects == 0 || s->rects == NULL || s->rects[0].w <= 0 || s->rects[0].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->rects[0].nb_colors; i++) {
- if ((s->rects[0].rgba_palette[i] >> 24) == 0)
+ for(i = 0; i < s->rects[0]->nb_colors; i++) {
+ 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,
- 1, s->rects[0].w, transp_color))
+ 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);
- s->rects[0].w = s->rects[0].h = 0;
+ if (y1 == s->rects[0]->h) {
+ 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,
- s->rects[0].w, transp_color))
+ y2 = s->rects[0]->h - 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,
- s->rects[0].h, transp_color))
+ 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,
+ x2 = s->rects[0]->w - 1;
+ 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;
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;
- s->rects[0].w = w;
- s->rects[0].h = h;
- s->rects[0].x += x1;
- s->rects[0].y += y1;
+ 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;
+ s->rects[0]->y += y1;
return 1;
}
#ifdef DEBUG
#undef fprintf
+#undef perror
+#undef exit
static void ppm_save(const char *filename, uint8_t *bitmap, int w, int h,
uint32_t *rgba_palette)
{
static int dvdsub_decode(AVCodecContext *avctx,
void *data, int *data_size,
- const uint8_t *buf, int buf_size)
+ AVPacket *avpkt)
{
- AVSubtitle *sub = (void *)data;
+ const uint8_t *buf = avpkt->data;
+ int buf_size = avpkt->size;
+ AVSubtitle *sub = data;
int is_menu;
is_menu = decode_dvd_subtitles(sub, buf, buf_size);
goto no_subtitle;
#if defined(DEBUG)
- 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);
+ av_dlog(NULL, "start=%d ms end =%d ms\n",
+ sub->start_display_time,
+ sub->end_display_time);
+ 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;
return buf_size;
}
-AVCodec dvdsub_decoder = {
- "dvdsub",
- CODEC_TYPE_SUBTITLE,
- CODEC_ID_DVD_SUBTITLE,
- 0,
- NULL,
- NULL,
- NULL,
- dvdsub_decode,
+AVCodec ff_dvdsub_decoder = {
+ .name = "dvdsub",
+ .type = AVMEDIA_TYPE_SUBTITLE,
+ .id = CODEC_ID_DVD_SUBTITLE,
+ .decode = dvdsub_decode,
.long_name = NULL_IF_CONFIG_SMALL("DVD subtitles"),
};