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
|
|
|
|
2013-12-19 20:31:27 +00:00
|
|
|
#include "osdep/terminal.h"
|
2014-02-10 20:01:35 +00:00
|
|
|
#include "osdep/threads.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 "screenshot.h"
|
|
|
|
#include "command.h"
|
|
|
|
|
|
|
|
#define WAKEUP_PERIOD 0.5
|
|
|
|
|
2013-12-18 16:12:07 +00:00
|
|
|
static const char av_desync_help_text[] =
|
2013-10-29 21:38:29 +00:00
|
|
|
"\n\n"
|
|
|
|
" *************************************************\n"
|
|
|
|
" **** Audio/Video desynchronisation detected! ****\n"
|
|
|
|
" *************************************************\n\n"
|
|
|
|
"This means either the audio or the video is played too slowly.\n"
|
|
|
|
"Possible reasons, problems, workarounds:\n"
|
|
|
|
"- Your system is simply too slow for this file.\n"
|
|
|
|
" Transcode it to a lower bitrate file with tools like HandBrake.\n"
|
|
|
|
"- Broken/buggy _audio_ driver.\n"
|
|
|
|
" Experiment with different values for --autosync, 30 is a good start.\n"
|
|
|
|
" If you have PulseAudio, try --ao=alsa .\n"
|
|
|
|
"- Slow video output.\n"
|
2014-03-30 07:08:52 +00:00
|
|
|
" Try a different --vo driver (--vo=help for a list) or try --framedrop!\n"
|
2013-10-29 21:38:29 +00:00
|
|
|
"- Playing a video file with --vo=opengl with higher FPS than the monitor.\n"
|
|
|
|
" This is due to vsync limiting the framerate.\n"
|
|
|
|
"- Playing from a slow network source.\n"
|
|
|
|
" Download the file instead.\n"
|
2014-01-12 20:41:09 +00:00
|
|
|
"- Try to find out whether audio/video/subs are causing this by experimenting\n"
|
|
|
|
" with --no-video, --no-audio, or --no-sub.\n"
|
2013-10-29 21:38:29 +00:00
|
|
|
"- If you swiched audio or video tracks, try seeking to force synchronization.\n"
|
2013-12-18 16:12:07 +00:00
|
|
|
"If none of this helps you, file a bug report.\n\n";
|
2013-10-29 21:38:29 +00:00
|
|
|
|
|
|
|
|
2014-02-24 21:49:07 +00:00
|
|
|
void pause_player(struct MPContext *mpctx, mpv_event_pause_reason reason)
|
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);
|
|
|
|
|
|
|
|
if (!mpctx->opts->quiet)
|
2013-12-21 17:16:02 +00:00
|
|
|
MP_SMODE(mpctx, "ID_PAUSED\n");
|
2014-02-24 21:49:07 +00:00
|
|
|
|
|
|
|
end:
|
|
|
|
reason.user_paused = !!mpctx->opts->pause;
|
|
|
|
reason.real_paused = !!mpctx->paused;
|
2014-02-28 14:03:51 +00:00
|
|
|
mp_notify(mpctx, MPV_EVENT_PAUSE, &reason);
|
2013-10-29 21:38:29 +00:00
|
|
|
}
|
|
|
|
|
2014-02-24 21:49:07 +00:00
|
|
|
void unpause_player(struct MPContext *mpctx, mpv_event_pause_reason reason)
|
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:
|
|
|
|
reason.user_paused = !!mpctx->opts->pause;
|
|
|
|
reason.real_paused = !!mpctx->paused;
|
|
|
|
mp_notify(mpctx, MPV_EVENT_UNPAUSE, &reason);
|
2013-10-29 21:38:29 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void draw_osd(struct MPContext *mpctx)
|
|
|
|
{
|
|
|
|
struct vo *vo = mpctx->video_out;
|
|
|
|
|
2014-01-18 00:19:20 +00:00
|
|
|
osd_set_vo_pts(mpctx->osd, mpctx->video_pts);
|
2013-10-29 21:38:29 +00:00
|
|
|
vo_draw_osd(vo, mpctx->osd);
|
|
|
|
}
|
|
|
|
|
|
|
|
static bool redraw_osd(struct MPContext *mpctx)
|
|
|
|
{
|
|
|
|
struct vo *vo = mpctx->video_out;
|
|
|
|
if (vo_redraw_frame(vo) < 0)
|
|
|
|
return false;
|
|
|
|
|
|
|
|
draw_osd(mpctx);
|
|
|
|
|
|
|
|
vo_flip_page(vo, 0, -1);
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
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-02-24 21:49:07 +00:00
|
|
|
unpause_player(mpctx, PAUSE_BY_COMMAND);
|
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-02-24 21:49:07 +00:00
|
|
|
pause_player(mpctx, PAUSE_BY_COMMAND);
|
2013-10-29 21:38:29 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-03-10 22:45:57 +00:00
|
|
|
static void seek_reset(struct MPContext *mpctx, bool reset_ao, bool reset_ac)
|
2013-10-29 21:38:29 +00:00
|
|
|
{
|
2013-11-23 20:36:20 +00:00
|
|
|
if (mpctx->d_video) {
|
2013-11-27 19:54:07 +00:00
|
|
|
video_reset_decoding(mpctx->d_video);
|
2013-10-29 21:38:29 +00:00
|
|
|
vo_seek_reset(mpctx->video_out);
|
|
|
|
}
|
|
|
|
|
2014-03-10 22:45:57 +00:00
|
|
|
if (mpctx->d_audio && reset_ac) {
|
2013-11-27 19:54:07 +00:00
|
|
|
audio_reset_decoding(mpctx->d_audio);
|
2013-10-29 21:38:29 +00:00
|
|
|
if (reset_ao)
|
2013-11-08 19:02:09 +00:00
|
|
|
clear_audio_output_buffers(mpctx);
|
2013-10-29 21:38:29 +00:00
|
|
|
}
|
|
|
|
|
2013-12-24 16:46:14 +00:00
|
|
|
reset_subtitles(mpctx, 0);
|
|
|
|
reset_subtitles(mpctx, 1);
|
2013-10-29 21:38:29 +00:00
|
|
|
|
2013-11-29 14:42:19 +00:00
|
|
|
mpctx->video_pts = MP_NOPTS_VALUE;
|
|
|
|
mpctx->video_next_pts = MP_NOPTS_VALUE;
|
video: display last frame, drain frames on video reconfig
Until now, the player didn't care to drain frames on video reconfig.
Instead, the VO was reconfigured (i.e. resized) before the queued frames
finished displaying. This can for example be observed by passing
multiple images with different size as mf:// filename. Then the window
would resize one frame before image with the new size is displayed. With
--vo=vdpau, the effect is worse, because this VO queues more than 1
frame internally.
Fix this by explicitly draining buffered frames before video reconfig.
Raise the display time of the last frame. Otherwise, the last frame
would be shown for a very short time only. This usually doesn't matter,
but helps when playing image files. This is a byproduct of frame
draining, because normally, video timing is based on the frames queued
to the VO, and we can't do that with frames of different size or format.
So we pretend that the frame before the change is the last frame in
order to time it. This code is incorrect though: it tries to use the
framerate, which often doesn't make sense. But it's good enough to test
this code with mf://.
2013-12-10 18:33:11 +00:00
|
|
|
mpctx->playing_last_frame = false;
|
|
|
|
mpctx->last_frame_duration = 0;
|
2013-11-29 14:42:19 +00:00
|
|
|
mpctx->delay = 0;
|
|
|
|
mpctx->time_frame = 0;
|
2013-10-29 21:38:29 +00:00
|
|
|
mpctx->restart_playback = true;
|
|
|
|
mpctx->hrseek_active = false;
|
|
|
|
mpctx->hrseek_framedrop = false;
|
|
|
|
mpctx->total_avsync_change = 0;
|
|
|
|
mpctx->drop_frame_cnt = 0;
|
|
|
|
mpctx->dropped_frames = 0;
|
|
|
|
mpctx->playback_pts = MP_NOPTS_VALUE;
|
|
|
|
|
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
|
2014-02-28 00:31:38 +00:00
|
|
|
|
|
|
|
mp_notify(mpctx, MPV_EVENT_SEEK, NULL);
|
2013-10-29 21:38:29 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// 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;
|
|
|
|
// 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.
|
|
|
|
if (seek.exact > 1)
|
|
|
|
hr_seek_offset = MPMAX(hr_seek_offset, 0.5); // arbitrary
|
|
|
|
|
2013-10-29 21:38:29 +00:00
|
|
|
bool hr_seek = mpctx->demuxer->accurate_seek && opts->correct_pts;
|
|
|
|
hr_seek &= seek.exact >= 0 && seek.type != MPSEEK_FACTOR;
|
|
|
|
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;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if ((mpctx->demuxer->accurate_seek || mpctx->timeline)
|
|
|
|
&& seek.type == MPSEEK_RELATIVE) {
|
|
|
|
seek.type = MPSEEK_ABSOLUTE;
|
|
|
|
seek.direction = seek.amount > 0 ? 1 : -1;
|
|
|
|
seek.amount += get_current_time(mpctx);
|
|
|
|
}
|
|
|
|
|
2014-03-10 22:45:57 +00:00
|
|
|
/* At least the liba52 decoder wants to read from the input stream
|
|
|
|
* during initialization, so reinit must be done after the demux_seek()
|
|
|
|
* call that clears possible stream EOF. */
|
2013-10-29 21:38:29 +00:00
|
|
|
bool need_reset = false;
|
|
|
|
double demuxer_amount = seek.amount;
|
|
|
|
if (mpctx->timeline) {
|
|
|
|
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;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (need_reset) {
|
|
|
|
reinit_video_chain(mpctx);
|
2013-12-24 16:46:14 +00:00
|
|
|
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;
|
|
|
|
}
|
|
|
|
if (hr_seek || seek.direction < 0)
|
|
|
|
demuxer_style |= SEEK_BACKWARD;
|
|
|
|
else if (seek.direction > 0)
|
|
|
|
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;
|
2013-10-29 21:38:29 +00:00
|
|
|
int seekresult = demux_seek(mpctx->demuxer, demuxer_amount, demuxer_style);
|
|
|
|
if (seekresult == 0) {
|
2014-03-10 22:45:57 +00:00
|
|
|
if (need_reset) {
|
|
|
|
reinit_audio_chain(mpctx);
|
|
|
|
seek_reset(mpctx, !timeline_fallthrough, false);
|
|
|
|
}
|
2013-10-29 21:38:29 +00:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
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-03-10 22:45:57 +00:00
|
|
|
if (need_reset)
|
|
|
|
reinit_audio_chain(mpctx);
|
|
|
|
/* If we just reinitialized audio it doesn't need to be reset,
|
|
|
|
* and resetting could lose audio some decoders produce during init. */
|
|
|
|
seek_reset(mpctx, !timeline_fallthrough, !need_reset);
|
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;
|
|
|
|
} else
|
|
|
|
mpctx->last_seek_pts = MP_NOPTS_VALUE;
|
|
|
|
|
|
|
|
// 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;
|
|
|
|
mpctx->hrseek_framedrop = true;
|
|
|
|
mpctx->hrseek_pts = hr_seek ? seek.amount
|
|
|
|
: mpctx->timeline[mpctx->timeline_part].start;
|
|
|
|
}
|
|
|
|
|
|
|
|
mpctx->start_timestamp = mp_time_sec();
|
|
|
|
|
|
|
|
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) {
|
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). */
|
|
|
|
if (!mpctx->seek.immediate && mpctx->restart_playback &&
|
|
|
|
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 (demuxer->stream_pts != MP_NOPTS_VALUE)
|
|
|
|
return demuxer->stream_pts;
|
|
|
|
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;
|
|
|
|
}
|
|
|
|
|
|
|
|
// 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 {
|
2013-11-03 17:50:00 +00:00
|
|
|
struct stream *s = demuxer->stream;
|
|
|
|
int64_t size = s->end_pos - s->start_pos;
|
2013-11-16 20:04:28 +00:00
|
|
|
int64_t fpos = demuxer->filepos >= 0 ?
|
2013-10-29 21:38:29 +00:00
|
|
|
demuxer->filepos : stream_tell(demuxer->stream);
|
|
|
|
if (size > 0)
|
2013-11-03 17:50:00 +00:00
|
|
|
ans = MPCLAMP((double)(fpos - s->start_pos) / size, 0, 1);
|
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;
|
|
|
|
for (i = 1; i < mpctx->num_chapters; i++)
|
|
|
|
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;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void update_avsync(struct MPContext *mpctx)
|
|
|
|
{
|
2013-11-23 20:36:20 +00:00
|
|
|
if (!mpctx->d_audio || !mpctx->d_video)
|
2013-10-29 21:38:29 +00:00
|
|
|
return;
|
|
|
|
|
|
|
|
double a_pos = playing_audio_pts(mpctx);
|
|
|
|
|
2014-01-06 17:39:49 +00:00
|
|
|
mpctx->last_av_difference = a_pos - mpctx->video_pts + mpctx->audio_delay;
|
2013-10-29 21:38:29 +00:00
|
|
|
if (mpctx->time_frame > 0)
|
|
|
|
mpctx->last_av_difference +=
|
|
|
|
mpctx->time_frame * mpctx->opts->playback_speed;
|
|
|
|
if (a_pos == MP_NOPTS_VALUE || mpctx->video_pts == MP_NOPTS_VALUE)
|
|
|
|
mpctx->last_av_difference = MP_NOPTS_VALUE;
|
|
|
|
if (mpctx->last_av_difference > 0.5 && mpctx->drop_frame_cnt > 50
|
|
|
|
&& !mpctx->drop_message_shown) {
|
2013-12-16 19:40:02 +00:00
|
|
|
MP_WARN(mpctx, "%s", av_desync_help_text);
|
2013-10-29 21:38:29 +00:00
|
|
|
mpctx->drop_message_shown = true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Modify video timing to match the audio timeline. There are two main
|
|
|
|
* reasons this is needed. First, video and audio can start from different
|
|
|
|
* positions at beginning of file or after a seek (MPlayer starts both
|
|
|
|
* immediately even if they have different pts). Second, the file can have
|
|
|
|
* audio timestamps that are inconsistent with the duration of the audio
|
|
|
|
* packets, for example two consecutive timestamp values differing by
|
|
|
|
* one second but only a packet with enough samples for half a second
|
|
|
|
* of playback between them.
|
|
|
|
*/
|
|
|
|
static void adjust_sync(struct MPContext *mpctx, double frame_time)
|
|
|
|
{
|
|
|
|
struct MPOpts *opts = mpctx->opts;
|
|
|
|
|
2013-11-23 20:22:17 +00:00
|
|
|
if (!mpctx->d_audio || mpctx->syncing_audio)
|
2013-10-29 21:38:29 +00:00
|
|
|
return;
|
|
|
|
|
|
|
|
double a_pts = written_audio_pts(mpctx) - mpctx->delay;
|
2013-11-27 19:57:08 +00:00
|
|
|
double v_pts = mpctx->video_next_pts;
|
2013-10-29 21:38:29 +00:00
|
|
|
double av_delay = a_pts - v_pts;
|
|
|
|
// Try to sync vo_flip() so it will *finish* at given time
|
|
|
|
av_delay += mpctx->last_vo_flip_duration;
|
2014-01-06 17:39:49 +00:00
|
|
|
av_delay += mpctx->audio_delay; // This much pts difference is desired
|
2013-10-29 21:38:29 +00:00
|
|
|
|
|
|
|
double change = av_delay * 0.1;
|
|
|
|
double max_change = opts->default_max_pts_correction >= 0 ?
|
|
|
|
opts->default_max_pts_correction : frame_time * 0.1;
|
|
|
|
if (change < -max_change)
|
|
|
|
change = -max_change;
|
|
|
|
else if (change > max_change)
|
|
|
|
change = max_change;
|
|
|
|
mpctx->delay += change;
|
|
|
|
mpctx->total_avsync_change += change;
|
|
|
|
}
|
|
|
|
|
|
|
|
static bool handle_osd_redraw(struct MPContext *mpctx)
|
|
|
|
{
|
|
|
|
if (!mpctx->video_out || !mpctx->video_out->config_ok)
|
|
|
|
return false;
|
2014-01-18 00:19:20 +00:00
|
|
|
bool want_redraw = vo_get_want_redraw(mpctx->video_out) |
|
|
|
|
(osd_query_and_reset_want_redraw(mpctx->osd) &&
|
|
|
|
mpctx->video_out->driver->draw_osd);
|
2013-10-29 21:38:29 +00:00
|
|
|
if (want_redraw) {
|
|
|
|
if (redraw_osd(mpctx))
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void handle_metadata_update(struct MPContext *mpctx)
|
|
|
|
{
|
|
|
|
if (mp_time_sec() > mpctx->last_metadata_update + 2) {
|
2014-02-19 15:00:37 +00:00
|
|
|
if (demux_info_update(mpctx->demuxer))
|
|
|
|
mp_notify(mpctx, MPV_EVENT_METADATA_UPDATE, NULL);
|
2013-10-29 21:38:29 +00:00
|
|
|
mpctx->last_metadata_update = mp_time_sec();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void handle_pause_on_low_cache(struct MPContext *mpctx)
|
|
|
|
{
|
|
|
|
struct MPOpts *opts = mpctx->opts;
|
|
|
|
int cache = mp_get_cache_percent(mpctx);
|
|
|
|
bool idle = mp_get_cache_idle(mpctx);
|
|
|
|
if (mpctx->paused && mpctx->paused_for_cache) {
|
|
|
|
if (cache < 0 || cache >= opts->stream_cache_min_percent || idle) {
|
|
|
|
mpctx->paused_for_cache = false;
|
|
|
|
if (!opts->pause)
|
2014-02-24 21:49:07 +00:00
|
|
|
unpause_player(mpctx, PAUSE_BY_CACHE);
|
2013-10-29 21:38:29 +00:00
|
|
|
}
|
|
|
|
} else {
|
2013-11-25 22:24:50 +00:00
|
|
|
if (cache >= 0 && cache <= opts->stream_cache_pause && !idle &&
|
|
|
|
opts->stream_cache_pause < opts->stream_cache_min_percent)
|
|
|
|
{
|
2013-10-29 21:38:29 +00:00
|
|
|
bool prev_paused_user = opts->pause;
|
2014-02-24 21:49:07 +00:00
|
|
|
pause_player(mpctx, PAUSE_BY_CACHE);
|
2013-10-29 21:38:29 +00:00
|
|
|
mpctx->paused_for_cache = true;
|
|
|
|
opts->pause = prev_paused_user;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void handle_heartbeat_cmd(struct MPContext *mpctx)
|
|
|
|
{
|
|
|
|
struct MPOpts *opts = mpctx->opts;
|
|
|
|
if (opts->heartbeat_cmd && !mpctx->paused) {
|
|
|
|
double now = mp_time_sec();
|
|
|
|
if (now - mpctx->last_heartbeat > opts->heartbeat_interval) {
|
|
|
|
mpctx->last_heartbeat = now;
|
|
|
|
system(opts->heartbeat_cmd);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
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;
|
|
|
|
|
|
|
|
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;
|
|
|
|
mpctx->mouse_timer =
|
|
|
|
mp_time_sec() + opts->cursor_autohide_delay / 1000.0;
|
|
|
|
mouse_cursor_visible = true;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (mp_time_sec() >= mpctx->mouse_timer)
|
|
|
|
mouse_cursor_visible = false;
|
|
|
|
|
|
|
|
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;
|
|
|
|
}
|
|
|
|
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;
|
|
|
|
bool demuxer_ok = mpctx->demuxer && mpctx->demuxer->accurate_seek;
|
2013-11-23 20:36:20 +00:00
|
|
|
if (demuxer_ok && 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;
|
|
|
|
if (opts->step_sec > 0 && !mpctx->stop_play && !mpctx->paused &&
|
|
|
|
!mpctx->restart_playback)
|
|
|
|
{
|
|
|
|
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
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
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-02-24 21:49:07 +00:00
|
|
|
pause_player(mpctx, PAUSE_BY_KEEP_OPEN);
|
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);
|
|
|
|
redraw_osd(mpctx);
|
2014-02-17 01:52:26 +00:00
|
|
|
mp_notify(mpctx, MPV_EVENT_VIDEO_RECONFIG, NULL);
|
2013-10-29 21:38:29 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static double timing_sleep(struct MPContext *mpctx, double time_frame)
|
|
|
|
{
|
|
|
|
// assume kernel HZ=100 for softsleep, works with larger HZ but with
|
|
|
|
// unnecessarily high CPU usage
|
|
|
|
struct MPOpts *opts = mpctx->opts;
|
|
|
|
double margin = opts->softsleep ? 0.011 : 0;
|
|
|
|
while (time_frame > margin) {
|
|
|
|
mp_sleep_us(1000000 * (time_frame - margin));
|
|
|
|
time_frame -= get_relative_time(mpctx);
|
|
|
|
}
|
|
|
|
if (opts->softsleep) {
|
|
|
|
if (time_frame < 0)
|
|
|
|
MP_WARN(mpctx, "Warning! Softsleep underflow!\n");
|
|
|
|
while (time_frame > 0)
|
|
|
|
time_frame -= get_relative_time(mpctx); // burn the CPU
|
|
|
|
}
|
|
|
|
return time_frame;
|
|
|
|
}
|
|
|
|
|
|
|
|
static double get_wakeup_period(struct MPContext *mpctx)
|
|
|
|
{
|
|
|
|
/* Even if we can immediately wake up in response to most input events,
|
|
|
|
* there are some timers which are not registered to the event loop
|
|
|
|
* and need to be checked periodically (like automatic mouse cursor hiding).
|
|
|
|
* OSD content updates behave similarly. Also some uncommon input devices
|
|
|
|
* may not have proper FD event support.
|
|
|
|
*/
|
|
|
|
double sleeptime = WAKEUP_PERIOD;
|
|
|
|
|
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;
|
|
|
|
bool full_audio_buffers = false;
|
|
|
|
bool audio_left = false, video_left = false;
|
|
|
|
double endpts = get_play_end_pts(mpctx);
|
|
|
|
bool end_is_chapter = false;
|
|
|
|
double sleeptime = get_wakeup_period(mpctx);
|
|
|
|
bool was_restart = mpctx->restart_playback;
|
|
|
|
bool new_frame_shown = false;
|
|
|
|
|
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
|
|
|
|
|
|
|
|
// Add tracks that were added by the demuxer later (e.g. MPEG)
|
|
|
|
if (!mpctx->timeline && mpctx->demuxer)
|
|
|
|
add_demuxer_tracks(mpctx, mpctx->demuxer);
|
|
|
|
|
|
|
|
if (mpctx->timeline) {
|
|
|
|
double end = mpctx->timeline[mpctx->timeline_part + 1].start;
|
|
|
|
if (endpts == MP_NOPTS_VALUE || end < endpts) {
|
|
|
|
endpts = end;
|
|
|
|
end_is_chapter = true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
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-03-07 14:24:32 +00:00
|
|
|
if (mpctx->d_audio && !mpctx->restart_playback && !ao_untimed(mpctx->ao)) {
|
2013-10-29 21:38:29 +00:00
|
|
|
int status = fill_audio_out_buffers(mpctx, endpts);
|
|
|
|
full_audio_buffers = status >= 0;
|
|
|
|
// Not at audio stream EOF yet
|
|
|
|
audio_left = status > -2;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (mpctx->video_out) {
|
|
|
|
vo_check_events(mpctx->video_out);
|
|
|
|
handle_cursor_autohide(mpctx);
|
|
|
|
}
|
|
|
|
|
|
|
|
double buffered_audio = -1;
|
2013-11-23 20:36:20 +00:00
|
|
|
while (mpctx->d_video) { // never loops, for "break;" only
|
2013-10-29 21:38:29 +00:00
|
|
|
struct vo *vo = mpctx->video_out;
|
|
|
|
update_fps(mpctx);
|
|
|
|
|
video: display last frame, drain frames on video reconfig
Until now, the player didn't care to drain frames on video reconfig.
Instead, the VO was reconfigured (i.e. resized) before the queued frames
finished displaying. This can for example be observed by passing
multiple images with different size as mf:// filename. Then the window
would resize one frame before image with the new size is displayed. With
--vo=vdpau, the effect is worse, because this VO queues more than 1
frame internally.
Fix this by explicitly draining buffered frames before video reconfig.
Raise the display time of the last frame. Otherwise, the last frame
would be shown for a very short time only. This usually doesn't matter,
but helps when playing image files. This is a byproduct of frame
draining, because normally, video timing is based on the frames queued
to the VO, and we can't do that with frames of different size or format.
So we pretend that the frame before the change is the last frame in
order to time it. This code is incorrect though: it tries to use the
framerate, which often doesn't make sense. But it's good enough to test
this code with mf://.
2013-12-10 18:33:11 +00:00
|
|
|
video_left = vo->hasframe || vo->frame_loaded || mpctx->playing_last_frame;
|
2013-10-29 21:38:29 +00:00
|
|
|
if (!vo->frame_loaded && (!mpctx->paused || mpctx->restart_playback)) {
|
video: display last frame, drain frames on video reconfig
Until now, the player didn't care to drain frames on video reconfig.
Instead, the VO was reconfigured (i.e. resized) before the queued frames
finished displaying. This can for example be observed by passing
multiple images with different size as mf:// filename. Then the window
would resize one frame before image with the new size is displayed. With
--vo=vdpau, the effect is worse, because this VO queues more than 1
frame internally.
Fix this by explicitly draining buffered frames before video reconfig.
Raise the display time of the last frame. Otherwise, the last frame
would be shown for a very short time only. This usually doesn't matter,
but helps when playing image files. This is a byproduct of frame
draining, because normally, video timing is based on the frames queued
to the VO, and we can't do that with frames of different size or format.
So we pretend that the frame before the change is the last frame in
order to time it. This code is incorrect though: it tries to use the
framerate, which often doesn't make sense. But it's good enough to test
this code with mf://.
2013-12-10 18:33:11 +00:00
|
|
|
|
2013-10-29 21:38:29 +00:00
|
|
|
double frame_time = update_video(mpctx, endpts);
|
video: display last frame, drain frames on video reconfig
Until now, the player didn't care to drain frames on video reconfig.
Instead, the VO was reconfigured (i.e. resized) before the queued frames
finished displaying. This can for example be observed by passing
multiple images with different size as mf:// filename. Then the window
would resize one frame before image with the new size is displayed. With
--vo=vdpau, the effect is worse, because this VO queues more than 1
frame internally.
Fix this by explicitly draining buffered frames before video reconfig.
Raise the display time of the last frame. Otherwise, the last frame
would be shown for a very short time only. This usually doesn't matter,
but helps when playing image files. This is a byproduct of frame
draining, because normally, video timing is based on the frames queued
to the VO, and we can't do that with frames of different size or format.
So we pretend that the frame before the change is the last frame in
order to time it. This code is incorrect though: it tries to use the
framerate, which often doesn't make sense. But it's good enough to test
this code with mf://.
2013-12-10 18:33:11 +00:00
|
|
|
if (frame_time < 0) {
|
|
|
|
if (!mpctx->playing_last_frame && mpctx->last_frame_duration > 0) {
|
|
|
|
mpctx->time_frame += mpctx->last_frame_duration;
|
|
|
|
mpctx->last_frame_duration = 0;
|
|
|
|
mpctx->playing_last_frame = true;
|
|
|
|
}
|
|
|
|
if (mpctx->playing_last_frame) {
|
|
|
|
frame_time = 0; // don't stop playback yet
|
|
|
|
} else if (mpctx->d_video->waiting_decoded_mpi) {
|
|
|
|
// Format changes behave like EOF, and this call "unstucks"
|
|
|
|
// the EOF condition (after waiting for the previous frame
|
|
|
|
// to finish displaying).
|
|
|
|
video_execute_format_change(mpctx);
|
|
|
|
frame_time = update_video(mpctx, endpts);
|
|
|
|
// We just displayed the previous frame, so display the
|
|
|
|
// new frame immediately.
|
|
|
|
if (frame_time > 0)
|
|
|
|
frame_time = 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-12-19 20:28:55 +00:00
|
|
|
MP_TRACE(mpctx, "frametime=%5.3f\n", frame_time);
|
2013-12-07 18:32:44 +00:00
|
|
|
if (mpctx->d_video->vfilter && mpctx->d_video->vfilter->initialized < 0)
|
|
|
|
{
|
2013-10-29 21:38:29 +00:00
|
|
|
MP_FATAL(mpctx, "\nFATAL: Could not initialize video filters "
|
|
|
|
"(-vf) or video output (-vo).\n");
|
|
|
|
int uninit = INITIALIZED_VCODEC;
|
|
|
|
if (!opts->force_vo)
|
|
|
|
uninit |= INITIALIZED_VO;
|
|
|
|
uninit_player(mpctx, uninit);
|
|
|
|
if (!mpctx->current_track[STREAM_AUDIO])
|
|
|
|
mpctx->stop_play = PT_NEXT_ENTRY;
|
|
|
|
mpctx->error_playing = true;
|
|
|
|
handle_force_window(mpctx, true);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
video_left = frame_time >= 0;
|
|
|
|
if (video_left && !mpctx->restart_playback) {
|
|
|
|
mpctx->time_frame += frame_time / opts->playback_speed;
|
|
|
|
adjust_sync(mpctx, frame_time);
|
|
|
|
}
|
|
|
|
if (!video_left) {
|
|
|
|
mpctx->delay = 0;
|
|
|
|
mpctx->last_av_difference = 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (endpts != MP_NOPTS_VALUE)
|
2013-11-27 19:57:08 +00:00
|
|
|
video_left &= mpctx->video_next_pts < endpts;
|
2013-10-29 21:38:29 +00:00
|
|
|
|
|
|
|
handle_heartbeat_cmd(mpctx);
|
|
|
|
|
|
|
|
if (!video_left || (mpctx->paused && !mpctx->restart_playback))
|
|
|
|
break;
|
video: display last frame, drain frames on video reconfig
Until now, the player didn't care to drain frames on video reconfig.
Instead, the VO was reconfigured (i.e. resized) before the queued frames
finished displaying. This can for example be observed by passing
multiple images with different size as mf:// filename. Then the window
would resize one frame before image with the new size is displayed. With
--vo=vdpau, the effect is worse, because this VO queues more than 1
frame internally.
Fix this by explicitly draining buffered frames before video reconfig.
Raise the display time of the last frame. Otherwise, the last frame
would be shown for a very short time only. This usually doesn't matter,
but helps when playing image files. This is a byproduct of frame
draining, because normally, video timing is based on the frames queued
to the VO, and we can't do that with frames of different size or format.
So we pretend that the frame before the change is the last frame in
order to time it. This code is incorrect though: it tries to use the
framerate, which often doesn't make sense. But it's good enough to test
this code with mf://.
2013-12-10 18:33:11 +00:00
|
|
|
if (!vo->frame_loaded && !mpctx->playing_last_frame) {
|
2013-10-29 21:38:29 +00:00
|
|
|
sleeptime = 0;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
mpctx->time_frame -= get_relative_time(mpctx);
|
|
|
|
if (full_audio_buffers && !mpctx->restart_playback) {
|
|
|
|
buffered_audio = ao_get_delay(mpctx->ao);
|
2013-12-19 20:28:55 +00:00
|
|
|
MP_TRACE(mpctx, "audio delay=%f\n", buffered_audio);
|
2013-10-29 21:38:29 +00:00
|
|
|
|
|
|
|
if (opts->autosync) {
|
|
|
|
/* Smooth reported playback position from AO by averaging
|
|
|
|
* it with the value expected based on previus value and
|
|
|
|
* time elapsed since then. May help smooth video timing
|
|
|
|
* with audio output that have inaccurate position reporting.
|
|
|
|
* This is badly implemented; the behavior of the smoothing
|
|
|
|
* now undesirably depends on how often this code runs
|
|
|
|
* (mainly depends on video frame rate). */
|
|
|
|
float predicted = (mpctx->delay / opts->playback_speed +
|
|
|
|
mpctx->time_frame);
|
|
|
|
float difference = buffered_audio - predicted;
|
|
|
|
buffered_audio = predicted + difference / opts->autosync;
|
|
|
|
}
|
|
|
|
|
|
|
|
mpctx->time_frame = (buffered_audio -
|
|
|
|
mpctx->delay / opts->playback_speed);
|
|
|
|
} else {
|
|
|
|
/* If we're more than 200 ms behind the right playback
|
|
|
|
* position, don't try to speed up display of following
|
|
|
|
* frames to catch up; continue with default speed from
|
|
|
|
* the current frame instead.
|
|
|
|
* If untimed is set always output frames immediately
|
|
|
|
* without sleeping.
|
|
|
|
*/
|
|
|
|
if (mpctx->time_frame < -0.2 || opts->untimed || vo->untimed)
|
|
|
|
mpctx->time_frame = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
double vsleep = mpctx->time_frame - vo->flip_queue_offset;
|
|
|
|
if (vsleep > 0.050) {
|
|
|
|
sleeptime = MPMIN(sleeptime, vsleep - 0.040);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
sleeptime = 0;
|
video: display last frame, drain frames on video reconfig
Until now, the player didn't care to drain frames on video reconfig.
Instead, the VO was reconfigured (i.e. resized) before the queued frames
finished displaying. This can for example be observed by passing
multiple images with different size as mf:// filename. Then the window
would resize one frame before image with the new size is displayed. With
--vo=vdpau, the effect is worse, because this VO queues more than 1
frame internally.
Fix this by explicitly draining buffered frames before video reconfig.
Raise the display time of the last frame. Otherwise, the last frame
would be shown for a very short time only. This usually doesn't matter,
but helps when playing image files. This is a byproduct of frame
draining, because normally, video timing is based on the frames queued
to the VO, and we can't do that with frames of different size or format.
So we pretend that the frame before the change is the last frame in
order to time it. This code is incorrect though: it tries to use the
framerate, which often doesn't make sense. But it's good enough to test
this code with mf://.
2013-12-10 18:33:11 +00:00
|
|
|
mpctx->playing_last_frame = false;
|
|
|
|
|
|
|
|
// last frame case (don't set video_left - consider format changes)
|
|
|
|
if (!vo->frame_loaded)
|
|
|
|
break;
|
2013-10-29 21:38:29 +00:00
|
|
|
|
|
|
|
//=================== FLIP PAGE (VIDEO BLT): ======================
|
|
|
|
|
|
|
|
vo_new_frame_imminent(vo);
|
2013-11-27 19:57:08 +00:00
|
|
|
mpctx->video_pts = mpctx->video_next_pts;
|
2013-10-29 21:38:29 +00:00
|
|
|
mpctx->last_vo_pts = mpctx->video_pts;
|
|
|
|
mpctx->playback_pts = mpctx->video_pts;
|
|
|
|
update_subtitles(mpctx);
|
|
|
|
update_osd_msg(mpctx);
|
|
|
|
draw_osd(mpctx);
|
|
|
|
|
|
|
|
mpctx->time_frame -= get_relative_time(mpctx);
|
|
|
|
mpctx->time_frame -= vo->flip_queue_offset;
|
|
|
|
if (mpctx->time_frame > 0.001)
|
|
|
|
mpctx->time_frame = timing_sleep(mpctx, mpctx->time_frame);
|
|
|
|
mpctx->time_frame += vo->flip_queue_offset;
|
|
|
|
|
|
|
|
int64_t t2 = mp_time_us();
|
|
|
|
/* Playing with playback speed it's possible to get pathological
|
|
|
|
* cases with mpctx->time_frame negative enough to cause an
|
|
|
|
* overflow in pts_us calculation, thus the MPMAX. */
|
|
|
|
double time_frame = MPMAX(mpctx->time_frame, -1);
|
|
|
|
int64_t pts_us = mpctx->last_time + time_frame * 1e6;
|
|
|
|
int duration = -1;
|
|
|
|
double pts2 = vo->next_pts2;
|
video: display last frame, drain frames on video reconfig
Until now, the player didn't care to drain frames on video reconfig.
Instead, the VO was reconfigured (i.e. resized) before the queued frames
finished displaying. This can for example be observed by passing
multiple images with different size as mf:// filename. Then the window
would resize one frame before image with the new size is displayed. With
--vo=vdpau, the effect is worse, because this VO queues more than 1
frame internally.
Fix this by explicitly draining buffered frames before video reconfig.
Raise the display time of the last frame. Otherwise, the last frame
would be shown for a very short time only. This usually doesn't matter,
but helps when playing image files. This is a byproduct of frame
draining, because normally, video timing is based on the frames queued
to the VO, and we can't do that with frames of different size or format.
So we pretend that the frame before the change is the last frame in
order to time it. This code is incorrect though: it tries to use the
framerate, which often doesn't make sense. But it's good enough to test
this code with mf://.
2013-12-10 18:33:11 +00:00
|
|
|
if (mpctx->video_pts != MP_NOPTS_VALUE && pts2 == MP_NOPTS_VALUE) {
|
|
|
|
// Make up a frame duration. Using the frame rate is not a good
|
|
|
|
// choice, since the frame rate could be unset/broken/random.
|
|
|
|
float fps = mpctx->d_video->fps;
|
|
|
|
double frame_time = fps > 0 ? 1.0 / fps : 0;
|
|
|
|
pts2 = mpctx->video_pts + frame_time;
|
|
|
|
}
|
|
|
|
if (pts2 != MP_NOPTS_VALUE) {
|
2013-10-29 21:38:29 +00:00
|
|
|
// expected A/V sync correction is ignored
|
|
|
|
double diff = (pts2 - mpctx->video_pts);
|
|
|
|
diff /= opts->playback_speed;
|
|
|
|
if (mpctx->time_frame < 0)
|
|
|
|
diff += mpctx->time_frame;
|
|
|
|
if (diff < 0)
|
|
|
|
diff = 0;
|
|
|
|
if (diff > 10)
|
|
|
|
diff = 10;
|
|
|
|
duration = diff * 1e6;
|
video: display last frame, drain frames on video reconfig
Until now, the player didn't care to drain frames on video reconfig.
Instead, the VO was reconfigured (i.e. resized) before the queued frames
finished displaying. This can for example be observed by passing
multiple images with different size as mf:// filename. Then the window
would resize one frame before image with the new size is displayed. With
--vo=vdpau, the effect is worse, because this VO queues more than 1
frame internally.
Fix this by explicitly draining buffered frames before video reconfig.
Raise the display time of the last frame. Otherwise, the last frame
would be shown for a very short time only. This usually doesn't matter,
but helps when playing image files. This is a byproduct of frame
draining, because normally, video timing is based on the frames queued
to the VO, and we can't do that with frames of different size or format.
So we pretend that the frame before the change is the last frame in
order to time it. This code is incorrect though: it tries to use the
framerate, which often doesn't make sense. But it's good enough to test
this code with mf://.
2013-12-10 18:33:11 +00:00
|
|
|
mpctx->last_frame_duration = diff;
|
2013-10-29 21:38:29 +00:00
|
|
|
}
|
video: display last frame, drain frames on video reconfig
Until now, the player didn't care to drain frames on video reconfig.
Instead, the VO was reconfigured (i.e. resized) before the queued frames
finished displaying. This can for example be observed by passing
multiple images with different size as mf:// filename. Then the window
would resize one frame before image with the new size is displayed. With
--vo=vdpau, the effect is worse, because this VO queues more than 1
frame internally.
Fix this by explicitly draining buffered frames before video reconfig.
Raise the display time of the last frame. Otherwise, the last frame
would be shown for a very short time only. This usually doesn't matter,
but helps when playing image files. This is a byproduct of frame
draining, because normally, video timing is based on the frames queued
to the VO, and we can't do that with frames of different size or format.
So we pretend that the frame before the change is the last frame in
order to time it. This code is incorrect though: it tries to use the
framerate, which often doesn't make sense. But it's good enough to test
this code with mf://.
2013-12-10 18:33:11 +00:00
|
|
|
if (mpctx->restart_playback)
|
|
|
|
duration = -1;
|
2013-10-29 21:38:29 +00:00
|
|
|
vo_flip_page(vo, pts_us | 1, duration);
|
|
|
|
|
|
|
|
mpctx->last_vo_flip_duration = (mp_time_us() - t2) * 0.000001;
|
|
|
|
if (vo->driver->flip_page_timed) {
|
|
|
|
// No need to adjust sync based on flip speed
|
|
|
|
mpctx->last_vo_flip_duration = 0;
|
|
|
|
// For print_status - VO call finishing early is OK for sync
|
|
|
|
mpctx->time_frame -= get_relative_time(mpctx);
|
|
|
|
}
|
|
|
|
mpctx->shown_vframes++;
|
|
|
|
if (mpctx->restart_playback) {
|
|
|
|
if (mpctx->sync_audio_to_video) {
|
|
|
|
mpctx->syncing_audio = true;
|
2013-11-23 20:22:17 +00:00
|
|
|
if (mpctx->d_audio)
|
2013-10-29 21:38:29 +00:00
|
|
|
fill_audio_out_buffers(mpctx, endpts);
|
|
|
|
mpctx->restart_playback = false;
|
2014-02-28 00:31:38 +00:00
|
|
|
mp_notify(mpctx, MPV_EVENT_PLAYBACK_RESTART, NULL);
|
2013-10-29 21:38:29 +00:00
|
|
|
}
|
|
|
|
mpctx->time_frame = 0;
|
|
|
|
get_relative_time(mpctx);
|
|
|
|
}
|
|
|
|
update_avsync(mpctx);
|
|
|
|
screenshot_flip(mpctx);
|
|
|
|
new_frame_shown = true;
|
|
|
|
|
2014-02-10 20:01:35 +00:00
|
|
|
mp_notify(mpctx, MPV_EVENT_TICK, NULL);
|
|
|
|
|
2013-10-29 21:38:29 +00:00
|
|
|
break;
|
|
|
|
} // video
|
|
|
|
|
2014-03-01 20:27:37 +00:00
|
|
|
if (!video_left || 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);
|
|
|
|
}
|
|
|
|
}
|
2014-02-10 20:01:35 +00:00
|
|
|
|
2013-10-29 21:38:29 +00:00
|
|
|
video_left &= mpctx->sync_audio_to_video; // force no-video semantics
|
|
|
|
|
2013-11-23 20:22:17 +00:00
|
|
|
if (mpctx->d_audio && (mpctx->restart_playback ? !video_left :
|
2014-03-07 14:24:32 +00:00
|
|
|
ao_untimed(mpctx->ao) && (mpctx->delay <= 0 ||
|
|
|
|
!video_left)))
|
|
|
|
{
|
2013-10-29 21:38:29 +00:00
|
|
|
int status = fill_audio_out_buffers(mpctx, endpts);
|
2014-03-07 14:24:32 +00:00
|
|
|
full_audio_buffers = status >= 0 && !ao_untimed(mpctx->ao);
|
2013-10-29 21:38:29 +00:00
|
|
|
// Not at audio stream EOF yet
|
|
|
|
audio_left = status > -2;
|
|
|
|
}
|
|
|
|
if (!video_left)
|
|
|
|
mpctx->restart_playback = false;
|
2013-11-23 20:22:17 +00:00
|
|
|
if (mpctx->d_audio && buffered_audio == -1)
|
2013-10-29 21:38:29 +00:00
|
|
|
buffered_audio = mpctx->paused ? 0 : ao_get_delay(mpctx->ao);
|
|
|
|
|
|
|
|
update_osd_msg(mpctx);
|
|
|
|
|
|
|
|
if (!video_left && (!mpctx->paused || was_restart)) {
|
|
|
|
double a_pos = 0;
|
2013-11-23 20:22:17 +00:00
|
|
|
if (mpctx->d_audio) {
|
2013-10-29 21:38:29 +00:00
|
|
|
a_pos = (written_audio_pts(mpctx) -
|
|
|
|
mpctx->opts->playback_speed * buffered_audio);
|
|
|
|
}
|
|
|
|
mpctx->playback_pts = a_pos;
|
2014-02-28 00:31:38 +00:00
|
|
|
if (was_restart)
|
|
|
|
mp_notify(mpctx, MPV_EVENT_PLAYBACK_RESTART, NULL);
|
2013-10-29 21:38:29 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
update_subtitles(mpctx);
|
|
|
|
|
|
|
|
/* It's possible for the user to simultaneously switch both audio
|
|
|
|
* and video streams to "disabled" at runtime. Handle this by waiting
|
|
|
|
* rather than immediately stopping playback due to EOF.
|
|
|
|
*
|
|
|
|
* When all audio has been written to output driver, stay in the
|
|
|
|
* main loop handling commands until it has been mostly consumed,
|
|
|
|
* except in the gapless case, where the next file will be started
|
|
|
|
* while audio from the current one still remains to be played.
|
|
|
|
*
|
|
|
|
* We want this check to trigger if we seeked to this position,
|
|
|
|
* but not if we paused at it with audio possibly still buffered in
|
|
|
|
* the AO. There's currently no working way to check buffered audio
|
|
|
|
* inside AO while paused. Thus the "was_restart" check below, which
|
|
|
|
* should trigger after seek only, when we know there's no audio
|
|
|
|
* buffered.
|
|
|
|
*/
|
2013-11-23 20:36:20 +00:00
|
|
|
if ((mpctx->d_audio || mpctx->d_video) && !audio_left && !video_left
|
2013-10-29 21:38:29 +00:00
|
|
|
&& (opts->gapless_audio || buffered_audio < 0.05)
|
|
|
|
&& (!mpctx->paused || was_restart)) {
|
|
|
|
if (end_is_chapter) {
|
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;
|
|
|
|
}
|
|
|
|
|
Add prelimimary (basic, possibly broken) dvdnav support
This readds a more or less completely new dvdnav implementation, though
it's based on the code from before commit 41fbcee. Note that this is
rather basic, and might be broken or not quite usable in many cases.
Most importantly, navigation highlights are not correctly implemented.
This would require changes in the FFmpeg dvdsub decoder (to apply a
different internal CLUT), so supporting it is not really possible right
now. And in fact, I don't think I ever want to support it, because it's
a very small gain for a lot of work. Instead, mpv will display fake
highlights, which are an approximate bounding box around the real
highlights.
Some things like mouse input or switching audio/subtitles stream using
the dvdnav VM are not supported.
Might be quite fragile on transitions: if dvdnav initiates a transition,
and doesn't give us enough mpeg data to initialize video playback, the
player will just quit.
This is added only because some users seem to want it. I don't intend to
make mpv a good DVD player, so the very basic minimum will have to do.
How about you just convert your DVD to proper video files?
2013-12-12 00:44:28 +00:00
|
|
|
mp_handle_nav(mpctx);
|
|
|
|
|
2013-10-29 21:38:29 +00:00
|
|
|
if (!mpctx->stop_play && !mpctx->restart_playback) {
|
|
|
|
|
|
|
|
// If no more video is available, one frame means one playloop iteration.
|
|
|
|
// Otherwise, one frame means one video frame.
|
|
|
|
if (!video_left)
|
|
|
|
new_frame_shown = true;
|
|
|
|
|
|
|
|
if (opts->playing_msg && !mpctx->playing_msg_shown && new_frame_shown) {
|
|
|
|
mpctx->playing_msg_shown = true;
|
2014-02-20 13:46:23 +00:00
|
|
|
char *msg =
|
|
|
|
mp_property_expand_escaped_string(mpctx, opts->playing_msg);
|
2013-10-29 21:38:29 +00:00
|
|
|
MP_INFO(mpctx, "%s\n", msg);
|
|
|
|
talloc_free(msg);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (mpctx->max_frames >= 0) {
|
|
|
|
if (new_frame_shown)
|
|
|
|
mpctx->max_frames--;
|
|
|
|
if (mpctx->max_frames <= 0)
|
|
|
|
mpctx->stop_play = PT_NEXT_ENTRY;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (mpctx->step_frames > 0 && !mpctx->paused) {
|
|
|
|
if (new_frame_shown)
|
|
|
|
mpctx->step_frames--;
|
|
|
|
if (mpctx->step_frames == 0)
|
2014-02-24 21:49:07 +00:00
|
|
|
pause_player(mpctx, PAUSE_BY_COMMAND);
|
2013-10-29 21:38:29 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!mpctx->stop_play) {
|
|
|
|
double audio_sleep = 9;
|
Add prelimimary (basic, possibly broken) dvdnav support
This readds a more or less completely new dvdnav implementation, though
it's based on the code from before commit 41fbcee. Note that this is
rather basic, and might be broken or not quite usable in many cases.
Most importantly, navigation highlights are not correctly implemented.
This would require changes in the FFmpeg dvdsub decoder (to apply a
different internal CLUT), so supporting it is not really possible right
now. And in fact, I don't think I ever want to support it, because it's
a very small gain for a lot of work. Instead, mpv will display fake
highlights, which are an approximate bounding box around the real
highlights.
Some things like mouse input or switching audio/subtitles stream using
the dvdnav VM are not supported.
Might be quite fragile on transitions: if dvdnav initiates a transition,
and doesn't give us enough mpeg data to initialize video playback, the
player will just quit.
This is added only because some users seem to want it. I don't intend to
make mpv a good DVD player, so the very basic minimum will have to do.
How about you just convert your DVD to proper video files?
2013-12-12 00:44:28 +00:00
|
|
|
if (mpctx->restart_playback)
|
|
|
|
sleeptime = 0;
|
2013-11-23 20:22:17 +00:00
|
|
|
if (mpctx->d_audio && !mpctx->paused) {
|
2014-03-07 14:24:32 +00:00
|
|
|
if (ao_untimed(mpctx->ao)) {
|
2013-10-29 21:38:29 +00:00
|
|
|
if (!video_left)
|
|
|
|
audio_sleep = 0;
|
|
|
|
} else if (full_audio_buffers) {
|
|
|
|
audio_sleep = buffered_audio - 0.050;
|
|
|
|
// Keep extra safety margin if the buffers are large
|
|
|
|
if (audio_sleep > 0.100)
|
|
|
|
audio_sleep = MPMAX(audio_sleep - 0.200, 0.100);
|
|
|
|
else
|
|
|
|
audio_sleep = MPMAX(audio_sleep, 0.020);
|
|
|
|
} else
|
|
|
|
audio_sleep = 0.020;
|
|
|
|
}
|
|
|
|
sleeptime = MPMIN(sleeptime, audio_sleep);
|
|
|
|
if (sleeptime > 0) {
|
|
|
|
if (handle_osd_redraw(mpctx))
|
|
|
|
sleeptime = 0;
|
|
|
|
}
|
|
|
|
if (sleeptime > 0)
|
|
|
|
mp_input_get_cmd(mpctx->input, sleeptime * 1000, true);
|
|
|
|
}
|
|
|
|
|
|
|
|
handle_metadata_update(mpctx);
|
|
|
|
|
|
|
|
handle_pause_on_low_cache(mpctx);
|
|
|
|
|
|
|
|
handle_input_and_seek_coalesce(mpctx);
|
|
|
|
|
|
|
|
handle_backstep(mpctx);
|
|
|
|
|
|
|
|
handle_sstep(mpctx);
|
|
|
|
|
|
|
|
handle_keep_open(mpctx);
|
|
|
|
|
|
|
|
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-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;
|
|
|
|
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);
|
|
|
|
mp_cmd_t *cmd = mp_input_get_cmd(mpctx->input,
|
|
|
|
get_wakeup_period(mpctx) * 1000,
|
|
|
|
false);
|
|
|
|
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
|
|
|
}
|
|
|
|
}
|