Commit 04108619 authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files

oops

Originally committed as revision 2691 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 93e1a0a9
...@@ -545,7 +545,7 @@ static double get_audio_clock(VideoState *is) ...@@ -545,7 +545,7 @@ static double get_audio_clock(VideoState *is)
static double get_video_clock(VideoState *is) static double get_video_clock(VideoState *is)
{ {
double delta; double delta;
if (is->paused) { //FIXME timing gets messed after pause if (is->paused) {
delta = 0; delta = 0;
} else { } else {
delta = (av_gettime() - is->video_current_pts_time) / 1000000.0; delta = (av_gettime() - is->video_current_pts_time) / 1000000.0;
...@@ -1055,7 +1055,6 @@ static int audio_decode_frame(VideoState *is, uint8_t *audio_buf, double *pts_pt ...@@ -1055,7 +1055,6 @@ static int audio_decode_frame(VideoState *is, uint8_t *audio_buf, double *pts_pt
pts = is->audio_clock; pts = is->audio_clock;
*pts_ptr = pts; *pts_ptr = pts;
n = 2 * is->audio_st->codec.channels; n = 2 * is->audio_st->codec.channels;
printf("%f %d %d %d\n", is->audio_clock, is->audio_st->codec.channels, data_size, is->audio_st->codec.sample_rate);
is->audio_clock += (double)data_size / is->audio_clock += (double)data_size /
(double)(n * is->audio_st->codec.sample_rate); (double)(n * is->audio_st->codec.sample_rate);
#if defined(DEBUG_SYNC) #if defined(DEBUG_SYNC)
...@@ -1675,8 +1674,6 @@ void event_loop(void) ...@@ -1675,8 +1674,6 @@ void event_loop(void)
do_seek: do_seek:
if (cur_stream) { if (cur_stream) {
pos = get_master_clock(cur_stream); pos = get_master_clock(cur_stream);
printf("%f %f %d %d %d %d\n", (float)pos, (float)incr, cur_stream->av_sync_type == AV_SYNC_VIDEO_MASTER,
cur_stream->av_sync_type == AV_SYNC_AUDIO_MASTER, cur_stream->video_st, cur_stream->audio_st);
pos += incr; pos += incr;
stream_seek(cur_stream, (int64_t)(pos * AV_TIME_BASE)); stream_seek(cur_stream, (int64_t)(pos * AV_TIME_BASE));
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment