summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-06-03 01:28:14 +0200
committerwm4 <wm4@nowhere>2013-06-03 22:40:07 +0200
commit13a1ce16f9581871cf7ac0d06ece407534a98f89 (patch)
treed6fd8ec1b24476af2473fc6bde57590ea6dfe6d6 /core
parent5d517184f5c294e6aba8e2d729fad7caa5db75b4 (diff)
downloadmpv-13a1ce16f9581871cf7ac0d06ece407534a98f89.tar.bz2
mpv-13a1ce16f9581871cf7ac0d06ece407534a98f89.tar.xz
sub: pass subtitle packets directly
Before this, subtitle packets were returned as data ptr/len pairs, and mplayer.c got the rest (pts and duration) directly from the demuxer data structures. Then mplayer.c reassembled the packet data structure again. Pass packets directly instead. The mplayer.c side stays a bit awkward, because the (now by default unused) DVD path keeps getting in the way. In demux.c there's lots of weird stuff (3 functions that read packets, really?), but we want to keep the code equivalent for now to avoid hitting weird issues and corner cases.
Diffstat (limited to 'core')
-rw-r--r--core/mplayer.c19
1 files changed, 8 insertions, 11 deletions
diff --git a/core/mplayer.c b/core/mplayer.c
index 353723930c..80ddd43f95 100644
--- a/core/mplayer.c
+++ b/core/mplayer.c
@@ -1885,18 +1885,15 @@ static void update_subtitles(struct MPContext *mpctx, double refpts_tl)
if (non_interleaved && subpts_s > curpts_s + 1)
break;
}
- double duration = d_sub->first->duration;
- unsigned char *packet = NULL;
- int len = ds_get_packet_sub(d_sub, &packet);
+ struct demux_packet pkt;
+ struct demux_packet *orig = ds_get_packet_sub(d_sub);
+ if (!orig)
+ break;
+ pkt = *orig;
+ pkt.pts = subpts_s;
mp_dbg(MSGT_CPLAYER, MSGL_V, "Sub: c_pts=%5.3f s_pts=%5.3f "
- "duration=%5.3f len=%d\n", curpts_s, subpts_s, duration,
- len);
- struct demux_packet pkt = {
- .buffer = packet,
- .len = len,
- .pts = subpts_s,
- .duration = duration,
- };
+ "duration=%5.3f len=%d\n", curpts_s, pkt.pts, pkt.duration,
+ pkt.len);
sub_decode(dec_sub, &pkt);
}
}