comparison mplayer.c @ 37165:681c7f805a23

Double-check that we are really at audio EOF by trying to refill. Somewhat improves trac #2196.

37164:22355747d51f

                        // if we have no more video, sleep some arbitrary time
                        frame_time = 1.0 / 20.0;
                        // Ensure vo_pts is updated so that ao_pcm will not hang.
                        advance_timer(frame_time);
                        // only stop playing when audio is at end as well
                        if (!mpctx->sh_audio || mpctx->d_audio->eof)
                            mpctx->eof = 1;
                    } else {
                        // might return with !eof && !blit_frame if !correct_pts
                        mpctx->num_buffered_frames += blit_frame;
                        mpctx->time_frame += frame_time / playback_speed; // for nosound

37165:681c7f805a23

                        // if we have no more video, sleep some arbitrary time
                        frame_time = 1.0 / 20.0;
                        // Ensure vo_pts is updated so that ao_pcm will not hang.
                        advance_timer(frame_time);
                        // only stop playing when audio is at end as well
                        if (!mpctx->sh_audio || (mpctx->d_audio->eof && !ds_fill_buffer(mpctx->d_audio)))
                            mpctx->eof = 1;
                    } else {
                        // might return with !eof && !blit_frame if !correct_pts
                        mpctx->num_buffered_frames += blit_frame;
                        mpctx->time_frame += frame_time / playback_speed; // for nosound