/*
- * DVD subtitle encoding for ffmpeg
+ * DVD subtitle encoding
* Copyright (c) 2005 Wolfram Gloger
*
* This file is part of Libav.
unsigned long hist[256];
int cmap[256];
- if (rects == 0 || h->rects == NULL)
+ if (rects == 0 || !h->rects)
return -1;
if (rects > 20)
rects = 20;
hist[i] = 0;
cmap[i] = 0;
}
- for (object_id = 0; object_id < rects; object_id++)
+ for (object_id = 0; object_id < rects; object_id++) {
+#if FF_API_AVPICTURE
+FF_DISABLE_DEPRECATION_WARNINGS
+ if (!h->rects[object_id]->data[0]) {
+ AVSubtitleRect *rect = h->rects[object_id];
+ int j;
+ for (j = 0; j < 4; j++) {
+ rect->data[j] = rect->pict.data[j];
+ rect->linesize[j] = rect->pict.linesize[j];
+ }
+ }
+FF_ENABLE_DEPRECATION_WARNINGS
+#endif
+
for (i=0; i<h->rects[object_id]->w*h->rects[object_id]->h; ++i) {
- color = h->rects[object_id]->pict.data[0][i];
+ color = h->rects[object_id]->data[0][i];
// only count non-transparent pixels
- alpha = ((uint32_t*)h->rects[object_id]->pict.data[1])[color] >> 24;
+ alpha = ((uint32_t *)h->rects[object_id]->data[1])[color] >> 24;
hist[color] += alpha;
}
+ }
for (color=3;; --color) {
hmax = 0;
imax = 0;
av_log(NULL, AV_LOG_ERROR, "dvd_subtitle too big\n");
return -1;
}
- dvd_encode_rle(&q, h->rects[object_id]->pict.data[0],
+ dvd_encode_rle(&q, h->rects[object_id]->data[0],
h->rects[object_id]->w*2,
h->rects[object_id]->w, h->rects[object_id]->h >> 1,
cmap);
offset2[object_id] = q - outbuf;
- dvd_encode_rle(&q, h->rects[object_id]->pict.data[0] + h->rects[object_id]->w,
+ dvd_encode_rle(&q, h->rects[object_id]->data[0] + h->rects[object_id]->w,
h->rects[object_id]->w*2,
h->rects[object_id]->w, h->rects[object_id]->h >> 1,
cmap);
}
static int dvdsub_encode(AVCodecContext *avctx,
- unsigned char *buf, int buf_size, void *data)
+ unsigned char *buf, int buf_size,
+ const AVSubtitle *sub)
{
//DVDSubtitleContext *s = avctx->priv_data;
- AVSubtitle *sub = data;
int ret;
ret = encode_dvd_subtitles(buf, buf_size, sub);
AVCodec ff_dvdsub_encoder = {
.name = "dvdsub",
+ .long_name = NULL_IF_CONFIG_SMALL("DVD subtitles"),
.type = AVMEDIA_TYPE_SUBTITLE,
- .id = CODEC_ID_DVD_SUBTITLE,
- .encode = dvdsub_encode,
- .long_name = NULL_IF_CONFIG_SMALL("DVD subtitles"),
+ .id = AV_CODEC_ID_DVD_SUBTITLE,
+ .encode_sub = dvdsub_encode,
};