comparison mplayer.c @ 2102:569a5d7b5d8a

mov timing fixes (same way as asf)
author arpi
date Sat, 06 Oct 2001 00:59:45 +0000
parents c34a29902845
children 6365b02ccc6e
comparison
equal deleted inserted replaced
2101:4ca146a57d17 2102:569a5d7b5d8a
809 exit_player(MSGTR_Exit_error); 809 exit_player(MSGTR_Exit_error);
810 } 810 }
811 while(!ds->eof){ 811 while(!ds->eof){
812 unsigned char* start; 812 unsigned char* start;
813 int in_size=ds_get_packet(ds,&start); 813 int in_size=ds_get_packet(ds,&start);
814 if( (demuxer->file_format==DEMUXER_TYPE_AVI || demuxer->file_format==DEMUXER_TYPE_ASF) 814 if( (demuxer->file_format==DEMUXER_TYPE_AVI || demuxer->file_format==DEMUXER_TYPE_ASF || demuxer->file_format==DEMUXER_TYPE_MOV)
815 && stream_dump_type==2) fwrite(&in_size,1,4,f); 815 && stream_dump_type==2) fwrite(&in_size,1,4,f);
816 if(in_size>0) fwrite(start,in_size,1,f); 816 if(in_size>0) fwrite(start,in_size,1,f);
817 } 817 }
818 fclose(f); 818 fclose(f);
819 mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_CoreDumped); 819 mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_CoreDumped);
1358 if((int)sh_video->fps==1000) 1358 if((int)sh_video->fps==1000)
1359 mp_msg(MSGT_CPLAYER,MSGL_STATUS,"\rASF framerate: %d fps \n",(int)(1.0f/d)); 1359 mp_msg(MSGT_CPLAYER,MSGL_STATUS,"\rASF framerate: %d fps \n",(int)(1.0f/d));
1360 sh_video->frametime=d; // 1ms 1360 sh_video->frametime=d; // 1ms
1361 sh_video->fps=1.0f/d; 1361 sh_video->fps=1.0f/d;
1362 } 1362 }
1363 } else
1364 if(demuxer->file_format==DEMUXER_TYPE_MOV && !force_fps){
1365 // .MOV files has no fixed FPS - just frame durations!
1366 float d=d_video->pts-pts1;
1367 frame_time=d;
1363 } 1368 }
1364 sh_video->timer+=frame_time; 1369 sh_video->timer+=frame_time;
1365 time_frame+=frame_time; // for nosound 1370 time_frame+=frame_time; // for nosound
1366 1371
1367 if(demuxer->file_format==DEMUXER_TYPE_MPEG_PS) d_video->pts+=frame_time; 1372 if(demuxer->file_format==DEMUXER_TYPE_MPEG_PS) d_video->pts+=frame_time;