[Mplayer-cvslog] CVS: main mencoder.c,1.199,1.200 mplayer.c,1.652,1.653
Arpi of Ize
arpi at mplayerhq.hu
Fri Jan 17 00:03:32 CET 2003
Update of /cvsroot/mplayer/main
In directory mail:/var/tmp.root/cvs-serv15290
Modified Files:
mencoder.c mplayer.c
Log Message:
10l
Index: mencoder.c
===================================================================
RCS file: /cvsroot/mplayer/main/mencoder.c,v
retrieving revision 1.199
retrieving revision 1.200
diff -u -r1.199 -r1.200
--- mencoder.c 12 Jan 2003 19:41:37 -0000 1.199
+++ mencoder.c 16 Jan 2003 23:03:06 -0000 1.200
@@ -1144,7 +1144,7 @@
//printf("*** %5.3f ***\n",a_pts);
a_pts+=(ds_tell_pts(d_audio)-sh_audio->a_in_buffer_len)/(float)sh_audio->i_bps;
}
- v_pts=d_video->pts;
+ v_pts=sh_video ? sh_video->pts : d_video->pts;
// av = compensated (with out buffering delay) A-V diff
AV_delay=(a_pts-v_pts); AV_delay-=mux_a->timer-(mux_v->timer-(v_timer_corr+v_pts_corr));
// compensate input video timer by av:
@@ -1220,8 +1220,8 @@
#ifdef USE_SUB
// find sub
- if(subtitles && d_video->pts>0){
- float pts=d_video->pts;
+ if(subtitles && sh_video->pts>0){
+ float pts=sh_video->pts;
if(sub_fps==0) sub_fps=sh_video->fps;
if (pts > sub_last_pts || pts < sub_last_pts-1.0 ) {
find_sub(subtitles,sub_uses_time?(100*(pts+sub_delay)):((pts+sub_delay)*sub_fps)); // FIXME! frame counter...
@@ -1236,14 +1236,14 @@
unsigned char* packet=NULL;
int len;
while((len=ds_get_packet_sub(d_dvdsub,&packet))>0){
- mp_msg(MSGT_MENCODER,MSGL_V,"\rDVD sub: len=%d v_pts=%5.3f s_pts=%5.3f \n",len,d_video->pts,d_dvdsub->pts);
+ mp_msg(MSGT_MENCODER,MSGL_V,"\rDVD sub: len=%d v_pts=%5.3f s_pts=%5.3f \n",len,sh_video->pts,d_dvdsub->pts);
if (vo_spudec)
spudec_assemble(vo_spudec,packet,len,90000*d_dvdsub->pts);
if (vobsub_writer)
- vobsub_out_output(vobsub_writer,packet,len,mux_v->timer + d_dvdsub->pts - d_video->pts);
+ vobsub_out_output(vobsub_writer,packet,len,mux_v->timer + d_dvdsub->pts - sh_video->pts);
}
if (vo_spudec) {
- spudec_heartbeat(vo_spudec,90000*d_video->pts);
+ spudec_heartbeat(vo_spudec,90000*sh_video->pts);
vo_osd_changed(OSDTYPE_SPU);
}
}
Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.652
retrieving revision 1.653
diff -u -r1.652 -r1.653
--- mplayer.c 16 Jan 2003 22:34:23 -0000 1.652
+++ mplayer.c 16 Jan 2003 23:03:06 -0000 1.653
@@ -2089,7 +2089,7 @@
// No audio:
if(!quiet)
- mp_msg(MSGT_AVSYNC,MSGL_STATUS,"V:%6.1f %3d %2d%% %2d%% %4.1f%% %d %d %d%%\r",d_video->pts,
+ mp_msg(MSGT_AVSYNC,MSGL_STATUS,"V:%6.1f %3d %2d%% %2d%% %4.1f%% %d %d %d%%\r",sh_video->pts,
(int)sh_video->num_frames,
(sh_video->timer>0.5)?(int)(100.0*video_time_usage/(double)sh_video->timer):0,
(sh_video->timer>0.5)?(int)(100.0*vout_time_usage/(double)sh_video->timer):0,
@@ -2201,7 +2201,7 @@
#ifdef USE_EDL
if( next_edl_record->next ) { // Are we (still?) doing EDL?
- if( d_video->pts >= next_edl_record->start_sec ) {
+ if( sh_video->pts >= next_edl_record->start_sec ) {
if( next_edl_record->action == EDL_SKIP ) {
osd_function = OSD_FFW;
abs_seek_pos = 0;
@@ -2257,7 +2257,7 @@
#ifdef USE_EDL
case MP_CMD_EDL_MARK:
if( edl_fd ) {
- float v = d_video->pts;
+ float v = sh_video->pts;
fprintf( edl_fd, "%f %f %d\n", v-2, v, 0 );
}
break;
@@ -2324,7 +2324,7 @@
} break;
case MP_CMD_SUB_STEP : {
int movement = cmd->args[0].v.i;
- step_sub(subtitles, d_video->pts, movement);
+ step_sub(subtitles, sh_video->pts, movement);
osd_show_sub_delay = 9; // show the subdelay in OSD
} break;
case MP_CMD_OSD :
@@ -2956,6 +2956,7 @@
if(demux_seek(demuxer,rel_seek_secs,abs_seek_pos)){
// success:
/* FIXME there should be real seeking for vobsub */
+ if(sh_video) sh_video->pts=d_video->pts;
if (vo_vobsub)
vobsub_reset(vo_vobsub);
#if 0
@@ -3021,7 +3022,7 @@
if( !edl_decision ) {
for( x = 0; x < num_edl_records; x++ ) { // FIXME: do binary search
// Find first EDL entry where start follows current time
- if( edl_records[ x ].start_sec >= d_video->pts && edl_records[ x ].action != EDL_MUTE ) {
+ if( edl_records[ x ].start_sec >= sh_video->pts && edl_records[ x ].action != EDL_MUTE ) {
next_edl_record = &edl_records[ x ];
break;
}
@@ -3049,7 +3050,7 @@
off_t pos = ( demuxer->file_format == DEMUXER_TYPE_AUDIO?stream->pos:demuxer->filepos );
guiIntfStruct.Position=(len <= 0? 0.0f : ( pos - demuxer->movi_start ) * 100.0f / len );
}
- if ( sh_video ) guiIntfStruct.TimeSec=d_video->pts;
+ if ( sh_video ) guiIntfStruct.TimeSec=sh_video->pts;
else if ( sh_audio ) guiIntfStruct.TimeSec=sh_audio->delay;
guiIntfStruct.LengthInSec=demuxer_get_time_length(demuxer);
guiGetEvent( guiReDraw,NULL );
@@ -3071,7 +3072,7 @@
//================= Update OSD ====================
#ifdef USE_OSD
if(osd_level>=1){
- int pts=d_video->pts;
+ int pts=sh_video->pts;
char osd_text_tmp[64];
if(pts==osd_last_pts-1) ++pts; else osd_last_pts=pts;
vo_osd_text=osd_text_buffer;
@@ -3149,8 +3150,8 @@
#ifdef USE_SUB
// find sub
- if(subtitles && d_video->pts>0){
- float pts=d_video->pts;
+ if(subtitles && sh_video->pts>0){
+ float pts=sh_video->pts;
if(sub_fps==0) sub_fps=sh_video->fps;
current_module="find_sub";
if (pts > sub_last_pts || pts < sub_last_pts-1.0 ) {
@@ -3170,20 +3171,20 @@
// Vobsub
len = 0;
if(vo_vobsub) {
- if(d_video->pts+sub_delay>=0) {
+ if(sh_video->pts+sub_delay>=0) {
// The + next_frame_time is there because we'll display the sub at the next frame
- len = vobsub_get_packet(vo_vobsub,d_video->pts+sub_delay+next_frame_time,(void**)&packet,×tamp);
+ len = vobsub_get_packet(vo_vobsub,sh_video->pts+sub_delay+next_frame_time,(void**)&packet,×tamp);
if(len > 0) {
- timestamp -= (d_video->pts + 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,d_video->pts,sh_video->timer,timestamp / 90000.0);
+ timestamp -= (sh_video->pts + 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,sh_video->pts,sh_video->timer,timestamp / 90000.0);
}
}
} else {
// DVD sub
len = ds_get_packet_sub(d_dvdsub,(unsigned char**)&packet);
if(len > 0) {
- timestamp = 90000*(sh_video->timer + d_dvdsub->pts + sub_delay - d_video->pts);
- mp_dbg(MSGT_CPLAYER,MSGL_V,"\rDVD sub: len=%d v_pts=%5.3f s_pts=%5.3f ts=%d \n",len,d_video->pts,d_dvdsub->pts,timestamp);
+ timestamp = 90000*(sh_video->timer + d_dvdsub->pts + sub_delay - sh_video->pts);
+ mp_dbg(MSGT_CPLAYER,MSGL_V,"\rDVD sub: len=%d v_pts=%5.3f s_pts=%5.3f ts=%d \n",len,sh_video->pts,d_dvdsub->pts,timestamp);
}
}
return len;
More information about the MPlayer-cvslog
mailing list