RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-12-25 08:12:17 +00:00
Code Issues Releases Wiki Activity

subs: change subdelay handling and vobsub timing

Browse Source 
Make subdelay handling work the same way for all subtitle types and
also allow changing subtitle delay to work better with vobsubs.
This probably breaks vobsub behaviour with timestamp wrapping though.

Positive values for sub delay now delay subtitles compared to video,
where before the effect was in the opposite direction.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31663 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
reimar 2010-07-10 12:53:05 +00:00 committed by Uoti Urpala
parent 1882a37adb
commit d6322407c5
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
mpcommon.c
View File

@ -89,6 +89,7 @@ void update_subtitles(struct MPContext *mpctx, struct MPOpts *opts,
sh_video_t *sh_video, double refpts, double sub_offset, sh_video_t *sh_video, double refpts, double sub_offset,
demux_stream_t *d_dvdsub, int reset) demux_stream_t *d_dvdsub, int reset)
{ {
double curpts = refpts + sub_delay;
unsigned char *packet=NULL; unsigned char *packet=NULL;
int len; int len;
char type = d_dvdsub->sh ? ((sh_sub_t *)d_dvdsub->sh)->type : 'v'; char type = d_dvdsub->sh ? ((sh_sub_t *)d_dvdsub->sh)->type : 'v';
@ -109,7 +110,7 @@ void update_subtitles(struct MPContext *mpctx, struct MPOpts *opts,
if (sub_fps==0) sub_fps = sh_video ? sh_video->fps : 25; if (sub_fps==0) sub_fps = sh_video ? sh_video->fps : 25;
current_module = "find_sub"; current_module = "find_sub";
if (refpts > sub_last_pts || refpts < sub_last_pts-1.0) { if (refpts > sub_last_pts || refpts < sub_last_pts-1.0) {
find_sub(mpctx, subdata, (refpts+sub_delay) * find_sub(mpctx, subdata, curpts *
(subdata->sub_uses_time ? 100. : sub_fps)); (subdata->sub_uses_time ? 100. : sub_fps));
if (vo_sub) vo_sub_last = vo_sub; if (vo_sub) vo_sub_last = vo_sub;
// FIXME! frame counter... // FIXME! frame counter...
@ -121,18 +122,16 @@ void update_subtitles(struct MPContext *mpctx, struct MPOpts *opts,
if (vo_spudec && (vobsub_id >= 0 || (opts->sub_id >= 0 && type == 'v'))) { if (vo_spudec && (vobsub_id >= 0 || (opts->sub_id >= 0 && type == 'v'))) {
int timestamp; int timestamp;
current_module = "spudec"; current_module = "spudec";
spudec_heartbeat(vo_spudec, 90000*sh_video->timer); spudec_heartbeat(vo_spudec, 90000*curpts);
/* Get a sub packet from the DVD or a vobsub and make a timestamp /* Get a sub packet from the DVD or a vobsub */
* relative to sh_video->timer */
while(1) { while(1) {
// Vobsub // Vobsub
len = 0; len = 0;
if (vo_vobsub) { if (vo_vobsub) {
if (refpts+sub_delay >= 0) { if (curpts >= 0) {
len = vobsub_get_packet(vo_vobsub, refpts+sub_delay, len = vobsub_get_packet(vo_vobsub, curpts,
(void**)&packet, &timestamp); (void**)&packet, &timestamp);
if (len > 0) { if (len > 0) {
timestamp -= (refpts + sub_delay - sh_video->timer)*90000;
mp_dbg(MSGT_CPLAYER,MSGL_V,"\rVOB sub: len=%d v_pts=%5.3f v_timer=%5.3f sub=%5.3f ts=%d \n",len,refpts,sh_video->timer,timestamp / 90000.0,timestamp); mp_dbg(MSGT_CPLAYER,MSGL_V,"\rVOB sub: len=%d v_pts=%5.3f v_timer=%5.3f sub=%5.3f ts=%d \n",len,refpts,sh_video->timer,timestamp / 90000.0,timestamp);
} }
} }
@ -147,9 +146,8 @@ void update_subtitles(struct MPContext *mpctx, struct MPOpts *opts,
// in video.c set d_video->pts to 0. // in video.c set d_video->pts to 0.
float x = d_dvdsub->pts - refpts; float x = d_dvdsub->pts - refpts;
if (x > -20 && x < 20) // prevent missing subs on pts reset if (x > -20 && x < 20) // prevent missing subs on pts reset
timestamp = 90000*(sh_video->timer + d_dvdsub->pts timestamp = 90000*d_dvdsub->pts;
+ sub_delay - refpts); else timestamp = 90000*curpts;
else timestamp = 90000*(sh_video->timer + sub_delay);
mp_dbg(MSGT_CPLAYER, MSGL_V, "\rDVD sub: len=%d " mp_dbg(MSGT_CPLAYER, MSGL_V, "\rDVD sub: len=%d "
"v_pts=%5.3f s_pts=%5.3f ts=%d \n", len, "v_pts=%5.3f s_pts=%5.3f ts=%d \n", len,
refpts, d_dvdsub->pts, timestamp); refpts, d_dvdsub->pts, timestamp);
@ -164,7 +162,6 @@ void update_subtitles(struct MPContext *mpctx, struct MPOpts *opts,
vo_osd_changed(OSDTYPE_SPU); vo_osd_changed(OSDTYPE_SPU);
} else if (opts->sub_id >= 0 } else if (opts->sub_id >= 0
&& (type == 't' || type == 'm' || type == 'a' || type == 'd')) { && (type == 't' || type == 'm' || type == 'a' || type == 'd')) {
double curpts = refpts + sub_delay;
double endpts; double endpts;
if (type == 'd' && !d_dvdsub->demuxer->teletext) { if (type == 'd' && !d_dvdsub->demuxer->teletext) {
tt_stream_props tsp = {0}; tt_stream_props tsp = {0};

1
spudec.c
View File

@ -624,6 +624,7 @@ void spudec_heartbeat(void *this, unsigned int pts100)
spudec_handle_t *spu = (spudec_handle_t*) this; spudec_handle_t *spu = (spudec_handle_t*) this;
spu->now_pts = pts100; spu->now_pts = pts100;
// TODO: detect and handle broken timestamps (e.g. due to wrapping)
while (spu->queue_head != NULL && pts100 >= spu->queue_head->start_pts) { while (spu->queue_head != NULL && pts100 >= spu->queue_head->start_pts) {
packet_t *packet = spudec_dequeue_packet(spu); packet_t *packet = spudec_dequeue_packet(spu);
spu->start_pts = packet->start_pts; spu->start_pts = packet->start_pts;