Mercurial > mplayer.hg
view find_sub.c @ 29734:54145563612e
Find and take into account stream start time for ogg files.
This also makes the demuxing function set the keyframe flag for
vorbis packets that aren't header packets and have a time stamp,
even if we do not have vorbis_info struct yet.
The reason for this is that header packets always have 0 as time stamp.
Fixes bug #1585
author | reimar |
---|---|
date | Fri, 16 Oct 2009 08:42:00 +0000 |
parents | 23c0da51c660 |
children | c1a3f1bbba26 |
line wrap: on
line source
//**************************************************************************// // .SUB //**************************************************************************// #include "config.h" #include <stdio.h> #include "libvo/video_out.h" #include "libvo/sub.h" #include "subreader.h" #include "mp_msg.h" #include "help_mp.h" #include "mpcommon.h" static int current_sub=0; //static subtitle* subtitles=NULL; static int nosub_range_start=-1; static int nosub_range_end=-1; static const sub_data *last_sub_data = NULL; extern float sub_delay; extern float sub_fps; void step_sub(sub_data *subd, float pts, int movement) { subtitle *subs; int key; if (subd == NULL) return; subs = subd->subtitles; key = (pts+sub_delay) * (subd->sub_uses_time ? 100 : sub_fps); /* Tell the OSD subsystem that the OSD contents will change soon */ vo_osd_changed(OSDTYPE_SUBTITLE); /* If we are moving forward, don't count the next (current) subtitle * if we haven't displayed it yet. Same when moving other direction. */ if (movement > 0 && key < subs[current_sub].start) movement--; if (movement < 0 && key >= subs[current_sub].end) movement++; /* Never move beyond first or last subtitle. */ if (current_sub+movement < 0) movement = 0-current_sub; if (current_sub+movement >= subd->sub_num) movement = subd->sub_num - current_sub - 1; current_sub += movement; sub_delay = subs[current_sub].start / (subd->sub_uses_time ? 100 : sub_fps) - pts; } void find_sub(sub_data* subd,int key){ subtitle *subs; subtitle *new_sub = NULL; int i,j; if ( !subd || subd->sub_num == 0) return; subs = subd->subtitles; if (last_sub_data != subd) { // Sub data changed, reset nosub range. last_sub_data = subd; nosub_range_start = -1; nosub_range_end = -1; } if(vo_sub){ if(key>=vo_sub->start && key<=vo_sub->end) return; // OK! } else { if(key>nosub_range_start && key<nosub_range_end) return; // OK! } // sub changed! /* Tell the OSD subsystem that the OSD contents will change soon */ vo_osd_changed(OSDTYPE_SUBTITLE); if(key<=0){ // no sub here goto update; } // printf("\r---- sub changed ----\n"); // check next sub. if(current_sub>=0 && current_sub+1 < subd->sub_num){ if(key>subs[current_sub].end && key<subs[current_sub+1].start){ // no sub nosub_range_start=subs[current_sub].end; nosub_range_end=subs[current_sub+1].start; goto update; } // next sub? ++current_sub; new_sub=&subs[current_sub]; if(key>=new_sub->start && key<=new_sub->end) goto update; // OK! } // printf("\r---- sub log search... ----\n"); // use logarithmic search: i=0; j = subd->sub_num - 1; // printf("Searching %d in %d..%d\n",key,subs[i].start,subs[j].end); while(j>=i){ current_sub=(i+j+1)/2; new_sub=&subs[current_sub]; if(key<new_sub->start) j=current_sub-1; else if(key>new_sub->end) i=current_sub+1; else goto update; // found! } // if(key>=new_sub->start && key<=new_sub->end) return; // OK! // check where are we... if(key<new_sub->start){ if(current_sub<=0){ // before the first sub nosub_range_start=key-1; // tricky nosub_range_end=new_sub->start; // printf("FIRST... key=%d end=%d \n",key,new_sub->start); new_sub=NULL; goto update; } --current_sub; if(key>subs[current_sub].end && key<subs[current_sub+1].start){ // no sub nosub_range_start=subs[current_sub].end; nosub_range_end=subs[current_sub+1].start; // printf("No sub... 1 \n"); new_sub=NULL; goto update; } printf("HEH???? "); } else { if(key<=new_sub->end) printf("JAJJ! "); else if(current_sub+1 >= subd->sub_num){ // at the end? nosub_range_start=new_sub->end; nosub_range_end=0x7FFFFFFF; // MAXINT // printf("END!?\n"); new_sub=NULL; goto update; } else if(key>subs[current_sub].end && key<subs[current_sub+1].start){ // no sub nosub_range_start=subs[current_sub].end; nosub_range_end=subs[current_sub+1].start; // printf("No sub... 2 \n"); new_sub=NULL; goto update; } } mp_msg(MSGT_FIXME,MSGL_FIXME,"SUB ERROR: %d ? %d --- %d [%d] \n",key,(int)new_sub->start,(int)new_sub->end,current_sub); new_sub=NULL; // no sub here update: set_osd_subtitle(new_sub); }