diff options
| author | uau <uau@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-06-14 19:48:54 +0000 |
|---|---|---|
| committer | uau <uau@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-06-14 19:48:54 +0000 |
| commit | 67233233030d593dd4939f2eb167c0016c3e0b4f (patch) | |
| tree | 5aecf0377d69b69dc7ab506b254c073eed9f2d66 /libmpdemux/demux_audio.c | |
| parent | 2727b16cbb4168893b2e73a0090ee8f083002eba (diff) | |
| download | mpv-67233233030d593dd4939f2eb167c0016c3e0b4f.tar.bz2 mpv-67233233030d593dd4939f2eb167c0016c3e0b4f.tar.xz | |
Clean up audio pts handling, make audio pts tracking in the audio-only
case work the same as with video.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18713 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/demux_audio.c')
| -rw-r--r-- | libmpdemux/demux_audio.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/libmpdemux/demux_audio.c b/libmpdemux/demux_audio.c index c1f2cecfbd..3aef23378a 100644 --- a/libmpdemux/demux_audio.c +++ b/libmpdemux/demux_audio.c @@ -620,8 +620,7 @@ static int demux_audio_fill_buffer(demuxer_t *demuxer, demux_stream_t *ds) { } resize_demux_packet(dp, l); - ds->pts = priv->last_pts - (ds_tell_pts(demux->audio) - - sh_audio->a_in_buffer_len)/(float)sh_audio->i_bps; + dp->pts = priv->last_pts; ds_add_packet(ds, dp); return 1; } @@ -667,7 +666,6 @@ static void demux_audio_seek(demuxer_t *demuxer,float rel_seek_secs,float audio_ } if(len > 0) high_res_mp3_seek(demuxer,len); - sh_audio->delay = priv->last_pts - (ds_tell_pts(demuxer->audio)-sh_audio->a_in_buffer_len)/(float)sh_audio->i_bps; return; } @@ -679,13 +677,10 @@ static void demux_audio_seek(demuxer_t *demuxer,float rel_seek_secs,float audio_ if(demuxer->movi_end && pos >= demuxer->movi_end) { pos = demuxer->movi_end; - //sh_audio->delay = (stream_tell(s) - demuxer->movi_start)/(float)sh_audio->i_bps; - //return; } else if(pos < demuxer->movi_start) pos = demuxer->movi_start; priv->last_pts = (pos-demuxer->movi_start)/(float)sh_audio->i_bps; - sh_audio->delay = priv->last_pts - (ds_tell_pts(demuxer->audio)-sh_audio->a_in_buffer_len)/(float)sh_audio->i_bps; switch(priv->frmt) { case WAV: |