/*
- * DVD subtitle encoding for ffmpeg
- * Copyright (c) 2005 Wolfram Gloger.
+ * DVD subtitle encoding
+ * Copyright (c) 2005 Wolfram Gloger
*
- * This library is free software; you can redistribute it and/or
+ * This file is part of Libav.
+ *
+ * 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 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
- * This library 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 this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * 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 "bytestream.h"
#undef NDEBUG
#include <assert.h>
-typedef struct DVDSubtitleContext {
-} DVDSubtitleContext;
-
// ncnt is the nibble counter
#define PUTNIBBLE(val)\
do {\
*pq = q;
}
-static inline void putbe16(uint8_t **pq, uint16_t v)
-{
- uint8_t *q = *pq;
- *q++ = v >> 8;
- *q++ = v;
- *pq = q;
-}
-
static int encode_dvd_subtitles(uint8_t *outbuf, int outbuf_size,
const AVSubtitle *h)
{
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 (i=0; i<h->rects[object_id].w*h->rects[object_id].h; ++i) {
- color = h->rects[object_id].bitmap[i];
+ 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]->data[0][i];
// only count non-transparent pixels
- alpha = h->rects[object_id].rgba_palette[color] >> 24;
+ alpha = ((uint32_t *)h->rects[object_id]->data[1])[color] >> 24;
hist[color] += alpha;
}
+ }
for (color=3;; --color) {
hmax = 0;
imax = 0;
for (object_id = 0; object_id < rects; object_id++) {
offset1[object_id] = q - outbuf;
// worst case memory requirement: 1 nibble per pixel..
- if ((q - outbuf) + h->rects[object_id].w*h->rects[object_id].h/2
+ if ((q - outbuf) + h->rects[object_id]->w*h->rects[object_id]->h/2
+ 17*rects + 21 > outbuf_size) {
av_log(NULL, AV_LOG_ERROR, "dvd_subtitle too big\n");
return -1;
}
- dvd_encode_rle(&q, h->rects[object_id].bitmap,
- h->rects[object_id].w*2,
- h->rects[object_id].w, h->rects[object_id].h >> 1,
+ 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].bitmap + h->rects[object_id].w,
- h->rects[object_id].w*2,
- h->rects[object_id].w, h->rects[object_id].h >> 1,
+ 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);
}
// set data packet size
qq = outbuf + 2;
- putbe16(&qq, q - outbuf);
+ bytestream_put_be16(&qq, q - outbuf);
// send start display command
- putbe16(&q, (h->start_display_time*90) >> 10);
- putbe16(&q, (q - outbuf) /*- 2 */ + 8 + 12*rects + 2);
+ bytestream_put_be16(&q, (h->start_display_time*90) >> 10);
+ bytestream_put_be16(&q, (q - outbuf) /*- 2 */ + 8 + 12*rects + 2);
*q++ = 0x03; // palette - 4 nibbles
*q++ = 0x03; *q++ = 0x7f;
*q++ = 0x04; // alpha - 4 nibbles
// XXX not sure if more than one rect can really be encoded..
// 12 bytes per rect
for (object_id = 0; object_id < rects; object_id++) {
- int x2 = h->rects[object_id].x + h->rects[object_id].w - 1;
- int y2 = h->rects[object_id].y + h->rects[object_id].h - 1;
+ int x2 = h->rects[object_id]->x + h->rects[object_id]->w - 1;
+ int y2 = h->rects[object_id]->y + h->rects[object_id]->h - 1;
*q++ = 0x05;
// x1 x2 -> 6 nibbles
- *q++ = h->rects[object_id].x >> 4;
- *q++ = (h->rects[object_id].x << 4) | ((x2 >> 8) & 0xf);
+ *q++ = h->rects[object_id]->x >> 4;
+ *q++ = (h->rects[object_id]->x << 4) | ((x2 >> 8) & 0xf);
*q++ = x2;
// y1 y2 -> 6 nibbles
- *q++ = h->rects[object_id].y >> 4;
- *q++ = (h->rects[object_id].y << 4) | ((y2 >> 8) & 0xf);
+ *q++ = h->rects[object_id]->y >> 4;
+ *q++ = (h->rects[object_id]->y << 4) | ((y2 >> 8) & 0xf);
*q++ = y2;
*q++ = 0x06;
// offset1, offset2
- putbe16(&q, offset1[object_id]);
- putbe16(&q, offset2[object_id]);
+ bytestream_put_be16(&q, offset1[object_id]);
+ bytestream_put_be16(&q, offset2[object_id]);
}
*q++ = 0x01; // start command
*q++ = 0xff; // terminating command
// send stop display command last
- putbe16(&q, (h->end_display_time*90) >> 10);
- putbe16(&q, (q - outbuf) - 2 /*+ 4*/);
+ bytestream_put_be16(&q, (h->end_display_time*90) >> 10);
+ bytestream_put_be16(&q, (q - outbuf) - 2 /*+ 4*/);
*q++ = 0x02; // set end
*q++ = 0xff; // terminating command
qq = outbuf;
- putbe16(&qq, q - outbuf);
+ bytestream_put_be16(&qq, q - outbuf);
av_log(NULL, AV_LOG_DEBUG, "subtitle_packet size=%td\n", q - outbuf);
return q - outbuf;
}
-static int dvdsub_init_encoder(AVCodecContext *avctx)
-{
- return 0;
-}
-
-static int dvdsub_close_encoder(AVCodecContext *avctx)
-{
- return 0;
-}
-
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);
return ret;
}
-AVCodec dvdsub_encoder = {
- "dvdsub",
- CODEC_TYPE_SUBTITLE,
- CODEC_ID_DVD_SUBTITLE,
- sizeof(DVDSubtitleContext),
- dvdsub_init_encoder,
- dvdsub_encode,
- dvdsub_close_encoder,
+AVCodec ff_dvdsub_encoder = {
+ .name = "dvdsub",
+ .long_name = NULL_IF_CONFIG_SMALL("DVD subtitles"),
+ .type = AVMEDIA_TYPE_SUBTITLE,
+ .id = AV_CODEC_ID_DVD_SUBTITLE,
+ .encode_sub = dvdsub_encode,
};
-
-/* Local Variables: */
-/* c-basic-offset:4 */
-/* End: */
projects / ffmpeg / blobdiff