Mercurial > mplayer.hg

comparison libmpdemux/demuxer.c @ 21782:99ab6c41eb1e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
use demuxer->stream_pts rather than stream_control(STREAM_CTRL_GET_CURRENT_TIME)
author nicodvb
date Sun, 31 Dec 2006 11:09:53 +0000
parents c9795699c414
children 42e1eedf58e9
comparison
equal deleted inserted replaced
21781:36112fcf78d6 21782:99ab6c41eb1e
1053 */ 1053 */
1054 int demuxer_get_current_time(demuxer_t *demuxer){ 1054 int demuxer_get_current_time(demuxer_t *demuxer){
1055 double get_time_ans = 0; 1055 double get_time_ans = 0;
1056 double tm; 1056 double tm;
1057 sh_video_t *sh_video = demuxer->video->sh; 1057 sh_video_t *sh_video = demuxer->video->sh;
1058 if(stream_control(demuxer->stream, STREAM_CTRL_GET_CURRENT_TIME,(void *)&tm)!=STREAM_UNSUPORTED) { 1058 if(demuxer->stream_pts != MP_NOPTS_VALUE)
1059 get_time_ans = tm; 1059 get_time_ans = demuxer->stream_pts;
1060 } else if(sh_video) get_time_ans = sh_video->pts; 1060 else if(sh_video) get_time_ans = sh_video->pts;
1061 return (int) get_time_ans; 1061 return (int) get_time_ans;
1062 } 1062 }
1063 1063
1064 int demuxer_get_percent_pos(demuxer_t *demuxer){ 1064 int demuxer_get_percent_pos(demuxer_t *demuxer){
1065 int ans = 0; 1065 int ans = 0;