2013-10-29 21:38:29 +00:00
|
|
|
/*
|
|
|
|
* This file is part of MPlayer.
|
|
|
|
*
|
|
|
|
* MPlayer is free software; you can redistribute it and/or modify
|
|
|
|
* it under the terms of the GNU General Public License as published by
|
|
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
|
|
* (at your option) any later version.
|
|
|
|
*
|
|
|
|
* MPlayer is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
* GNU General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU General Public License along
|
|
|
|
* with MPlayer; if not, write to the Free Software Foundation, Inc.,
|
|
|
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <stddef.h>
|
|
|
|
#include <stdbool.h>
|
|
|
|
#include <inttypes.h>
|
|
|
|
#include <math.h>
|
|
|
|
#include <assert.h>
|
|
|
|
|
|
|
|
#include "config.h"
|
|
|
|
#include "talloc.h"
|
|
|
|
|
2013-12-17 01:39:45 +00:00
|
|
|
#include "common/msg.h"
|
2013-12-17 01:02:25 +00:00
|
|
|
#include "options/options.h"
|
2013-12-17 01:39:45 +00:00
|
|
|
#include "common/common.h"
|
|
|
|
#include "common/encode.h"
|
2013-12-17 01:02:25 +00:00
|
|
|
#include "options/m_property.h"
|
2013-12-17 01:39:45 +00:00
|
|
|
#include "common/playlist.h"
|
2013-12-17 00:23:09 +00:00
|
|
|
#include "input/input.h"
|
2013-10-29 21:38:29 +00:00
|
|
|
|
2014-04-23 18:37:57 +00:00
|
|
|
#include "misc/dispatch.h"
|
2013-12-19 20:31:27 +00:00
|
|
|
#include "osdep/terminal.h"
|
2013-10-29 21:38:29 +00:00
|
|
|
#include "osdep/timer.h"
|
|
|
|
|
|
|
|
#include "audio/mixer.h"
|
|
|
|
#include "audio/decode/dec_audio.h"
|
|
|
|
#include "audio/filter/af.h"
|
|
|
|
#include "audio/out/ao.h"
|
|
|
|
#include "demux/demux.h"
|
|
|
|
#include "stream/stream.h"
|
2013-11-24 11:58:06 +00:00
|
|
|
#include "sub/osd.h"
|
2013-10-29 21:38:29 +00:00
|
|
|
#include "video/filter/vf.h"
|
|
|
|
#include "video/decode/dec_video.h"
|
|
|
|
#include "video/out/vo.h"
|
|
|
|
|
2013-12-17 00:08:53 +00:00
|
|
|
#include "core.h"
|
2013-10-29 21:38:29 +00:00
|
|
|
#include "command.h"
|
|
|
|
|
2014-04-14 20:33:41 +00:00
|
|
|
void pause_player(struct MPContext *mpctx)
|
2013-10-29 21:38:29 +00:00
|
|
|
{
|
|
|
|
mpctx->opts->pause = 1;
|
|
|
|
|
|
|
|
if (mpctx->video_out)
|
|
|
|
vo_control(mpctx->video_out, VOCTRL_RESTORE_SCREENSAVER, NULL);
|
|
|
|
|
|
|
|
if (mpctx->paused)
|
2014-02-24 21:49:07 +00:00
|
|
|
goto end;
|
2013-10-29 21:38:29 +00:00
|
|
|
mpctx->paused = true;
|
|
|
|
mpctx->step_frames = 0;
|
|
|
|
mpctx->time_frame -= get_relative_time(mpctx);
|
|
|
|
mpctx->osd_function = 0;
|
|
|
|
mpctx->paused_for_cache = false;
|
|
|
|
|
2013-11-23 20:36:20 +00:00
|
|
|
if (mpctx->video_out && mpctx->d_video && mpctx->video_out->config_ok)
|
2013-10-29 21:38:29 +00:00
|
|
|
vo_control(mpctx->video_out, VOCTRL_PAUSE, NULL);
|
|
|
|
|
2013-11-23 20:22:17 +00:00
|
|
|
if (mpctx->ao && mpctx->d_audio)
|
2013-10-29 21:38:29 +00:00
|
|
|
ao_pause(mpctx->ao); // pause audio, keep data if possible
|
|
|
|
|
|
|
|
// Only print status if there's actually a file being played.
|
|
|
|
if (mpctx->num_sources)
|
|
|
|
print_status(mpctx);
|
|
|
|
|
2014-02-24 21:49:07 +00:00
|
|
|
end:
|
2014-04-14 20:33:41 +00:00
|
|
|
mp_notify(mpctx, mpctx->opts->pause ? MPV_EVENT_PAUSE : MPV_EVENT_UNPAUSE, 0);
|
2013-10-29 21:38:29 +00:00
|
|
|
}
|
|
|
|
|
2014-04-14 20:33:41 +00:00
|
|
|
void unpause_player(struct MPContext *mpctx)
|
2013-10-29 21:38:29 +00:00
|
|
|
{
|
|
|
|
mpctx->opts->pause = 0;
|
|
|
|
|
|
|
|
if (mpctx->video_out && mpctx->opts->stop_screensaver)
|
|
|
|
vo_control(mpctx->video_out, VOCTRL_KILL_SCREENSAVER, NULL);
|
|
|
|
|
|
|
|
if (!mpctx->paused)
|
2014-02-24 21:49:07 +00:00
|
|
|
goto end;
|
2013-10-29 21:38:29 +00:00
|
|
|
// Don't actually unpause while cache is loading.
|
|
|
|
if (mpctx->paused_for_cache)
|
2014-02-24 21:49:07 +00:00
|
|
|
goto end;
|
2013-10-29 21:38:29 +00:00
|
|
|
mpctx->paused = false;
|
|
|
|
mpctx->osd_function = 0;
|
|
|
|
|
2013-11-23 20:22:17 +00:00
|
|
|
if (mpctx->ao && mpctx->d_audio)
|
2013-10-29 21:38:29 +00:00
|
|
|
ao_resume(mpctx->ao);
|
2013-11-23 20:36:20 +00:00
|
|
|
if (mpctx->video_out && mpctx->d_video && mpctx->video_out->config_ok)
|
2013-10-29 21:38:29 +00:00
|
|
|
vo_control(mpctx->video_out, VOCTRL_RESUME, NULL); // resume video
|
|
|
|
(void)get_relative_time(mpctx); // ignore time that passed during pause
|
2014-02-24 21:49:07 +00:00
|
|
|
|
|
|
|
end:
|
2014-04-14 20:33:41 +00:00
|
|
|
mp_notify(mpctx, mpctx->opts->pause ? MPV_EVENT_PAUSE : MPV_EVENT_UNPAUSE, 0);
|
2013-10-29 21:38:29 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void add_step_frame(struct MPContext *mpctx, int dir)
|
|
|
|
{
|
2013-11-23 20:36:20 +00:00
|
|
|
if (!mpctx->d_video)
|
2013-10-29 21:38:29 +00:00
|
|
|
return;
|
|
|
|
if (dir > 0) {
|
|
|
|
mpctx->step_frames += 1;
|
2014-04-14 20:33:41 +00:00
|
|
|
unpause_player(mpctx);
|
2013-10-29 21:38:29 +00:00
|
|
|
} else if (dir < 0) {
|
|
|
|
if (!mpctx->backstep_active && !mpctx->hrseek_active) {
|
|
|
|
mpctx->backstep_active = true;
|
|
|
|
mpctx->backstep_start_seek_ts = mpctx->vo_pts_history_seek_ts;
|
2014-04-14 20:33:41 +00:00
|
|
|
pause_player(mpctx);
|
2013-10-29 21:38:29 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-07-30 21:01:55 +00:00
|
|
|
// Clear some playback-related fields on file loading or after seeks.
|
|
|
|
void reset_playback_state(struct MPContext *mpctx)
|
2013-10-29 21:38:29 +00:00
|
|
|
{
|
2014-07-30 21:01:55 +00:00
|
|
|
reset_video_state(mpctx);
|
|
|
|
reset_audio_state(mpctx);
|
|
|
|
reset_subtitle_state(mpctx);
|
2013-10-29 21:38:29 +00:00
|
|
|
|
|
|
|
mpctx->hrseek_active = false;
|
|
|
|
mpctx->hrseek_framedrop = false;
|
|
|
|
mpctx->playback_pts = MP_NOPTS_VALUE;
|
2014-07-30 21:01:55 +00:00
|
|
|
mpctx->last_seek_pts = MP_NOPTS_VALUE;
|
2014-07-28 18:40:43 +00:00
|
|
|
mpctx->restart_complete = false;
|
2013-10-29 21:38:29 +00:00
|
|
|
|
2013-07-16 11:28:28 +00:00
|
|
|
#if HAVE_ENCODING
|
2013-10-29 21:38:29 +00:00
|
|
|
encode_lavc_discontinuity(mpctx->encode_lavc_ctx);
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
|
|
|
// return -1 if seek failed (non-seekable stream?), 0 otherwise
|
2013-11-03 22:28:13 +00:00
|
|
|
static int mp_seek(MPContext *mpctx, struct seek_params seek,
|
|
|
|
bool timeline_fallthrough)
|
2013-10-29 21:38:29 +00:00
|
|
|
{
|
|
|
|
struct MPOpts *opts = mpctx->opts;
|
|
|
|
uint64_t prev_seek_ts = mpctx->vo_pts_history_seek_ts;
|
|
|
|
|
|
|
|
if (!mpctx->demuxer)
|
|
|
|
return -1;
|
|
|
|
|
2013-11-03 18:21:47 +00:00
|
|
|
if (!mpctx->demuxer->seekable) {
|
|
|
|
MP_ERR(mpctx, "Can't seek in this file.\n");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2013-10-29 21:38:29 +00:00
|
|
|
if (mpctx->stop_play == AT_END_OF_FILE)
|
|
|
|
mpctx->stop_play = KEEP_PLAYING;
|
player: simple hack to make backstep code somewhat more robust
The hr-seek code assumes that when seeking the demuxer, the first image
decoded after the seek will have a PTS exactly equal to the demuxer seek
target time, or before that target time. Incorrect timestamps,
implicitly dropped initial frames, or broken files/demuxers can all
break this assumption, and lead to hr-seek missing the seek target.
Generally, this is not much a problem (the user won't notice being off
by one frame), but it really shows when using the backstep feature. In
this case, backstepping would simply hang.
Add a simple hack that basically forces a minimal value for the --hr-
seek-demuxer-offset option (which is 0 by default) when doing a
backstep-seek. The chosen minimum value is arbitrary. There's no perfect
value, though in general it should perhaps be slightly longer than the
frametime, which the chosen value is more than enough for typical
framerates.
2013-11-28 14:10:51 +00:00
|
|
|
|
|
|
|
double hr_seek_offset = opts->hr_seek_demuxer_offset;
|
2014-05-12 19:32:09 +00:00
|
|
|
bool hr_seek_very_exact = seek.exact > 1;
|
player: simple hack to make backstep code somewhat more robust
The hr-seek code assumes that when seeking the demuxer, the first image
decoded after the seek will have a PTS exactly equal to the demuxer seek
target time, or before that target time. Incorrect timestamps,
implicitly dropped initial frames, or broken files/demuxers can all
break this assumption, and lead to hr-seek missing the seek target.
Generally, this is not much a problem (the user won't notice being off
by one frame), but it really shows when using the backstep feature. In
this case, backstepping would simply hang.
Add a simple hack that basically forces a minimal value for the --hr-
seek-demuxer-offset option (which is 0 by default) when doing a
backstep-seek. The chosen minimum value is arbitrary. There's no perfect
value, though in general it should perhaps be slightly longer than the
frametime, which the chosen value is more than enough for typical
framerates.
2013-11-28 14:10:51 +00:00
|
|
|
// Always try to compensate for possibly bad demuxers in "special"
|
|
|
|
// situations where we need more robustness from the hr-seek code, even
|
|
|
|
// if the user doesn't use --hr-seek-demuxer-offset.
|
|
|
|
// The value is arbitrary, but should be "good enough" in most situations.
|
2014-05-12 19:32:09 +00:00
|
|
|
if (hr_seek_very_exact)
|
player: simple hack to make backstep code somewhat more robust
The hr-seek code assumes that when seeking the demuxer, the first image
decoded after the seek will have a PTS exactly equal to the demuxer seek
target time, or before that target time. Incorrect timestamps,
implicitly dropped initial frames, or broken files/demuxers can all
break this assumption, and lead to hr-seek missing the seek target.
Generally, this is not much a problem (the user won't notice being off
by one frame), but it really shows when using the backstep feature. In
this case, backstepping would simply hang.
Add a simple hack that basically forces a minimal value for the --hr-
seek-demuxer-offset option (which is 0 by default) when doing a
backstep-seek. The chosen minimum value is arbitrary. There's no perfect
value, though in general it should perhaps be slightly longer than the
frametime, which the chosen value is more than enough for typical
framerates.
2013-11-28 14:10:51 +00:00
|
|
|
hr_seek_offset = MPMAX(hr_seek_offset, 0.5); // arbitrary
|
|
|
|
|
2014-07-28 22:26:52 +00:00
|
|
|
bool hr_seek = opts->correct_pts && seek.exact >= 0;
|
2013-10-29 21:38:29 +00:00
|
|
|
hr_seek &= (opts->hr_seek == 0 && seek.type == MPSEEK_ABSOLUTE) ||
|
|
|
|
opts->hr_seek > 0 || seek.exact > 0;
|
|
|
|
if (seek.type == MPSEEK_FACTOR || seek.amount < 0 ||
|
|
|
|
(seek.type == MPSEEK_ABSOLUTE && seek.amount < mpctx->last_chapter_pts))
|
|
|
|
mpctx->last_chapter_seek = -2;
|
|
|
|
if (seek.type == MPSEEK_FACTOR) {
|
|
|
|
double len = get_time_length(mpctx);
|
|
|
|
if (len > 0 && !mpctx->demuxer->ts_resets_possible) {
|
|
|
|
seek.amount = seek.amount * len + get_start_time(mpctx);
|
|
|
|
seek.type = MPSEEK_ABSOLUTE;
|
|
|
|
}
|
|
|
|
}
|
2014-07-28 23:00:54 +00:00
|
|
|
int direction = 0;
|
2014-07-07 22:30:01 +00:00
|
|
|
if (seek.type == MPSEEK_RELATIVE) {
|
2013-10-29 21:38:29 +00:00
|
|
|
seek.type = MPSEEK_ABSOLUTE;
|
2014-07-28 23:00:54 +00:00
|
|
|
direction = seek.amount > 0 ? 1 : -1;
|
2013-10-29 21:38:29 +00:00
|
|
|
seek.amount += get_current_time(mpctx);
|
|
|
|
}
|
2014-07-28 22:59:00 +00:00
|
|
|
hr_seek &= seek.type == MPSEEK_ABSOLUTE; // otherwise, no target PTS known
|
2013-10-29 21:38:29 +00:00
|
|
|
|
|
|
|
double demuxer_amount = seek.amount;
|
|
|
|
if (mpctx->timeline) {
|
2014-07-28 18:40:43 +00:00
|
|
|
bool need_reset = false;
|
2013-10-29 21:38:29 +00:00
|
|
|
demuxer_amount = timeline_set_from_time(mpctx, seek.amount,
|
|
|
|
&need_reset);
|
|
|
|
if (demuxer_amount == -1) {
|
|
|
|
assert(!need_reset);
|
|
|
|
mpctx->stop_play = AT_END_OF_FILE;
|
2013-11-23 20:22:17 +00:00
|
|
|
if (mpctx->d_audio && !timeline_fallthrough) {
|
audio: don't let ao_lavc access frontend internals, change gapless audio
ao_lavc.c accesses ao->buffer, which I consider internal. The access was
done in ao_lavc.c/uninit(), which tried to get the left-over audio in
order to write the last (possibly partial) audio frame. The play()
function didn't accept partial frames, because the AOPLAY_FINAL_CHUNK
flag was not correctly set, and handling it otherwise would require an
internal FIFO.
Fix this by making sure that with gapless audio (used with encoding),
the AOPLAY_FINAL_CHUNK is set only once, instead when each file ends.
Basically, move the hack in ao_lavc's uninit to uninit_player.
One thing can not be entirely correctly handled: if gapless audio is
active, we don't know really whether the AO is closed because the file
ended playing (i.e. we want to send the buffered remainder of the audio
to the AO), or whether the user is quitting the player. (The stop_play
flag is overwritten, fixing that is perhaps not worth it.) Handle this
by adding additional code to drain the AO and the buffers when playback
is quit (see play_current_file() change).
Test case: mpv avdevice://lavfi:sine=441 avdevice://lavfi:sine=441 -length 0.2267 -gapless-audio
2013-11-08 19:00:58 +00:00
|
|
|
// Seek outside of the file -> clear audio from current position
|
2013-11-08 19:02:09 +00:00
|
|
|
clear_audio_decode_buffers(mpctx);
|
|
|
|
clear_audio_output_buffers(mpctx);
|
2013-10-29 21:38:29 +00:00
|
|
|
}
|
|
|
|
return -1;
|
|
|
|
}
|
2014-07-28 18:40:43 +00:00
|
|
|
if (need_reset) {
|
|
|
|
reinit_video_chain(mpctx);
|
|
|
|
reinit_audio_chain(mpctx);
|
|
|
|
reinit_subs(mpctx, 0);
|
|
|
|
reinit_subs(mpctx, 1);
|
|
|
|
}
|
2013-10-29 21:38:29 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
int demuxer_style = 0;
|
|
|
|
switch (seek.type) {
|
|
|
|
case MPSEEK_FACTOR:
|
|
|
|
demuxer_style |= SEEK_ABSOLUTE | SEEK_FACTOR;
|
|
|
|
break;
|
|
|
|
case MPSEEK_ABSOLUTE:
|
|
|
|
demuxer_style |= SEEK_ABSOLUTE;
|
|
|
|
break;
|
|
|
|
}
|
2014-07-28 23:00:54 +00:00
|
|
|
if (hr_seek || direction < 0)
|
2013-10-29 21:38:29 +00:00
|
|
|
demuxer_style |= SEEK_BACKWARD;
|
2014-07-28 23:00:54 +00:00
|
|
|
else if (direction > 0)
|
2013-10-29 21:38:29 +00:00
|
|
|
demuxer_style |= SEEK_FORWARD;
|
|
|
|
if (hr_seek || opts->mkv_subtitle_preroll)
|
|
|
|
demuxer_style |= SEEK_SUBPREROLL;
|
|
|
|
|
|
|
|
if (hr_seek)
|
player: simple hack to make backstep code somewhat more robust
The hr-seek code assumes that when seeking the demuxer, the first image
decoded after the seek will have a PTS exactly equal to the demuxer seek
target time, or before that target time. Incorrect timestamps,
implicitly dropped initial frames, or broken files/demuxers can all
break this assumption, and lead to hr-seek missing the seek target.
Generally, this is not much a problem (the user won't notice being off
by one frame), but it really shows when using the backstep feature. In
this case, backstepping would simply hang.
Add a simple hack that basically forces a minimal value for the --hr-
seek-demuxer-offset option (which is 0 by default) when doing a
backstep-seek. The chosen minimum value is arbitrary. There's no perfect
value, though in general it should perhaps be slightly longer than the
frametime, which the chosen value is more than enough for typical
framerates.
2013-11-28 14:10:51 +00:00
|
|
|
demuxer_amount -= hr_seek_offset;
|
2014-07-13 18:07:29 +00:00
|
|
|
demux_seek(mpctx->demuxer, demuxer_amount, demuxer_style);
|
2013-10-29 21:38:29 +00:00
|
|
|
|
2013-12-24 10:08:26 +00:00
|
|
|
// Seek external, extra files too:
|
2013-12-23 19:14:54 +00:00
|
|
|
for (int t = 0; t < mpctx->num_tracks; t++) {
|
|
|
|
struct track *track = mpctx->tracks[t];
|
2013-12-24 10:08:26 +00:00
|
|
|
if (track->selected && track->is_external && track->demuxer) {
|
|
|
|
double main_new_pos;
|
|
|
|
if (seek.type == MPSEEK_ABSOLUTE) {
|
|
|
|
main_new_pos = seek.amount - mpctx->video_offset;
|
|
|
|
} else {
|
|
|
|
main_new_pos = get_main_demux_pts(mpctx);
|
|
|
|
}
|
|
|
|
demux_seek(track->demuxer, main_new_pos, SEEK_ABSOLUTE);
|
2013-10-29 21:38:29 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-07-30 21:01:55 +00:00
|
|
|
if (!timeline_fallthrough)
|
|
|
|
clear_audio_output_buffers(mpctx);
|
|
|
|
|
|
|
|
reset_playback_state(mpctx);
|
2013-10-29 21:38:29 +00:00
|
|
|
|
|
|
|
if (timeline_fallthrough) {
|
|
|
|
// Important if video reinit happens.
|
|
|
|
mpctx->vo_pts_history_seek_ts = prev_seek_ts;
|
|
|
|
} else {
|
|
|
|
mpctx->vo_pts_history_seek_ts++;
|
|
|
|
mpctx->backstep_active = false;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Use the target time as "current position" for further relative
|
|
|
|
* seeks etc until a new video frame has been decoded */
|
|
|
|
if (seek.type == MPSEEK_ABSOLUTE) {
|
|
|
|
mpctx->video_pts = seek.amount;
|
|
|
|
mpctx->last_seek_pts = seek.amount;
|
2014-07-30 21:01:55 +00:00
|
|
|
}
|
2013-10-29 21:38:29 +00:00
|
|
|
|
|
|
|
// The hr_seek==false case is for skipping frames with PTS before the
|
|
|
|
// current timeline chapter start. It's not really known where the demuxer
|
|
|
|
// level seek will end up, so the hrseek mechanism is abused to skip all
|
|
|
|
// frames before chapter start by setting hrseek_pts to the chapter start.
|
|
|
|
// It does nothing when the seek is inside of the current chapter, and
|
|
|
|
// seeking past the chapter is handled elsewhere.
|
|
|
|
if (hr_seek || mpctx->timeline) {
|
|
|
|
mpctx->hrseek_active = true;
|
2014-05-12 19:32:09 +00:00
|
|
|
mpctx->hrseek_framedrop = !hr_seek_very_exact;
|
2013-10-29 21:38:29 +00:00
|
|
|
mpctx->hrseek_pts = hr_seek ? seek.amount
|
|
|
|
: mpctx->timeline[mpctx->timeline_part].start;
|
|
|
|
}
|
|
|
|
|
|
|
|
mpctx->start_timestamp = mp_time_sec();
|
2014-07-21 17:31:25 +00:00
|
|
|
mpctx->sleeptime = 0;
|
2013-10-29 21:38:29 +00:00
|
|
|
|
2014-07-30 21:01:55 +00:00
|
|
|
mp_notify(mpctx, MPV_EVENT_SEEK, NULL);
|
2014-07-28 22:07:54 +00:00
|
|
|
mp_notify(mpctx, MPV_EVENT_TICK, NULL);
|
|
|
|
|
2013-10-29 21:38:29 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
player: handle seek delays differently
The code removed from handle_input_and_seek_coalesce() did two things:
1. If there's a queued seek, stop accepting non-seek commands, and delay
them to the next playloop iteration.
2. If a seek is executing (i.e. the seek was unqueued, and now it's
trying to decode and display the first video frame), stop accepting
seek commands (and in fact all commands that were queued after the
first seek command). This logic is disabled if seeking started longer
than 300ms ago. (To avoid starvation.)
I'm not sure why 1. would be needed. It's still possible that a command
immediately executed after a seek command sees a "seeking in progress"
state, because it affects queued seeks only, and not seeks in progress.
Drop this code, since it can easily lead to input starvation, and I'm
not aware of any disadvantages.
The logic in 2. is good to make seeking behave much better, as it
guarantees that the video display is updated frequently. Keep the core
idea, but implement it differently. Now this logic is applied to seeks
only. Commands after the seek can execute freely, and like with 1., I
don't see a reason why they couldn't. However, in some cases, seeks are
supposed to be executed instantly, so queue_seek() needs an additional
parameter to signal the need for immediate update.
One nice thing is that commands like sub_seek automatically profit from
the seek delay logic. On the other hand, hitting chapter seek multiple
times still does not update the video on chapter boundaries (as it
should be).
Note that the main goal of this commit is actually simplification of the
input processing logic and to allow all commands to be executed
immediately.
2014-02-07 21:29:50 +00:00
|
|
|
// This combines consecutive seek requests.
|
2013-10-29 21:38:29 +00:00
|
|
|
void queue_seek(struct MPContext *mpctx, enum seek_type type, double amount,
|
player: handle seek delays differently
The code removed from handle_input_and_seek_coalesce() did two things:
1. If there's a queued seek, stop accepting non-seek commands, and delay
them to the next playloop iteration.
2. If a seek is executing (i.e. the seek was unqueued, and now it's
trying to decode and display the first video frame), stop accepting
seek commands (and in fact all commands that were queued after the
first seek command). This logic is disabled if seeking started longer
than 300ms ago. (To avoid starvation.)
I'm not sure why 1. would be needed. It's still possible that a command
immediately executed after a seek command sees a "seeking in progress"
state, because it affects queued seeks only, and not seeks in progress.
Drop this code, since it can easily lead to input starvation, and I'm
not aware of any disadvantages.
The logic in 2. is good to make seeking behave much better, as it
guarantees that the video display is updated frequently. Keep the core
idea, but implement it differently. Now this logic is applied to seeks
only. Commands after the seek can execute freely, and like with 1., I
don't see a reason why they couldn't. However, in some cases, seeks are
supposed to be executed instantly, so queue_seek() needs an additional
parameter to signal the need for immediate update.
One nice thing is that commands like sub_seek automatically profit from
the seek delay logic. On the other hand, hitting chapter seek multiple
times still does not update the video on chapter boundaries (as it
should be).
Note that the main goal of this commit is actually simplification of the
input processing logic and to allow all commands to be executed
immediately.
2014-02-07 21:29:50 +00:00
|
|
|
int exact, bool immediate)
|
2013-10-29 21:38:29 +00:00
|
|
|
{
|
|
|
|
struct seek_params *seek = &mpctx->seek;
|
|
|
|
switch (type) {
|
|
|
|
case MPSEEK_RELATIVE:
|
player: handle seek delays differently
The code removed from handle_input_and_seek_coalesce() did two things:
1. If there's a queued seek, stop accepting non-seek commands, and delay
them to the next playloop iteration.
2. If a seek is executing (i.e. the seek was unqueued, and now it's
trying to decode and display the first video frame), stop accepting
seek commands (and in fact all commands that were queued after the
first seek command). This logic is disabled if seeking started longer
than 300ms ago. (To avoid starvation.)
I'm not sure why 1. would be needed. It's still possible that a command
immediately executed after a seek command sees a "seeking in progress"
state, because it affects queued seeks only, and not seeks in progress.
Drop this code, since it can easily lead to input starvation, and I'm
not aware of any disadvantages.
The logic in 2. is good to make seeking behave much better, as it
guarantees that the video display is updated frequently. Keep the core
idea, but implement it differently. Now this logic is applied to seeks
only. Commands after the seek can execute freely, and like with 1., I
don't see a reason why they couldn't. However, in some cases, seeks are
supposed to be executed instantly, so queue_seek() needs an additional
parameter to signal the need for immediate update.
One nice thing is that commands like sub_seek automatically profit from
the seek delay logic. On the other hand, hitting chapter seek multiple
times still does not update the video on chapter boundaries (as it
should be).
Note that the main goal of this commit is actually simplification of the
input processing logic and to allow all commands to be executed
immediately.
2014-02-07 21:29:50 +00:00
|
|
|
seek->immediate |= immediate;
|
2013-10-29 21:38:29 +00:00
|
|
|
if (seek->type == MPSEEK_FACTOR)
|
|
|
|
return; // Well... not common enough to bother doing better
|
|
|
|
seek->amount += amount;
|
|
|
|
seek->exact = MPMAX(seek->exact, exact);
|
|
|
|
if (seek->type == MPSEEK_NONE)
|
|
|
|
seek->exact = exact;
|
|
|
|
if (seek->type == MPSEEK_ABSOLUTE)
|
|
|
|
return;
|
|
|
|
if (seek->amount == 0) {
|
|
|
|
*seek = (struct seek_params){ 0 };
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
seek->type = MPSEEK_RELATIVE;
|
|
|
|
return;
|
|
|
|
case MPSEEK_ABSOLUTE:
|
|
|
|
case MPSEEK_FACTOR:
|
|
|
|
*seek = (struct seek_params) {
|
|
|
|
.type = type,
|
|
|
|
.amount = amount,
|
|
|
|
.exact = exact,
|
player: handle seek delays differently
The code removed from handle_input_and_seek_coalesce() did two things:
1. If there's a queued seek, stop accepting non-seek commands, and delay
them to the next playloop iteration.
2. If a seek is executing (i.e. the seek was unqueued, and now it's
trying to decode and display the first video frame), stop accepting
seek commands (and in fact all commands that were queued after the
first seek command). This logic is disabled if seeking started longer
than 300ms ago. (To avoid starvation.)
I'm not sure why 1. would be needed. It's still possible that a command
immediately executed after a seek command sees a "seeking in progress"
state, because it affects queued seeks only, and not seeks in progress.
Drop this code, since it can easily lead to input starvation, and I'm
not aware of any disadvantages.
The logic in 2. is good to make seeking behave much better, as it
guarantees that the video display is updated frequently. Keep the core
idea, but implement it differently. Now this logic is applied to seeks
only. Commands after the seek can execute freely, and like with 1., I
don't see a reason why they couldn't. However, in some cases, seeks are
supposed to be executed instantly, so queue_seek() needs an additional
parameter to signal the need for immediate update.
One nice thing is that commands like sub_seek automatically profit from
the seek delay logic. On the other hand, hitting chapter seek multiple
times still does not update the video on chapter boundaries (as it
should be).
Note that the main goal of this commit is actually simplification of the
input processing logic and to allow all commands to be executed
immediately.
2014-02-07 21:29:50 +00:00
|
|
|
.immediate = immediate,
|
2013-10-29 21:38:29 +00:00
|
|
|
};
|
|
|
|
return;
|
|
|
|
case MPSEEK_NONE:
|
|
|
|
*seek = (struct seek_params){ 0 };
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
abort();
|
|
|
|
}
|
|
|
|
|
|
|
|
void execute_queued_seek(struct MPContext *mpctx)
|
|
|
|
{
|
|
|
|
if (mpctx->seek.type) {
|
2014-07-29 17:59:56 +00:00
|
|
|
// Let explicitly imprecise seeks cancel precise seeks:
|
|
|
|
if (mpctx->hrseek_active && mpctx->seek.exact < 0)
|
|
|
|
mpctx->start_timestamp = -1e9;
|
player: handle seek delays differently
The code removed from handle_input_and_seek_coalesce() did two things:
1. If there's a queued seek, stop accepting non-seek commands, and delay
them to the next playloop iteration.
2. If a seek is executing (i.e. the seek was unqueued, and now it's
trying to decode and display the first video frame), stop accepting
seek commands (and in fact all commands that were queued after the
first seek command). This logic is disabled if seeking started longer
than 300ms ago. (To avoid starvation.)
I'm not sure why 1. would be needed. It's still possible that a command
immediately executed after a seek command sees a "seeking in progress"
state, because it affects queued seeks only, and not seeks in progress.
Drop this code, since it can easily lead to input starvation, and I'm
not aware of any disadvantages.
The logic in 2. is good to make seeking behave much better, as it
guarantees that the video display is updated frequently. Keep the core
idea, but implement it differently. Now this logic is applied to seeks
only. Commands after the seek can execute freely, and like with 1., I
don't see a reason why they couldn't. However, in some cases, seeks are
supposed to be executed instantly, so queue_seek() needs an additional
parameter to signal the need for immediate update.
One nice thing is that commands like sub_seek automatically profit from
the seek delay logic. On the other hand, hitting chapter seek multiple
times still does not update the video on chapter boundaries (as it
should be).
Note that the main goal of this commit is actually simplification of the
input processing logic and to allow all commands to be executed
immediately.
2014-02-07 21:29:50 +00:00
|
|
|
/* If the user seeks continuously (keeps arrow key down)
|
|
|
|
* try to finish showing a frame from one location before doing
|
|
|
|
* another seek (which could lead to unchanging display). */
|
2014-07-28 20:13:42 +00:00
|
|
|
if (!mpctx->seek.immediate && mpctx->video_status < STATUS_READY &&
|
player: handle seek delays differently
The code removed from handle_input_and_seek_coalesce() did two things:
1. If there's a queued seek, stop accepting non-seek commands, and delay
them to the next playloop iteration.
2. If a seek is executing (i.e. the seek was unqueued, and now it's
trying to decode and display the first video frame), stop accepting
seek commands (and in fact all commands that were queued after the
first seek command). This logic is disabled if seeking started longer
than 300ms ago. (To avoid starvation.)
I'm not sure why 1. would be needed. It's still possible that a command
immediately executed after a seek command sees a "seeking in progress"
state, because it affects queued seeks only, and not seeks in progress.
Drop this code, since it can easily lead to input starvation, and I'm
not aware of any disadvantages.
The logic in 2. is good to make seeking behave much better, as it
guarantees that the video display is updated frequently. Keep the core
idea, but implement it differently. Now this logic is applied to seeks
only. Commands after the seek can execute freely, and like with 1., I
don't see a reason why they couldn't. However, in some cases, seeks are
supposed to be executed instantly, so queue_seek() needs an additional
parameter to signal the need for immediate update.
One nice thing is that commands like sub_seek automatically profit from
the seek delay logic. On the other hand, hitting chapter seek multiple
times still does not update the video on chapter boundaries (as it
should be).
Note that the main goal of this commit is actually simplification of the
input processing logic and to allow all commands to be executed
immediately.
2014-02-07 21:29:50 +00:00
|
|
|
mp_time_sec() - mpctx->start_timestamp < 0.3)
|
|
|
|
return;
|
2013-11-03 22:28:13 +00:00
|
|
|
mp_seek(mpctx, mpctx->seek, false);
|
2013-10-29 21:38:29 +00:00
|
|
|
mpctx->seek = (struct seek_params){0};
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
double get_time_length(struct MPContext *mpctx)
|
|
|
|
{
|
|
|
|
struct demuxer *demuxer = mpctx->demuxer;
|
|
|
|
if (!demuxer)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
if (mpctx->timeline)
|
|
|
|
return mpctx->timeline[mpctx->num_timeline_parts].start;
|
|
|
|
|
|
|
|
double len = demuxer_get_time_length(demuxer);
|
|
|
|
if (len >= 0)
|
|
|
|
return len;
|
|
|
|
|
|
|
|
// Unknown
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* If there are timestamps from stream level then use those (for example
|
|
|
|
* DVDs can have consistent times there while the MPEG-level timestamps
|
|
|
|
* reset). */
|
|
|
|
double get_current_time(struct MPContext *mpctx)
|
|
|
|
{
|
|
|
|
struct demuxer *demuxer = mpctx->demuxer;
|
|
|
|
if (!demuxer)
|
|
|
|
return 0;
|
|
|
|
if (mpctx->playback_pts != MP_NOPTS_VALUE)
|
|
|
|
return mpctx->playback_pts;
|
|
|
|
if (mpctx->last_seek_pts != MP_NOPTS_VALUE)
|
|
|
|
return mpctx->last_seek_pts;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2014-06-29 17:27:46 +00:00
|
|
|
double get_playback_time(struct MPContext *mpctx)
|
|
|
|
{
|
|
|
|
double cur = get_current_time(mpctx);
|
|
|
|
double start = get_start_time(mpctx);
|
|
|
|
return cur >= start ? cur - start : cur;
|
|
|
|
}
|
|
|
|
|
2013-10-29 21:38:29 +00:00
|
|
|
// Return playback position in 0.0-1.0 ratio, or -1 if unknown.
|
|
|
|
double get_current_pos_ratio(struct MPContext *mpctx, bool use_range)
|
|
|
|
{
|
|
|
|
struct demuxer *demuxer = mpctx->demuxer;
|
|
|
|
if (!demuxer)
|
|
|
|
return -1;
|
|
|
|
double ans = -1;
|
|
|
|
double start = get_start_time(mpctx);
|
|
|
|
double len = get_time_length(mpctx);
|
|
|
|
if (use_range) {
|
2014-03-25 01:32:24 +00:00
|
|
|
double startpos = rel_time_to_abs(mpctx, mpctx->opts->play_start);
|
2013-10-29 21:38:29 +00:00
|
|
|
double endpos = get_play_end_pts(mpctx);
|
|
|
|
if (endpos == MP_NOPTS_VALUE || endpos > start + len)
|
|
|
|
endpos = start + len;
|
|
|
|
if (startpos == MP_NOPTS_VALUE || startpos < start)
|
|
|
|
startpos = start;
|
|
|
|
if (endpos < startpos)
|
|
|
|
endpos = startpos;
|
|
|
|
start = startpos;
|
|
|
|
len = endpos - startpos;
|
|
|
|
}
|
|
|
|
double pos = get_current_time(mpctx);
|
|
|
|
if (len > 0 && !demuxer->ts_resets_possible) {
|
|
|
|
ans = MPCLAMP((pos - start) / len, 0, 1);
|
|
|
|
} else {
|
2014-05-24 12:04:09 +00:00
|
|
|
int64_t size;
|
2014-07-16 20:40:21 +00:00
|
|
|
if (demux_stream_control(demuxer, STREAM_CTRL_GET_SIZE, &size) > 0) {
|
|
|
|
if (size > 0 && demuxer->filepos >= 0)
|
2014-07-05 15:00:48 +00:00
|
|
|
ans = MPCLAMP(demuxer->filepos / (double)size, 0, 1);
|
2014-05-24 12:04:09 +00:00
|
|
|
}
|
2013-10-29 21:38:29 +00:00
|
|
|
}
|
|
|
|
if (use_range) {
|
|
|
|
if (mpctx->opts->play_frames > 0)
|
|
|
|
ans = MPMAX(ans, 1.0 -
|
|
|
|
mpctx->max_frames / (double) mpctx->opts->play_frames);
|
|
|
|
}
|
|
|
|
return ans;
|
|
|
|
}
|
|
|
|
|
|
|
|
int get_percent_pos(struct MPContext *mpctx)
|
|
|
|
{
|
|
|
|
int pos = get_current_pos_ratio(mpctx, false) * 100;
|
|
|
|
return MPCLAMP(pos, 0, 100);
|
|
|
|
}
|
|
|
|
|
|
|
|
// -2 is no chapters, -1 is before first chapter
|
|
|
|
int get_current_chapter(struct MPContext *mpctx)
|
|
|
|
{
|
2014-03-25 01:10:24 +00:00
|
|
|
if (!mpctx->num_chapters)
|
|
|
|
return -2;
|
2013-10-29 21:38:29 +00:00
|
|
|
double current_pts = get_current_time(mpctx);
|
2014-03-25 01:10:24 +00:00
|
|
|
int i;
|
2014-07-31 20:54:57 +00:00
|
|
|
for (i = 0; i < mpctx->num_chapters; i++)
|
2014-03-25 01:10:24 +00:00
|
|
|
if (current_pts < mpctx->chapters[i].start)
|
|
|
|
break;
|
|
|
|
return MPMAX(mpctx->last_chapter_seek, i - 1);
|
2013-10-29 21:38:29 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
char *chapter_display_name(struct MPContext *mpctx, int chapter)
|
|
|
|
{
|
|
|
|
char *name = chapter_name(mpctx, chapter);
|
|
|
|
char *dname = name;
|
|
|
|
if (name) {
|
|
|
|
dname = talloc_asprintf(NULL, "(%d) %s", chapter + 1, name);
|
|
|
|
} else if (chapter < -1) {
|
|
|
|
dname = talloc_strdup(NULL, "(unavailable)");
|
|
|
|
} else {
|
|
|
|
int chapter_count = get_chapter_count(mpctx);
|
|
|
|
if (chapter_count <= 0)
|
|
|
|
dname = talloc_asprintf(NULL, "(%d)", chapter + 1);
|
|
|
|
else
|
|
|
|
dname = talloc_asprintf(NULL, "(%d) of %d", chapter + 1,
|
|
|
|
chapter_count);
|
|
|
|
}
|
|
|
|
if (dname != name)
|
|
|
|
talloc_free(name);
|
|
|
|
return dname;
|
|
|
|
}
|
|
|
|
|
|
|
|
// returns NULL if chapter name unavailable
|
|
|
|
char *chapter_name(struct MPContext *mpctx, int chapter)
|
|
|
|
{
|
2014-03-25 01:10:24 +00:00
|
|
|
if (chapter < 0 || chapter >= mpctx->num_chapters)
|
|
|
|
return NULL;
|
|
|
|
return talloc_strdup(NULL, mpctx->chapters[chapter].name);
|
2013-10-29 21:38:29 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// returns the start of the chapter in seconds (-1 if unavailable)
|
|
|
|
double chapter_start_time(struct MPContext *mpctx, int chapter)
|
|
|
|
{
|
|
|
|
if (chapter == -1)
|
|
|
|
return get_start_time(mpctx);
|
2014-03-25 01:10:24 +00:00
|
|
|
if (chapter >= 0 && chapter < mpctx->num_chapters)
|
2013-10-29 21:38:29 +00:00
|
|
|
return mpctx->chapters[chapter].start;
|
2014-03-25 01:18:12 +00:00
|
|
|
return MP_NOPTS_VALUE;
|
2013-10-29 21:38:29 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
int get_chapter_count(struct MPContext *mpctx)
|
|
|
|
{
|
2014-03-25 01:05:48 +00:00
|
|
|
return mpctx->num_chapters;
|
2013-10-29 21:38:29 +00:00
|
|
|
}
|
|
|
|
|
2014-03-25 00:38:18 +00:00
|
|
|
// Seek to a given chapter. Queues the seek.
|
2013-10-29 21:38:29 +00:00
|
|
|
bool mp_seek_chapter(struct MPContext *mpctx, int chapter)
|
|
|
|
{
|
|
|
|
int num = get_chapter_count(mpctx);
|
|
|
|
if (num == 0)
|
|
|
|
return false;
|
|
|
|
if (chapter < -1 || chapter >= num)
|
|
|
|
return false;
|
|
|
|
|
|
|
|
mpctx->last_chapter_seek = -2;
|
|
|
|
|
2014-03-25 01:05:48 +00:00
|
|
|
double pts = chapter_start_time(mpctx, chapter);
|
2014-03-25 01:18:12 +00:00
|
|
|
if (pts == MP_NOPTS_VALUE)
|
2014-03-25 01:05:48 +00:00
|
|
|
return false;
|
2013-10-29 21:38:29 +00:00
|
|
|
|
player: handle seek delays differently
The code removed from handle_input_and_seek_coalesce() did two things:
1. If there's a queued seek, stop accepting non-seek commands, and delay
them to the next playloop iteration.
2. If a seek is executing (i.e. the seek was unqueued, and now it's
trying to decode and display the first video frame), stop accepting
seek commands (and in fact all commands that were queued after the
first seek command). This logic is disabled if seeking started longer
than 300ms ago. (To avoid starvation.)
I'm not sure why 1. would be needed. It's still possible that a command
immediately executed after a seek command sees a "seeking in progress"
state, because it affects queued seeks only, and not seeks in progress.
Drop this code, since it can easily lead to input starvation, and I'm
not aware of any disadvantages.
The logic in 2. is good to make seeking behave much better, as it
guarantees that the video display is updated frequently. Keep the core
idea, but implement it differently. Now this logic is applied to seeks
only. Commands after the seek can execute freely, and like with 1., I
don't see a reason why they couldn't. However, in some cases, seeks are
supposed to be executed instantly, so queue_seek() needs an additional
parameter to signal the need for immediate update.
One nice thing is that commands like sub_seek automatically profit from
the seek delay logic. On the other hand, hitting chapter seek multiple
times still does not update the video on chapter boundaries (as it
should be).
Note that the main goal of this commit is actually simplification of the
input processing logic and to allow all commands to be executed
immediately.
2014-02-07 21:29:50 +00:00
|
|
|
queue_seek(mpctx, MPSEEK_ABSOLUTE, pts, 0, true);
|
2013-10-29 21:38:29 +00:00
|
|
|
mpctx->last_chapter_seek = chapter;
|
|
|
|
mpctx->last_chapter_pts = pts;
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2014-08-03 17:09:22 +00:00
|
|
|
static void handle_osd_redraw(struct MPContext *mpctx)
|
2013-10-29 21:38:29 +00:00
|
|
|
{
|
|
|
|
if (!mpctx->video_out || !mpctx->video_out->config_ok)
|
2014-08-03 17:09:22 +00:00
|
|
|
return;
|
|
|
|
// If we're playing normally, let OSD be redrawn naturally as part of
|
|
|
|
// video display.
|
2014-08-10 11:11:46 +00:00
|
|
|
if (!mpctx->paused) {
|
|
|
|
if (mpctx->sleeptime < 0.1 && mpctx->video_status == STATUS_PLAYING)
|
|
|
|
return;
|
|
|
|
}
|
2014-08-03 17:09:22 +00:00
|
|
|
// Don't redraw immediately during a seek (makes it significantly slower).
|
|
|
|
if (mp_time_sec() - mpctx->start_timestamp < 0.1)
|
|
|
|
return;
|
2014-01-18 00:19:20 +00:00
|
|
|
bool want_redraw = vo_get_want_redraw(mpctx->video_out) |
|
2014-06-15 18:46:57 +00:00
|
|
|
osd_query_and_reset_want_redraw(mpctx->osd);
|
|
|
|
if (!want_redraw)
|
2014-08-03 17:09:22 +00:00
|
|
|
return;
|
2014-06-15 18:46:57 +00:00
|
|
|
vo_redraw(mpctx->video_out);
|
2014-08-03 17:09:22 +00:00
|
|
|
mpctx->sleeptime = 0;
|
2013-10-29 21:38:29 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void handle_pause_on_low_cache(struct MPContext *mpctx)
|
|
|
|
{
|
|
|
|
struct MPOpts *opts = mpctx->opts;
|
2014-07-16 20:40:21 +00:00
|
|
|
if (!mpctx->demuxer)
|
2014-05-19 21:27:09 +00:00
|
|
|
return;
|
|
|
|
int64_t fill = -1;
|
2014-07-16 20:40:21 +00:00
|
|
|
demux_stream_control(mpctx->demuxer, STREAM_CTRL_GET_CACHE_FILL, &fill);
|
2014-05-19 21:27:09 +00:00
|
|
|
int cache_kb = fill > 0 ? (fill + 1023) / 1024 : -1;
|
2013-10-29 21:38:29 +00:00
|
|
|
bool idle = mp_get_cache_idle(mpctx);
|
|
|
|
if (mpctx->paused && mpctx->paused_for_cache) {
|
2014-05-19 21:27:09 +00:00
|
|
|
if (cache_kb < 0 || cache_kb >= opts->stream_cache_unpause || idle) {
|
2013-10-29 21:38:29 +00:00
|
|
|
mpctx->paused_for_cache = false;
|
|
|
|
if (!opts->pause)
|
2014-04-14 20:33:41 +00:00
|
|
|
unpause_player(mpctx);
|
2013-10-29 21:38:29 +00:00
|
|
|
}
|
2014-07-19 22:16:37 +00:00
|
|
|
mpctx->sleeptime = MPMIN(mpctx->sleeptime, 0.2);
|
2013-10-29 21:38:29 +00:00
|
|
|
} else {
|
2014-05-19 21:27:09 +00:00
|
|
|
if (cache_kb >= 0 && cache_kb <= opts->stream_cache_pause && !idle &&
|
|
|
|
opts->stream_cache_pause < opts->stream_cache_unpause)
|
2013-11-25 22:24:50 +00:00
|
|
|
{
|
2013-10-29 21:38:29 +00:00
|
|
|
bool prev_paused_user = opts->pause;
|
2014-04-14 20:33:41 +00:00
|
|
|
pause_player(mpctx);
|
2013-10-29 21:38:29 +00:00
|
|
|
mpctx->paused_for_cache = true;
|
|
|
|
opts->pause = prev_paused_user;
|
|
|
|
}
|
|
|
|
}
|
2014-07-31 02:19:41 +00:00
|
|
|
// Also update cache properties.
|
|
|
|
if (cache_kb > 0 || mpctx->next_cache_update > 0) {
|
|
|
|
double now = mp_time_sec();
|
|
|
|
if (mpctx->next_cache_update <= now) {
|
|
|
|
mpctx->next_cache_update = cache_kb > 0 ? now + 0.25 : 0;
|
|
|
|
mp_notify(mpctx, MP_EVENT_CACHE_UPDATE, NULL);
|
|
|
|
}
|
|
|
|
if (mpctx->next_cache_update > 0) {
|
|
|
|
mpctx->sleeptime =
|
|
|
|
MPMIN(mpctx->sleeptime, mpctx->next_cache_update - now);
|
|
|
|
}
|
|
|
|
}
|
2013-10-29 21:38:29 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void handle_heartbeat_cmd(struct MPContext *mpctx)
|
|
|
|
{
|
|
|
|
struct MPOpts *opts = mpctx->opts;
|
2014-07-30 21:24:08 +00:00
|
|
|
if (opts->heartbeat_cmd && !mpctx->paused && mpctx->video_out) {
|
2013-10-29 21:38:29 +00:00
|
|
|
double now = mp_time_sec();
|
2014-07-18 13:04:46 +00:00
|
|
|
if (mpctx->next_heartbeat <= now) {
|
|
|
|
mpctx->next_heartbeat = now + opts->heartbeat_interval;
|
2013-10-29 21:38:29 +00:00
|
|
|
system(opts->heartbeat_cmd);
|
|
|
|
}
|
2014-07-18 13:04:46 +00:00
|
|
|
mpctx->sleeptime = MPMIN(mpctx->sleeptime, mpctx->next_heartbeat - now);
|
2013-10-29 21:38:29 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void handle_cursor_autohide(struct MPContext *mpctx)
|
|
|
|
{
|
|
|
|
struct MPOpts *opts = mpctx->opts;
|
|
|
|
struct vo *vo = mpctx->video_out;
|
|
|
|
|
|
|
|
if (!vo)
|
|
|
|
return;
|
|
|
|
|
|
|
|
bool mouse_cursor_visible = mpctx->mouse_cursor_visible;
|
2014-07-18 13:04:46 +00:00
|
|
|
double now = mp_time_sec();
|
2013-10-29 21:38:29 +00:00
|
|
|
|
|
|
|
unsigned mouse_event_ts = mp_input_get_mouse_event_counter(mpctx->input);
|
|
|
|
if (mpctx->mouse_event_ts != mouse_event_ts) {
|
|
|
|
mpctx->mouse_event_ts = mouse_event_ts;
|
2014-07-18 13:04:46 +00:00
|
|
|
mpctx->mouse_timer = now + opts->cursor_autohide_delay / 1000.0;
|
2013-10-29 21:38:29 +00:00
|
|
|
mouse_cursor_visible = true;
|
|
|
|
}
|
|
|
|
|
2014-07-18 13:04:46 +00:00
|
|
|
if (mpctx->mouse_timer > now) {
|
|
|
|
mpctx->sleeptime = MPMIN(mpctx->sleeptime, mpctx->mouse_timer - now);
|
|
|
|
} else {
|
2013-10-29 21:38:29 +00:00
|
|
|
mouse_cursor_visible = false;
|
2014-07-18 13:04:46 +00:00
|
|
|
}
|
2013-10-29 21:38:29 +00:00
|
|
|
|
|
|
|
if (opts->cursor_autohide_delay == -1)
|
|
|
|
mouse_cursor_visible = true;
|
|
|
|
|
|
|
|
if (opts->cursor_autohide_delay == -2)
|
|
|
|
mouse_cursor_visible = false;
|
|
|
|
|
|
|
|
if (opts->cursor_autohide_fs && !opts->vo.fullscreen)
|
|
|
|
mouse_cursor_visible = true;
|
|
|
|
|
|
|
|
if (mouse_cursor_visible != mpctx->mouse_cursor_visible)
|
|
|
|
vo_control(vo, VOCTRL_SET_CURSOR_VISIBILITY, &mouse_cursor_visible);
|
|
|
|
mpctx->mouse_cursor_visible = mouse_cursor_visible;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void handle_input_and_seek_coalesce(struct MPContext *mpctx)
|
|
|
|
{
|
|
|
|
mp_cmd_t *cmd;
|
|
|
|
while ((cmd = mp_input_get_cmd(mpctx->input, 0, 1)) != NULL) {
|
2014-02-10 20:01:35 +00:00
|
|
|
mp_dispatch_queue_process(mpctx->dispatch, 0);
|
2013-10-29 21:38:29 +00:00
|
|
|
cmd = mp_input_get_cmd(mpctx->input, 0, 0);
|
|
|
|
run_command(mpctx, cmd);
|
|
|
|
mp_cmd_free(cmd);
|
|
|
|
if (mpctx->stop_play)
|
|
|
|
break;
|
|
|
|
}
|
2014-02-10 20:01:35 +00:00
|
|
|
mp_dispatch_queue_process(mpctx->dispatch, 0);
|
2013-10-29 21:38:29 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void add_frame_pts(struct MPContext *mpctx, double pts)
|
|
|
|
{
|
|
|
|
if (pts == MP_NOPTS_VALUE || mpctx->hrseek_framedrop) {
|
|
|
|
mpctx->vo_pts_history_seek_ts++; // mark discontinuity
|
|
|
|
return;
|
|
|
|
}
|
2014-05-07 19:50:16 +00:00
|
|
|
if (mpctx->vo_pts_history_pts[0] == pts) // may be called multiple times
|
|
|
|
return;
|
2013-10-29 21:38:29 +00:00
|
|
|
for (int n = MAX_NUM_VO_PTS - 1; n >= 1; n--) {
|
|
|
|
mpctx->vo_pts_history_seek[n] = mpctx->vo_pts_history_seek[n - 1];
|
|
|
|
mpctx->vo_pts_history_pts[n] = mpctx->vo_pts_history_pts[n - 1];
|
|
|
|
}
|
|
|
|
mpctx->vo_pts_history_seek[0] = mpctx->vo_pts_history_seek_ts;
|
|
|
|
mpctx->vo_pts_history_pts[0] = pts;
|
|
|
|
}
|
|
|
|
|
|
|
|
static double find_previous_pts(struct MPContext *mpctx, double pts)
|
|
|
|
{
|
|
|
|
for (int n = 0; n < MAX_NUM_VO_PTS - 1; n++) {
|
|
|
|
if (pts == mpctx->vo_pts_history_pts[n] &&
|
|
|
|
mpctx->vo_pts_history_seek[n] != 0 &&
|
|
|
|
mpctx->vo_pts_history_seek[n] == mpctx->vo_pts_history_seek[n + 1])
|
|
|
|
{
|
|
|
|
return mpctx->vo_pts_history_pts[n + 1];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return MP_NOPTS_VALUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
static double get_last_frame_pts(struct MPContext *mpctx)
|
|
|
|
{
|
|
|
|
if (mpctx->vo_pts_history_seek[0] == mpctx->vo_pts_history_seek_ts)
|
|
|
|
return mpctx->vo_pts_history_pts[0];
|
|
|
|
return MP_NOPTS_VALUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void handle_backstep(struct MPContext *mpctx)
|
|
|
|
{
|
|
|
|
if (!mpctx->backstep_active)
|
|
|
|
return;
|
|
|
|
|
|
|
|
double current_pts = mpctx->last_vo_pts;
|
|
|
|
mpctx->backstep_active = false;
|
2014-07-07 22:30:01 +00:00
|
|
|
if (mpctx->d_video && current_pts != MP_NOPTS_VALUE) {
|
2013-10-29 21:38:29 +00:00
|
|
|
double seek_pts = find_previous_pts(mpctx, current_pts);
|
|
|
|
if (seek_pts != MP_NOPTS_VALUE) {
|
player: handle seek delays differently
The code removed from handle_input_and_seek_coalesce() did two things:
1. If there's a queued seek, stop accepting non-seek commands, and delay
them to the next playloop iteration.
2. If a seek is executing (i.e. the seek was unqueued, and now it's
trying to decode and display the first video frame), stop accepting
seek commands (and in fact all commands that were queued after the
first seek command). This logic is disabled if seeking started longer
than 300ms ago. (To avoid starvation.)
I'm not sure why 1. would be needed. It's still possible that a command
immediately executed after a seek command sees a "seeking in progress"
state, because it affects queued seeks only, and not seeks in progress.
Drop this code, since it can easily lead to input starvation, and I'm
not aware of any disadvantages.
The logic in 2. is good to make seeking behave much better, as it
guarantees that the video display is updated frequently. Keep the core
idea, but implement it differently. Now this logic is applied to seeks
only. Commands after the seek can execute freely, and like with 1., I
don't see a reason why they couldn't. However, in some cases, seeks are
supposed to be executed instantly, so queue_seek() needs an additional
parameter to signal the need for immediate update.
One nice thing is that commands like sub_seek automatically profit from
the seek delay logic. On the other hand, hitting chapter seek multiple
times still does not update the video on chapter boundaries (as it
should be).
Note that the main goal of this commit is actually simplification of the
input processing logic and to allow all commands to be executed
immediately.
2014-02-07 21:29:50 +00:00
|
|
|
queue_seek(mpctx, MPSEEK_ABSOLUTE, seek_pts, 2, true);
|
2013-10-29 21:38:29 +00:00
|
|
|
} else {
|
|
|
|
double last = get_last_frame_pts(mpctx);
|
|
|
|
if (last != MP_NOPTS_VALUE && last >= current_pts &&
|
|
|
|
mpctx->backstep_start_seek_ts != mpctx->vo_pts_history_seek_ts)
|
|
|
|
{
|
|
|
|
MP_ERR(mpctx, "Backstep failed.\n");
|
player: handle seek delays differently
The code removed from handle_input_and_seek_coalesce() did two things:
1. If there's a queued seek, stop accepting non-seek commands, and delay
them to the next playloop iteration.
2. If a seek is executing (i.e. the seek was unqueued, and now it's
trying to decode and display the first video frame), stop accepting
seek commands (and in fact all commands that were queued after the
first seek command). This logic is disabled if seeking started longer
than 300ms ago. (To avoid starvation.)
I'm not sure why 1. would be needed. It's still possible that a command
immediately executed after a seek command sees a "seeking in progress"
state, because it affects queued seeks only, and not seeks in progress.
Drop this code, since it can easily lead to input starvation, and I'm
not aware of any disadvantages.
The logic in 2. is good to make seeking behave much better, as it
guarantees that the video display is updated frequently. Keep the core
idea, but implement it differently. Now this logic is applied to seeks
only. Commands after the seek can execute freely, and like with 1., I
don't see a reason why they couldn't. However, in some cases, seeks are
supposed to be executed instantly, so queue_seek() needs an additional
parameter to signal the need for immediate update.
One nice thing is that commands like sub_seek automatically profit from
the seek delay logic. On the other hand, hitting chapter seek multiple
times still does not update the video on chapter boundaries (as it
should be).
Note that the main goal of this commit is actually simplification of the
input processing logic and to allow all commands to be executed
immediately.
2014-02-07 21:29:50 +00:00
|
|
|
queue_seek(mpctx, MPSEEK_ABSOLUTE, current_pts, 2, true);
|
2013-10-29 21:38:29 +00:00
|
|
|
} else if (!mpctx->hrseek_active) {
|
|
|
|
MP_VERBOSE(mpctx, "Start backstep indexing.\n");
|
|
|
|
// Force it to index the video up until current_pts.
|
|
|
|
// The whole point is getting frames _before_ that PTS,
|
|
|
|
// so apply an arbitrary offset. (In theory the offset
|
|
|
|
// has to be large enough to reach the previous frame.)
|
2013-11-03 22:28:13 +00:00
|
|
|
mp_seek(mpctx, (struct seek_params){
|
|
|
|
.type = MPSEEK_ABSOLUTE,
|
|
|
|
.amount = current_pts - 1.0,
|
|
|
|
}, false);
|
2013-10-29 21:38:29 +00:00
|
|
|
// Don't leave hr-seek mode. If all goes right, hr-seek
|
|
|
|
// mode is cancelled as soon as the frame before
|
|
|
|
// current_pts is found during hr-seeking.
|
|
|
|
// Note that current_pts should be part of the index,
|
|
|
|
// otherwise we can't find the previous frame, so set the
|
|
|
|
// seek target an arbitrary amount of time after it.
|
|
|
|
if (mpctx->hrseek_active) {
|
|
|
|
mpctx->hrseek_pts = current_pts + 10.0;
|
|
|
|
mpctx->hrseek_framedrop = false;
|
|
|
|
mpctx->backstep_active = true;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
mpctx->backstep_active = true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void handle_sstep(struct MPContext *mpctx)
|
|
|
|
{
|
|
|
|
struct MPOpts *opts = mpctx->opts;
|
2014-08-03 18:25:03 +00:00
|
|
|
if (mpctx->stop_play || !mpctx->restart_complete)
|
|
|
|
return;
|
|
|
|
|
|
|
|
if (opts->step_sec > 0 && !mpctx->paused) {
|
2013-10-29 21:38:29 +00:00
|
|
|
set_osd_function(mpctx, OSD_FFW);
|
player: handle seek delays differently
The code removed from handle_input_and_seek_coalesce() did two things:
1. If there's a queued seek, stop accepting non-seek commands, and delay
them to the next playloop iteration.
2. If a seek is executing (i.e. the seek was unqueued, and now it's
trying to decode and display the first video frame), stop accepting
seek commands (and in fact all commands that were queued after the
first seek command). This logic is disabled if seeking started longer
than 300ms ago. (To avoid starvation.)
I'm not sure why 1. would be needed. It's still possible that a command
immediately executed after a seek command sees a "seeking in progress"
state, because it affects queued seeks only, and not seeks in progress.
Drop this code, since it can easily lead to input starvation, and I'm
not aware of any disadvantages.
The logic in 2. is good to make seeking behave much better, as it
guarantees that the video display is updated frequently. Keep the core
idea, but implement it differently. Now this logic is applied to seeks
only. Commands after the seek can execute freely, and like with 1., I
don't see a reason why they couldn't. However, in some cases, seeks are
supposed to be executed instantly, so queue_seek() needs an additional
parameter to signal the need for immediate update.
One nice thing is that commands like sub_seek automatically profit from
the seek delay logic. On the other hand, hitting chapter seek multiple
times still does not update the video on chapter boundaries (as it
should be).
Note that the main goal of this commit is actually simplification of the
input processing logic and to allow all commands to be executed
immediately.
2014-02-07 21:29:50 +00:00
|
|
|
queue_seek(mpctx, MPSEEK_RELATIVE, opts->step_sec, 0, true);
|
2013-10-29 21:38:29 +00:00
|
|
|
}
|
2014-08-03 18:25:03 +00:00
|
|
|
|
|
|
|
if (mpctx->video_status >= STATUS_DRAINING) {
|
|
|
|
if (mpctx->max_frames >= 0)
|
|
|
|
mpctx->stop_play = PT_NEXT_ENTRY;
|
|
|
|
if (mpctx->step_frames > 0 && !mpctx->paused)
|
|
|
|
pause_player(mpctx);
|
|
|
|
}
|
2013-10-29 21:38:29 +00:00
|
|
|
}
|
|
|
|
|
2014-04-17 21:55:04 +00:00
|
|
|
static void handle_loop_file(struct MPContext *mpctx)
|
|
|
|
{
|
|
|
|
struct MPOpts *opts = mpctx->opts;
|
|
|
|
if (opts->loop_file && mpctx->stop_play == AT_END_OF_FILE) {
|
|
|
|
set_osd_function(mpctx, OSD_FFW);
|
|
|
|
queue_seek(mpctx, MPSEEK_ABSOLUTE, get_start_time(mpctx), 0, true);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-10-29 21:38:29 +00:00
|
|
|
static void handle_keep_open(struct MPContext *mpctx)
|
|
|
|
{
|
|
|
|
struct MPOpts *opts = mpctx->opts;
|
|
|
|
if (opts->keep_open && mpctx->stop_play == AT_END_OF_FILE) {
|
|
|
|
mpctx->stop_play = KEEP_PLAYING;
|
|
|
|
mpctx->playback_pts = mpctx->last_vo_pts;
|
2014-07-29 22:22:25 +00:00
|
|
|
if (!mpctx->opts->pause)
|
|
|
|
pause_player(mpctx);
|
2013-10-29 21:38:29 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-04-27 20:28:07 +00:00
|
|
|
static void handle_chapter_change(struct MPContext *mpctx)
|
|
|
|
{
|
|
|
|
int chapter = get_current_chapter(mpctx);
|
|
|
|
if (chapter != mpctx->last_chapter) {
|
|
|
|
mpctx->last_chapter = chapter;
|
|
|
|
mp_notify(mpctx, MPV_EVENT_CHAPTER_CHANGE, NULL);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-10-29 21:38:29 +00:00
|
|
|
// Execute a forceful refresh of the VO window, if it hasn't had a valid frame
|
|
|
|
// for a while. The problem is that a VO with no valid frame (vo->hasframe==0)
|
|
|
|
// doesn't redraw video and doesn't OSD interaction. So screw it, hard.
|
|
|
|
void handle_force_window(struct MPContext *mpctx, bool reconfig)
|
|
|
|
{
|
|
|
|
// Don't interfere with real video playback
|
2013-11-23 20:36:20 +00:00
|
|
|
if (mpctx->d_video)
|
2013-10-29 21:38:29 +00:00
|
|
|
return;
|
|
|
|
|
|
|
|
struct vo *vo = mpctx->video_out;
|
|
|
|
if (!vo)
|
|
|
|
return;
|
|
|
|
|
|
|
|
if (!vo->config_ok || reconfig) {
|
|
|
|
MP_INFO(mpctx, "Creating non-video VO window.\n");
|
|
|
|
// Pick whatever works
|
|
|
|
int config_format = 0;
|
|
|
|
for (int fmt = IMGFMT_START; fmt < IMGFMT_END; fmt++) {
|
|
|
|
if (vo->driver->query_format(vo, fmt)) {
|
|
|
|
config_format = fmt;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
int w = 960;
|
|
|
|
int h = 480;
|
|
|
|
struct mp_image_params p = {
|
|
|
|
.imgfmt = config_format,
|
|
|
|
.w = w, .h = h,
|
|
|
|
.d_w = w, .d_h = h,
|
|
|
|
};
|
|
|
|
vo_reconfig(vo, &p, 0);
|
2014-06-15 18:46:57 +00:00
|
|
|
vo_redraw(vo);
|
2014-02-17 01:52:26 +00:00
|
|
|
mp_notify(mpctx, MPV_EVENT_VIDEO_RECONFIG, NULL);
|
2013-10-29 21:38:29 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-08-03 18:25:03 +00:00
|
|
|
// Potentially needed by some Lua scripts, which assume TICK always comes.
|
|
|
|
static void handle_dummy_ticks(struct MPContext *mpctx)
|
|
|
|
{
|
|
|
|
if (mpctx->video_status == STATUS_EOF || mpctx->paused) {
|
|
|
|
if (mp_time_sec() - mpctx->last_idle_tick > 0.5) {
|
|
|
|
mpctx->last_idle_tick = mp_time_sec();
|
|
|
|
mp_notify(mpctx, MPV_EVENT_TICK, NULL);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-10-29 21:38:29 +00:00
|
|
|
static double get_wakeup_period(struct MPContext *mpctx)
|
|
|
|
{
|
2014-07-18 13:04:46 +00:00
|
|
|
double sleeptime = 100.0; // infinite for all practical purposes
|
2013-10-29 21:38:29 +00:00
|
|
|
|
2014-01-08 18:13:41 +00:00
|
|
|
#if !HAVE_POSIX_SELECT
|
2013-10-29 21:38:29 +00:00
|
|
|
// No proper file descriptor event handling; keep waking up to poll input
|
|
|
|
sleeptime = MPMIN(sleeptime, 0.02);
|
|
|
|
#endif
|
|
|
|
|
|
|
|
if (mpctx->video_out)
|
|
|
|
if (mpctx->video_out->wakeup_period > 0)
|
|
|
|
sleeptime = MPMIN(sleeptime, mpctx->video_out->wakeup_period);
|
|
|
|
|
|
|
|
return sleeptime;
|
|
|
|
}
|
|
|
|
|
|
|
|
void run_playloop(struct MPContext *mpctx)
|
|
|
|
{
|
|
|
|
struct MPOpts *opts = mpctx->opts;
|
|
|
|
double endpts = get_play_end_pts(mpctx);
|
2014-07-30 21:26:17 +00:00
|
|
|
bool end_is_new_segment = false;
|
2013-10-29 21:38:29 +00:00
|
|
|
|
2013-07-16 11:28:28 +00:00
|
|
|
#if HAVE_ENCODING
|
2013-10-29 21:38:29 +00:00
|
|
|
if (encode_lavc_didfail(mpctx->encode_lavc_ctx)) {
|
|
|
|
mpctx->stop_play = PT_QUIT;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2014-07-16 20:40:21 +00:00
|
|
|
update_demuxer_properties(mpctx);
|
2013-10-29 21:38:29 +00:00
|
|
|
|
|
|
|
if (mpctx->timeline) {
|
|
|
|
double end = mpctx->timeline[mpctx->timeline_part + 1].start;
|
|
|
|
if (endpts == MP_NOPTS_VALUE || end < endpts) {
|
2014-07-30 21:26:17 +00:00
|
|
|
end_is_new_segment = true;
|
2013-10-29 21:38:29 +00:00
|
|
|
endpts = end;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (opts->chapterrange[1] > 0) {
|
2014-03-25 01:27:22 +00:00
|
|
|
double end = chapter_start_time(mpctx, opts->chapterrange[1]);
|
|
|
|
if (end != MP_NOPTS_VALUE && (endpts == MP_NOPTS_VALUE || end < endpts))
|
|
|
|
endpts = end;
|
2013-10-29 21:38:29 +00:00
|
|
|
}
|
|
|
|
|
2014-07-30 21:24:08 +00:00
|
|
|
if (mpctx->video_out)
|
2013-10-29 21:38:29 +00:00
|
|
|
vo_check_events(mpctx->video_out);
|
2014-05-07 19:48:36 +00:00
|
|
|
|
2014-07-30 21:24:08 +00:00
|
|
|
handle_cursor_autohide(mpctx);
|
|
|
|
handle_heartbeat_cmd(mpctx);
|
2013-10-29 21:38:29 +00:00
|
|
|
|
2014-07-30 21:24:08 +00:00
|
|
|
fill_audio_out_buffers(mpctx, endpts);
|
|
|
|
write_video(mpctx, endpts);
|
2013-10-29 21:38:29 +00:00
|
|
|
|
2014-07-28 18:40:43 +00:00
|
|
|
// We always make sure audio and video buffers are filled before actually
|
|
|
|
// starting playback. This code handles starting them at the same time.
|
|
|
|
if (mpctx->audio_status >= STATUS_READY &&
|
|
|
|
mpctx->video_status >= STATUS_READY)
|
2014-03-07 14:24:32 +00:00
|
|
|
{
|
2014-07-28 18:40:43 +00:00
|
|
|
if (mpctx->video_status == STATUS_READY) {
|
|
|
|
mpctx->video_status = STATUS_PLAYING;
|
|
|
|
get_relative_time(mpctx);
|
|
|
|
mpctx->sleeptime = 0;
|
|
|
|
}
|
|
|
|
if (mpctx->audio_status == STATUS_READY)
|
|
|
|
fill_audio_out_buffers(mpctx, endpts); // actually play prepared buffer
|
|
|
|
if (!mpctx->restart_complete) {
|
|
|
|
mpctx->hrseek_active = false;
|
|
|
|
mp_notify(mpctx, MPV_EVENT_PLAYBACK_RESTART, NULL);
|
|
|
|
mpctx->restart_complete = true;
|
2014-08-03 18:25:03 +00:00
|
|
|
if (opts->playing_msg && !mpctx->playing_msg_shown) {
|
|
|
|
mpctx->playing_msg_shown = true;
|
|
|
|
char *msg =
|
|
|
|
mp_property_expand_escaped_string(mpctx, opts->playing_msg);
|
|
|
|
MP_INFO(mpctx, "%s\n", msg);
|
|
|
|
talloc_free(msg);
|
|
|
|
}
|
2014-07-28 18:40:43 +00:00
|
|
|
}
|
2014-07-20 18:47:30 +00:00
|
|
|
}
|
2013-10-29 21:38:29 +00:00
|
|
|
|
2014-07-28 18:40:43 +00:00
|
|
|
if (mpctx->video_status == STATUS_EOF &&
|
|
|
|
mpctx->audio_status >= STATUS_PLAYING)
|
|
|
|
{
|
2013-10-29 21:38:29 +00:00
|
|
|
double a_pos = 0;
|
2014-04-17 21:48:09 +00:00
|
|
|
if (mpctx->d_audio)
|
|
|
|
a_pos = playing_audio_pts(mpctx);
|
2013-10-29 21:38:29 +00:00
|
|
|
mpctx->playback_pts = a_pos;
|
|
|
|
}
|
|
|
|
|
2014-08-03 18:25:03 +00:00
|
|
|
handle_dummy_ticks(mpctx);
|
|
|
|
|
2014-07-28 18:40:43 +00:00
|
|
|
update_osd_msg(mpctx);
|
2013-10-29 21:38:29 +00:00
|
|
|
update_subtitles(mpctx);
|
|
|
|
|
2014-07-29 22:22:25 +00:00
|
|
|
/* If we're paused, don't end playback yet. But if video is enabled, is EOF,
|
|
|
|
* and we don't have a video frame, then the user probably seeked outside
|
|
|
|
* of the video, and we want to quit. */
|
|
|
|
bool prevent_eof = mpctx->paused;
|
|
|
|
if (mpctx->d_video && mpctx->video_status == STATUS_EOF)
|
|
|
|
prevent_eof &= mpctx->video_out && mpctx->video_out->hasframe;
|
|
|
|
/* Handles terminating on end of playback (or switching to next segment).
|
|
|
|
*
|
|
|
|
* It's possible for the user to simultaneously switch both audio
|
2013-10-29 21:38:29 +00:00
|
|
|
* and video streams to "disabled" at runtime. Handle this by waiting
|
|
|
|
* rather than immediately stopping playback due to EOF.
|
|
|
|
*/
|
2014-07-29 22:22:25 +00:00
|
|
|
if ((mpctx->d_audio || mpctx->d_video) && !prevent_eof &&
|
2014-07-28 18:40:43 +00:00
|
|
|
mpctx->audio_status == STATUS_EOF &&
|
|
|
|
mpctx->video_status == STATUS_EOF)
|
|
|
|
{
|
2014-07-30 21:26:17 +00:00
|
|
|
if (end_is_new_segment) {
|
2013-11-03 22:28:13 +00:00
|
|
|
mp_seek(mpctx, (struct seek_params){
|
|
|
|
.type = MPSEEK_ABSOLUTE,
|
|
|
|
.amount = mpctx->timeline[mpctx->timeline_part+1].start
|
|
|
|
}, true);
|
2013-10-29 21:38:29 +00:00
|
|
|
} else
|
|
|
|
mpctx->stop_play = AT_END_OF_FILE;
|
|
|
|
}
|
|
|
|
|
2014-07-14 23:49:02 +00:00
|
|
|
mp_handle_nav(mpctx);
|
|
|
|
|
2014-07-29 22:22:25 +00:00
|
|
|
handle_keep_open(mpctx);
|
|
|
|
|
2014-08-03 18:25:03 +00:00
|
|
|
handle_sstep(mpctx);
|
2013-10-29 21:38:29 +00:00
|
|
|
|
2014-08-03 17:14:30 +00:00
|
|
|
handle_loop_file(mpctx);
|
|
|
|
|
2014-07-18 13:04:46 +00:00
|
|
|
if (mpctx->stop_play)
|
2014-08-03 17:14:30 +00:00
|
|
|
return;
|
2014-07-18 13:04:46 +00:00
|
|
|
|
2014-08-03 17:09:22 +00:00
|
|
|
handle_osd_redraw(mpctx);
|
2014-07-18 13:04:46 +00:00
|
|
|
|
|
|
|
if (mpctx->sleeptime > 0) {
|
|
|
|
MP_STATS(mpctx, "start sleep");
|
|
|
|
mp_input_get_cmd(mpctx->input, mpctx->sleeptime * 1000, true);
|
|
|
|
MP_STATS(mpctx, "end sleep");
|
2013-10-29 21:38:29 +00:00
|
|
|
}
|
2014-07-18 13:04:46 +00:00
|
|
|
mpctx->sleeptime = get_wakeup_period(mpctx);
|
2013-10-29 21:38:29 +00:00
|
|
|
|
|
|
|
handle_pause_on_low_cache(mpctx);
|
|
|
|
|
|
|
|
handle_input_and_seek_coalesce(mpctx);
|
|
|
|
|
|
|
|
handle_backstep(mpctx);
|
|
|
|
|
2014-04-27 20:28:07 +00:00
|
|
|
handle_chapter_change(mpctx);
|
|
|
|
|
2013-10-29 21:38:29 +00:00
|
|
|
handle_force_window(mpctx, false);
|
|
|
|
|
|
|
|
execute_queued_seek(mpctx);
|
2013-12-19 20:31:27 +00:00
|
|
|
|
2014-02-06 15:49:50 +00:00
|
|
|
if (mpctx->opts->use_terminal)
|
|
|
|
getch2_poll();
|
2013-10-29 21:38:29 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// Waiting for the slave master to send us a new file to play.
|
|
|
|
void idle_loop(struct MPContext *mpctx)
|
|
|
|
{
|
|
|
|
// ================= idle loop (STOP state) =========================
|
|
|
|
bool need_reinit = true;
|
|
|
|
while (mpctx->opts->player_idle_mode && !mpctx->playlist->current
|
|
|
|
&& mpctx->stop_play != PT_QUIT)
|
|
|
|
{
|
2014-07-29 22:22:25 +00:00
|
|
|
mpctx->video_status = STATUS_EOF;
|
|
|
|
mpctx->audio_status = STATUS_EOF;
|
2014-02-26 19:45:24 +00:00
|
|
|
if (need_reinit) {
|
|
|
|
mp_notify(mpctx, MPV_EVENT_IDLE, NULL);
|
2013-10-29 21:38:29 +00:00
|
|
|
handle_force_window(mpctx, true);
|
2014-02-26 19:45:24 +00:00
|
|
|
}
|
2013-10-29 21:38:29 +00:00
|
|
|
need_reinit = false;
|
2014-08-03 18:25:03 +00:00
|
|
|
handle_dummy_ticks(mpctx);
|
2013-10-29 21:38:29 +00:00
|
|
|
int uninit = INITIALIZED_AO;
|
|
|
|
if (!mpctx->opts->force_vo)
|
|
|
|
uninit |= INITIALIZED_VO;
|
|
|
|
uninit_player(mpctx, uninit);
|
|
|
|
handle_force_window(mpctx, false);
|
|
|
|
if (mpctx->video_out)
|
|
|
|
vo_check_events(mpctx->video_out);
|
|
|
|
update_osd_msg(mpctx);
|
|
|
|
handle_osd_redraw(mpctx);
|
2014-07-22 17:33:24 +00:00
|
|
|
mp_cmd_t *cmd = mp_input_get_cmd(mpctx->input, mpctx->sleeptime * 1000,
|
2013-10-29 21:38:29 +00:00
|
|
|
false);
|
2014-07-22 17:33:24 +00:00
|
|
|
mpctx->sleeptime = get_wakeup_period(mpctx);
|
2013-10-29 21:38:29 +00:00
|
|
|
if (cmd)
|
|
|
|
run_command(mpctx, cmd);
|
|
|
|
mp_cmd_free(cmd);
|
2014-02-10 20:01:35 +00:00
|
|
|
mp_dispatch_queue_process(mpctx->dispatch, 0);
|
2014-02-06 15:49:50 +00:00
|
|
|
if (mpctx->opts->use_terminal)
|
|
|
|
getch2_poll();
|
2013-10-29 21:38:29 +00:00
|
|
|
}
|
|
|
|
}
|