X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fxsubdec.c;h=368caf4a6db590861a896ceb2e3d67ca611f921b;hb=d9b99556bfa9388d3d61b92dd22853e05a1ea428;hp=942db0cd1bf64bb36b651d5ea03dd14e50f13fa6;hpb=7a00bbad2100367481240e62876b941b5c4befdc;p=ffmpeg

diff --git a/libavcodec/xsubdec.c b/libavcodec/xsubdec.c
index 942db0cd1bf..368caf4a6db 100644
--- a/libavcodec/xsubdec.c
+++ b/libavcodec/xsubdec.c
@@ -19,7 +19,7 @@
  * 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 av_cold int decode_init(AVCodecContext *avctx) {
@@ -30,7 +30,7 @@ static av_cold int decode_init(AVCodecContext *avctx) {
 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, 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,7 +40,7 @@ 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,
@@ -51,9 +51,10 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size,
     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;
 
-    sub->format = 0;
+    memset(sub, 0, sizeof(*sub));
 
     // check that at least header fits
     if (buf_size < 27 + 7 * 2 + 4 * 3) {
@@ -66,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
@@ -83,18 +86,16 @@ 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(*sub->rects));
-        sub->rects[0] = av_mallocz(sizeof(*sub->rects[0]));
-        sub->num_rects = 1;
-    }
-    av_freep(&sub->rects[0]->pict.data[0]);
+    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_malloc(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++)