X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fxsubdec.c;h=368caf4a6db590861a896ceb2e3d67ca611f921b;hb=dd0cd3d2730b93958a34dea7c7890e71d2d72bf6;hp=391a003acb885e23661269aaafcc06e19aa5f654;hpb=7993df65275a9a9bf0a04c37d1aa31901d3ebb0c;p=ffmpeg

diff --git a/libavcodec/xsubdec.c b/libavcodec/xsubdec.c
index 391a003acb8..368caf4a6db 100644
--- a/libavcodec/xsubdec.c
+++ b/libavcodec/xsubdec.c
@@ -19,18 +19,18 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 #include "avcodec.h"
-#include "bitstream.h"
+#include "get_bits.h"
 #include "bytestream.h"
 
-static int decode_init(AVCodecContext *avctx) {
+static av_cold int decode_init(AVCodecContext *avctx) {
     avctx->pix_fmt = PIX_FMT_PAL8;
     return 0;
 }
 
 static const uint8_t tc_offsets[9] = { 0, 1, 3, 4, 6, 7, 9, 10, 11 };
-static const uint8_t tc_muls[9] = { 10, 6, 10, 6, 10, 6, 10, 10, 1 };
+static const uint8_t tc_muls[9] = { 10, 6, 10, 6, 10, 10, 10, 10, 1 };
 
-static uint64_t parse_timecode(const uint8_t *buf) {
+static int64_t parse_timecode(const uint8_t *buf, int64_t packet_time) {
     int i;
     int64_t ms = 0;
     if (buf[2] != ':' || buf[5] != ':' || buf[8] != '.')
@@ -40,17 +40,22 @@ static uint64_t parse_timecode(const uint8_t *buf) {
         if (c > 9) return AV_NOPTS_VALUE;
         ms = (ms + c) * tc_muls[i];
     }
-    return ms;
+    return ms - packet_time;
 }
 
 static int decode_frame(AVCodecContext *avctx, void *data, int *data_size,
-                        const uint8_t *buf, int buf_size) {
+                        AVPacket *avpkt) {
+    const uint8_t *buf = avpkt->data;
+    int buf_size = avpkt->size;
     AVSubtitle *sub = data;
     const uint8_t *buf_end = buf + buf_size;
     uint8_t *bitmap;
     int w, h, x, y, rlelen, i;
+    int64_t packet_time = 0;
     GetBitContext gb;
 
+    memset(sub, 0, sizeof(*sub));
+
     // check that at least header fits
     if (buf_size < 27 + 7 * 2 + 4 * 3) {
         av_log(avctx, AV_LOG_ERROR, "coded frame too small\n");
@@ -62,8 +67,10 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size,
         av_log(avctx, AV_LOG_ERROR, "invalid time code\n");
         return -1;
     }
-    sub->start_display_time = parse_timecode(buf +  1);
-    sub->end_display_time   = parse_timecode(buf + 14);
+    if (avpkt->pts != AV_NOPTS_VALUE)
+        packet_time = av_rescale_q(avpkt->pts, AV_TIME_BASE_Q, (AVRational){1, 1000});
+    sub->start_display_time = parse_timecode(buf +  1, packet_time);
+    sub->end_display_time   = parse_timecode(buf + 14, packet_time);
     buf += 27;
 
     // read header
@@ -79,32 +86,31 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size,
     rlelen = bytestream_get_le16(&buf);
 
     // allocate sub and set values
-    if (!sub->rects) {
-        sub->rects = av_mallocz(sizeof(AVSubtitleRect));
-        sub->num_rects = 1;
-    }
-    av_freep(&sub->rects[0].bitmap);
-    sub->rects[0].x = x; sub->rects[0].y = y;
-    sub->rects[0].w = w; sub->rects[0].h = h;
-    sub->rects[0].linesize = w;
-    sub->rects[0].bitmap = av_malloc(w * h);
-    sub->rects[0].nb_colors = 4;
-    sub->rects[0].rgba_palette = av_malloc(sub->rects[0].nb_colors * 4);
+    sub->rects =  av_mallocz(sizeof(*sub->rects));
+    sub->rects[0] = av_mallocz(sizeof(*sub->rects[0]));
+    sub->num_rects = 1;
+    sub->rects[0]->x = x; sub->rects[0]->y = y;
+    sub->rects[0]->w = w; sub->rects[0]->h = h;
+    sub->rects[0]->type = SUBTITLE_BITMAP;
+    sub->rects[0]->pict.linesize[0] = w;
+    sub->rects[0]->pict.data[0] = av_malloc(w * h);
+    sub->rects[0]->nb_colors = 4;
+    sub->rects[0]->pict.data[1] = av_mallocz(AVPALETTE_SIZE);
 
     // read palette
-    for (i = 0; i < sub->rects[0].nb_colors; i++)
-        sub->rects[0].rgba_palette[i] = bytestream_get_be24(&buf);
+    for (i = 0; i < sub->rects[0]->nb_colors; i++)
+        ((uint32_t*)sub->rects[0]->pict.data[1])[i] = bytestream_get_be24(&buf);
     // make all except background (first entry) non-transparent
-    for (i = 1; i < sub->rects[0].nb_colors; i++)
-        sub->rects[0].rgba_palette[i] |= 0xff000000;
+    for (i = 1; i < sub->rects[0]->nb_colors; i++)
+        ((uint32_t*)sub->rects[0]->pict.data[1])[i] |= 0xff000000;
 
     // process RLE-compressed data
     rlelen = FFMIN(rlelen, buf_end - buf);
     init_get_bits(&gb, buf, rlelen * 8);
-    bitmap = sub->rects[0].bitmap;
+    bitmap = sub->rects[0]->pict.data[0];
     for (y = 0; y < h; y++) {
         // interlaced: do odd lines
-        if (y == (h + 1) / 2) bitmap = sub->rects[0].bitmap + w;
+        if (y == (h + 1) / 2) bitmap = sub->rects[0]->pict.data[0] + w;
         for (x = 0; x < w; ) {
             int log2 = ff_log2_tab[show_bits(&gb, 8)];
             int run = get_bits(&gb, 14 - 4 * (log2 >> 1));
@@ -133,4 +139,5 @@ AVCodec xsub_decoder = {
     NULL,
     NULL,
     decode_frame,
+    .long_name = NULL_IF_CONFIG_SMALL("XSUB"),
 };