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-10-29 21:38:29 +00:00
|
|
|
|
|
|
|
#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-11-23 20:26:31 +00:00
|
|
|
#include "video/hwdec.h"
|
2013-10-29 21:38:29 +00:00
|
|
|
#include "video/filter/vf.h"
|
|
|
|
#include "video/decode/dec_video.h"
|
2013-12-10 18:07:29 +00:00
|
|
|
#include "video/decode/vd.h"
|
2013-10-29 21:38:29 +00:00
|
|
|
#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"
|
|
|
|
|
|
|
|
void update_fps(struct MPContext *mpctx)
|
|
|
|
{
|
2013-07-16 11:28:28 +00:00
|
|
|
#if HAVE_ENCODING
|
2013-11-23 20:36:20 +00:00
|
|
|
struct dec_video *d_video = mpctx->d_video;
|
|
|
|
if (mpctx->encode_lavc_ctx && d_video)
|
2013-11-23 20:41:40 +00:00
|
|
|
encode_lavc_set_video_fps(mpctx->encode_lavc_ctx, d_video->fps);
|
2013-10-29 21:38:29 +00:00
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
2013-12-10 18:24:58 +00:00
|
|
|
static void set_allowed_vo_formats(struct vf_chain *c, struct vo *vo)
|
|
|
|
{
|
|
|
|
for (int fmt = IMGFMT_START; fmt < IMGFMT_END; fmt++) {
|
|
|
|
c->allowed_output_formats[fmt - IMGFMT_START] =
|
|
|
|
vo->driver->query_format(vo, fmt);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void reconfig_video(struct MPContext *mpctx,
|
|
|
|
const struct mp_image_params *params,
|
|
|
|
bool probe_only)
|
|
|
|
{
|
|
|
|
struct dec_video *d_video = mpctx->d_video;
|
|
|
|
|
|
|
|
d_video->decoder_output = *params;
|
|
|
|
|
|
|
|
set_allowed_vo_formats(d_video->vfilter, mpctx->video_out);
|
|
|
|
|
|
|
|
if (video_reconfig_filters(d_video, params) < 0) {
|
|
|
|
// Most video filters don't work with hardware decoding, so this
|
|
|
|
// might be the reason filter reconfig failed.
|
|
|
|
if (!probe_only &&
|
|
|
|
video_vd_control(d_video, VDCTRL_FORCE_HWDEC_FALLBACK, NULL) == CONTROL_OK)
|
|
|
|
{
|
|
|
|
// Fallback active; decoder will return software format next
|
|
|
|
// time. Don't abort video decoding.
|
|
|
|
d_video->vfilter->initialized = 0;
|
|
|
|
}
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (d_video->vfilter->initialized < 1)
|
|
|
|
return;
|
|
|
|
|
|
|
|
struct mp_image_params p = d_video->vfilter->output_params;
|
|
|
|
const struct vo_driver *info = mpctx->video_out->driver;
|
|
|
|
mp_msg(MSGT_CPLAYER, MSGL_INFO, "VO: [%s] %dx%d => %dx%d %s\n",
|
|
|
|
info->name, p.w, p.h, p.d_w, p.d_h, vo_format_name(p.imgfmt));
|
|
|
|
mp_msg(MSGT_CPLAYER, MSGL_V, "VO: Description: %s\n", info->description);
|
|
|
|
|
|
|
|
int r = vo_reconfig(mpctx->video_out, &p, 0);
|
|
|
|
if (r < 0)
|
|
|
|
d_video->vfilter->initialized = -1;
|
|
|
|
}
|
|
|
|
|
2013-10-29 21:38:29 +00:00
|
|
|
static void recreate_video_filters(struct MPContext *mpctx)
|
|
|
|
{
|
|
|
|
struct MPOpts *opts = mpctx->opts;
|
2013-11-23 20:36:20 +00:00
|
|
|
struct dec_video *d_video = mpctx->d_video;
|
|
|
|
assert(d_video);
|
2013-10-29 21:38:29 +00:00
|
|
|
|
2013-12-07 18:32:44 +00:00
|
|
|
vf_destroy(d_video->vfilter);
|
|
|
|
d_video->vfilter = vf_new(opts);
|
|
|
|
d_video->vfilter->hwdec = &d_video->hwdec_info;
|
2013-10-29 21:38:29 +00:00
|
|
|
|
2013-12-07 18:32:44 +00:00
|
|
|
vf_append_filter_list(d_video->vfilter, opts->vf_settings);
|
2013-10-29 21:38:29 +00:00
|
|
|
|
2013-12-07 18:32:44 +00:00
|
|
|
// for vf_sub
|
|
|
|
vf_control_any(d_video->vfilter, VFCTRL_SET_OSD_OBJ, mpctx->osd);
|
2013-10-29 21:38:29 +00:00
|
|
|
mpctx->osd->render_subs_in_filter
|
2013-12-07 18:32:44 +00:00
|
|
|
= vf_control_any(d_video->vfilter, VFCTRL_INIT_OSD, NULL) == CONTROL_OK;
|
2013-12-10 18:24:58 +00:00
|
|
|
|
|
|
|
set_allowed_vo_formats(d_video->vfilter, mpctx->video_out);
|
2013-10-29 21:38:29 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
int reinit_video_filters(struct MPContext *mpctx)
|
|
|
|
{
|
2013-11-23 20:36:20 +00:00
|
|
|
struct dec_video *d_video = mpctx->d_video;
|
2013-10-29 21:38:29 +00:00
|
|
|
|
2013-12-10 18:24:58 +00:00
|
|
|
if (!d_video || !d_video->decoder_output.imgfmt)
|
2013-10-29 21:38:29 +00:00
|
|
|
return -2;
|
|
|
|
|
|
|
|
recreate_video_filters(mpctx);
|
2013-12-10 18:24:58 +00:00
|
|
|
reconfig_video(mpctx, &d_video->decoder_output, true);
|
2013-10-29 21:38:29 +00:00
|
|
|
|
2013-12-07 18:32:44 +00:00
|
|
|
return d_video->vfilter && d_video->vfilter->initialized > 0 ? 0 : -1;
|
2013-10-29 21:38:29 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
int reinit_video_chain(struct MPContext *mpctx)
|
|
|
|
{
|
|
|
|
struct MPOpts *opts = mpctx->opts;
|
|
|
|
assert(!(mpctx->initialized_flags & INITIALIZED_VCODEC));
|
2013-11-23 20:36:20 +00:00
|
|
|
assert(!mpctx->d_video);
|
2013-10-29 21:38:29 +00:00
|
|
|
init_demux_stream(mpctx, STREAM_VIDEO);
|
2013-11-23 20:36:20 +00:00
|
|
|
struct sh_stream *sh = mpctx->sh[STREAM_VIDEO];
|
|
|
|
if (!sh)
|
2013-10-29 21:38:29 +00:00
|
|
|
goto no_video;
|
|
|
|
|
|
|
|
MP_VERBOSE(mpctx, "[V] fourcc:0x%X size:%dx%d fps:%5.3f\n",
|
2013-11-23 20:37:56 +00:00
|
|
|
sh->format,
|
2013-11-23 20:36:20 +00:00
|
|
|
sh->video->disp_w, sh->video->disp_h,
|
|
|
|
sh->video->fps);
|
2013-10-29 21:38:29 +00:00
|
|
|
|
|
|
|
double ar = -1.0;
|
|
|
|
//================== Init VIDEO (codec & libvo) ==========================
|
|
|
|
if (!opts->fixed_vo || !(mpctx->initialized_flags & INITIALIZED_VO)) {
|
|
|
|
mpctx->video_out = init_best_video_out(mpctx->global, mpctx->input,
|
|
|
|
mpctx->encode_lavc_ctx);
|
|
|
|
if (!mpctx->video_out) {
|
|
|
|
MP_FATAL(mpctx, "Error opening/initializing "
|
|
|
|
"the selected video_out (-vo) device.\n");
|
|
|
|
goto err_out;
|
|
|
|
}
|
|
|
|
mpctx->mouse_cursor_visible = true;
|
|
|
|
mpctx->initialized_flags |= INITIALIZED_VO;
|
|
|
|
}
|
|
|
|
|
2013-11-09 23:49:13 +00:00
|
|
|
update_window_title(mpctx, true);
|
2013-10-29 21:38:29 +00:00
|
|
|
|
2013-11-23 20:36:20 +00:00
|
|
|
struct dec_video *d_video = talloc_zero(NULL, struct dec_video);
|
|
|
|
mpctx->d_video = d_video;
|
|
|
|
d_video->opts = mpctx->opts;
|
|
|
|
d_video->header = sh;
|
2013-11-23 20:41:40 +00:00
|
|
|
d_video->fps = sh->video->fps;
|
2013-12-10 18:08:56 +00:00
|
|
|
d_video->vo = mpctx->video_out;
|
2013-11-23 20:36:20 +00:00
|
|
|
mpctx->initialized_flags |= INITIALIZED_VCODEC;
|
|
|
|
|
2013-11-23 20:39:07 +00:00
|
|
|
vo_control(mpctx->video_out, VOCTRL_GET_HWDEC_INFO, &d_video->hwdec_info);
|
2013-11-23 20:36:20 +00:00
|
|
|
|
|
|
|
if (stream_control(sh->demuxer->stream, STREAM_CTRL_GET_ASPECT_RATIO, &ar)
|
|
|
|
!= STREAM_UNSUPPORTED)
|
|
|
|
d_video->stream_aspect = ar;
|
2013-10-29 21:38:29 +00:00
|
|
|
|
|
|
|
recreate_video_filters(mpctx);
|
|
|
|
|
2013-11-23 20:38:39 +00:00
|
|
|
if (!video_init_best_codec(d_video, opts->video_decoders))
|
2013-10-29 21:38:29 +00:00
|
|
|
goto err_out;
|
|
|
|
|
|
|
|
bool saver_state = opts->pause || !opts->stop_screensaver;
|
|
|
|
vo_control(mpctx->video_out, saver_state ? VOCTRL_RESTORE_SCREENSAVER
|
|
|
|
: VOCTRL_KILL_SCREENSAVER, NULL);
|
|
|
|
|
|
|
|
vo_control(mpctx->video_out, mpctx->paused ? VOCTRL_PAUSE
|
|
|
|
: VOCTRL_RESUME, NULL);
|
|
|
|
|
|
|
|
mpctx->restart_playback = true;
|
2013-11-23 20:36:20 +00:00
|
|
|
mpctx->sync_audio_to_video = !sh->attached_picture;
|
2013-10-29 21:38:29 +00:00
|
|
|
mpctx->delay = 0;
|
2013-11-27 19:57:08 +00:00
|
|
|
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-10-29 21:38:29 +00:00
|
|
|
mpctx->vo_pts_history_seek_ts++;
|
|
|
|
|
|
|
|
vo_seek_reset(mpctx->video_out);
|
|
|
|
reset_subtitles(mpctx);
|
|
|
|
|
2013-11-23 20:41:40 +00:00
|
|
|
if (opts->force_fps) {
|
|
|
|
d_video->fps = opts->force_fps;
|
|
|
|
MP_INFO(mpctx, "FPS forced to be %5.3f.\n", d_video->fps);
|
|
|
|
}
|
|
|
|
if (!sh->video->fps && !opts->force_fps && !opts->correct_pts) {
|
|
|
|
MP_ERR(mpctx, "FPS not specified in the "
|
|
|
|
"header or invalid, use the -fps option.\n");
|
|
|
|
}
|
|
|
|
update_fps(mpctx);
|
|
|
|
|
2013-10-29 21:38:29 +00:00
|
|
|
return 1;
|
|
|
|
|
|
|
|
err_out:
|
|
|
|
no_video:
|
|
|
|
uninit_player(mpctx, INITIALIZED_VCODEC | (opts->force_vo ? 0 : INITIALIZED_VO));
|
|
|
|
cleanup_demux_stream(mpctx, STREAM_VIDEO);
|
2013-11-19 21:16:56 +00:00
|
|
|
mpctx->current_track[STREAM_VIDEO] = NULL;
|
2013-10-29 21:38:29 +00:00
|
|
|
handle_force_window(mpctx, true);
|
|
|
|
MP_INFO(mpctx, "Video: no video\n");
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Try to refresh the video by doing a precise seek to the currently displayed
|
|
|
|
// frame. This can go wrong in all sorts of ways, so use sparingly.
|
|
|
|
void mp_force_video_refresh(struct MPContext *mpctx)
|
|
|
|
{
|
|
|
|
struct MPOpts *opts = mpctx->opts;
|
|
|
|
|
|
|
|
// If not paused, the next frame should come soon enough.
|
|
|
|
if (opts->pause && mpctx->last_vo_pts != MP_NOPTS_VALUE)
|
|
|
|
queue_seek(mpctx, MPSEEK_ABSOLUTE, mpctx->last_vo_pts, 1);
|
|
|
|
}
|
|
|
|
|
|
|
|
static bool filter_output_queued_frame(struct MPContext *mpctx)
|
|
|
|
{
|
2013-11-23 20:36:20 +00:00
|
|
|
struct dec_video *d_video = mpctx->d_video;
|
2013-10-29 21:38:29 +00:00
|
|
|
struct vo *video_out = mpctx->video_out;
|
|
|
|
|
2013-12-07 18:32:44 +00:00
|
|
|
struct mp_image *img = vf_output_queued_frame(d_video->vfilter);
|
2013-10-29 21:38:29 +00:00
|
|
|
if (img)
|
|
|
|
vo_queue_image(video_out, img);
|
|
|
|
talloc_free(img);
|
|
|
|
|
|
|
|
return !!img;
|
|
|
|
}
|
|
|
|
|
|
|
|
static bool load_next_vo_frame(struct MPContext *mpctx, bool eof)
|
|
|
|
{
|
|
|
|
if (vo_get_buffered_frame(mpctx->video_out, eof) >= 0)
|
|
|
|
return true;
|
|
|
|
if (filter_output_queued_frame(mpctx))
|
|
|
|
return true;
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2013-12-10 18:24:58 +00:00
|
|
|
// Called after video reinit. This can be generally used to try to insert more
|
|
|
|
// filters using the filter chain edit functionality in command.c.
|
2013-10-29 21:38:29 +00:00
|
|
|
static void init_filter_params(struct MPContext *mpctx)
|
|
|
|
{
|
|
|
|
struct MPOpts *opts = mpctx->opts;
|
|
|
|
|
2013-12-10 18:07:29 +00:00
|
|
|
// Note that the filter chain is already initialized. This code might
|
|
|
|
// recreate the chain a second time, which is not very elegant, but allows
|
|
|
|
// us to test whether enabling deinterlacing works with the current video
|
|
|
|
// format and other filters.
|
|
|
|
if (opts->deinterlace >= 0)
|
|
|
|
mp_property_do("deinterlace", M_PROPERTY_SET, &opts->deinterlace, 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
|
|
|
static void filter_video(struct MPContext *mpctx, struct mp_image *frame,
|
|
|
|
bool reconfig_ok)
|
2013-12-10 18:07:29 +00:00
|
|
|
{
|
|
|
|
struct dec_video *d_video = mpctx->d_video;
|
2013-10-29 21:38:29 +00:00
|
|
|
|
2013-12-10 18:24:58 +00:00
|
|
|
struct mp_image_params params;
|
|
|
|
mp_image_params_from_image(¶ms, frame);
|
|
|
|
if (!mp_image_params_equals(&d_video->decoder_output, ¶ms) ||
|
2013-12-10 18:07:29 +00:00
|
|
|
d_video->vfilter->initialized < 1)
|
|
|
|
{
|
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
|
|
|
// In case we want to wait until filter chain is drained
|
|
|
|
if (!reconfig_ok) {
|
|
|
|
talloc_free(d_video->waiting_decoded_mpi);
|
|
|
|
d_video->waiting_decoded_mpi = frame;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2013-12-10 18:24:58 +00:00
|
|
|
reconfig_video(mpctx, ¶ms, false);
|
2013-12-10 18:07:29 +00:00
|
|
|
if (d_video->vfilter->initialized > 0)
|
|
|
|
init_filter_params(mpctx);
|
2013-10-29 21:38:29 +00:00
|
|
|
}
|
2013-12-10 18:07:29 +00:00
|
|
|
|
|
|
|
if (d_video->vfilter->initialized < 1) {
|
|
|
|
talloc_free(frame);
|
|
|
|
return;
|
|
|
|
}
|
2013-10-29 21:38:29 +00:00
|
|
|
|
2013-11-23 20:39:07 +00:00
|
|
|
mp_image_set_params(frame, &d_video->vf_input); // force csp/aspect overrides
|
2013-11-23 20:36:20 +00:00
|
|
|
vf_filter_frame(d_video->vfilter, frame);
|
2013-10-29 21:38:29 +00:00
|
|
|
filter_output_queued_frame(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
|
|
|
// Reconfigure the video chain and the VO on a format change. This is separate,
|
|
|
|
// because we wait with the reconfig until the currently buffered video has
|
|
|
|
// finished displaying. Otherwise, we'd resize the window and then wait for the
|
|
|
|
// video finishing, which would result in a black window for that frame.
|
|
|
|
// Does nothing if there was no pending change.
|
|
|
|
void video_execute_format_change(struct MPContext *mpctx)
|
|
|
|
{
|
|
|
|
struct dec_video *d_video = mpctx->d_video;
|
|
|
|
struct mp_image *decoded_frame = d_video->waiting_decoded_mpi;
|
|
|
|
d_video->waiting_decoded_mpi = NULL;
|
|
|
|
if (decoded_frame)
|
|
|
|
filter_video(mpctx, decoded_frame, true);
|
|
|
|
}
|
|
|
|
|
2013-10-29 21:38:29 +00:00
|
|
|
static int check_framedrop(struct MPContext *mpctx, double frame_time)
|
|
|
|
{
|
|
|
|
struct MPOpts *opts = mpctx->opts;
|
|
|
|
// check for frame-drop:
|
2013-11-23 20:22:17 +00:00
|
|
|
if (mpctx->d_audio && !mpctx->ao->untimed &&
|
|
|
|
!demux_stream_eof(mpctx->sh[STREAM_AUDIO]))
|
2013-10-29 21:38:29 +00:00
|
|
|
{
|
|
|
|
float delay = opts->playback_speed * ao_get_delay(mpctx->ao);
|
|
|
|
float d = delay - mpctx->delay;
|
2013-11-23 20:41:40 +00:00
|
|
|
float fps = mpctx->d_video->fps;
|
2013-10-29 21:38:29 +00:00
|
|
|
if (frame_time < 0)
|
2013-11-23 20:36:20 +00:00
|
|
|
frame_time = fps > 0 ? 1.0 / fps : 0;
|
2013-10-29 21:38:29 +00:00
|
|
|
// we should avoid dropping too many frames in sequence unless we
|
|
|
|
// are too late. and we allow 100ms A-V delay here:
|
|
|
|
if (d < -mpctx->dropped_frames * frame_time - 0.100 && !mpctx->paused
|
|
|
|
&& !mpctx->restart_playback) {
|
|
|
|
mpctx->drop_frame_cnt++;
|
|
|
|
mpctx->dropped_frames++;
|
|
|
|
return mpctx->opts->frame_dropping;
|
|
|
|
} else
|
|
|
|
mpctx->dropped_frames = 0;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static double update_video_attached_pic(struct MPContext *mpctx)
|
|
|
|
{
|
2013-11-23 20:36:20 +00:00
|
|
|
struct dec_video *d_video = mpctx->d_video;
|
2013-10-29 21:38:29 +00:00
|
|
|
|
|
|
|
// Try to decode the picture multiple times, until it is displayed.
|
|
|
|
if (mpctx->video_out->hasframe)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
struct mp_image *decoded_frame =
|
2013-11-25 22:08:29 +00:00
|
|
|
video_decode(d_video, d_video->header->attached_picture, 0);
|
2013-10-29 21:38:29 +00:00
|
|
|
if (decoded_frame)
|
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
|
|
|
filter_video(mpctx, decoded_frame, true);
|
2013-10-29 21:38:29 +00:00
|
|
|
load_next_vo_frame(mpctx, true);
|
2013-11-27 19:57:08 +00:00
|
|
|
mpctx->video_next_pts = MP_NOPTS_VALUE;
|
2013-10-29 21:38:29 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
double update_video(struct MPContext *mpctx, double endpts)
|
|
|
|
{
|
2013-11-23 20:36:20 +00:00
|
|
|
struct dec_video *d_video = mpctx->d_video;
|
2013-10-29 21:38:29 +00:00
|
|
|
struct vo *video_out = mpctx->video_out;
|
|
|
|
|
2013-11-23 20:36:20 +00:00
|
|
|
if (d_video->header->attached_picture)
|
2013-10-29 21:38:29 +00:00
|
|
|
return update_video_attached_pic(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
|
|
|
if (load_next_vo_frame(mpctx, false)) {
|
|
|
|
// Use currently queued VO frame
|
|
|
|
} else if (d_video->waiting_decoded_mpi) {
|
|
|
|
// Draining on reconfig
|
|
|
|
if (!load_next_vo_frame(mpctx, true))
|
|
|
|
return -1;
|
|
|
|
} else {
|
|
|
|
// Decode a new frame
|
2013-11-26 00:07:14 +00:00
|
|
|
struct demux_packet *pkt = demux_read_packet(d_video->header);
|
2013-11-25 22:08:29 +00:00
|
|
|
if (pkt && pkt->pts != MP_NOPTS_VALUE)
|
|
|
|
pkt->pts += mpctx->video_offset;
|
2013-11-28 12:34:56 +00:00
|
|
|
if ((pkt && pkt->pts >= mpctx->hrseek_pts - .005) ||
|
|
|
|
d_video->has_broken_packet_pts)
|
|
|
|
{
|
2013-10-29 21:38:29 +00:00
|
|
|
mpctx->hrseek_framedrop = false;
|
2013-11-28 12:34:56 +00:00
|
|
|
}
|
2013-10-29 21:38:29 +00:00
|
|
|
int framedrop_type = mpctx->hrseek_active && mpctx->hrseek_framedrop ?
|
|
|
|
1 : check_framedrop(mpctx, -1);
|
|
|
|
struct mp_image *decoded_frame =
|
2013-11-25 22:08:29 +00:00
|
|
|
video_decode(d_video, pkt, framedrop_type);
|
2013-10-29 21:38:29 +00:00
|
|
|
talloc_free(pkt);
|
|
|
|
if (decoded_frame) {
|
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
|
|
|
filter_video(mpctx, decoded_frame, false);
|
2013-10-29 21:38:29 +00:00
|
|
|
} else if (!pkt) {
|
|
|
|
if (!load_next_vo_frame(mpctx, true))
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
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
|
|
|
// Whether the VO has an image queued.
|
|
|
|
// If it does, it will be used to time and display the next frame.
|
2013-10-29 21:38:29 +00:00
|
|
|
if (!video_out->frame_loaded)
|
|
|
|
return 0;
|
|
|
|
|
2013-11-25 22:08:29 +00:00
|
|
|
double pts = video_out->next_pts;
|
2013-10-29 21:38:29 +00:00
|
|
|
if (endpts == MP_NOPTS_VALUE || pts < endpts)
|
|
|
|
add_frame_pts(mpctx, pts);
|
|
|
|
if (mpctx->hrseek_active && pts < mpctx->hrseek_pts - .005) {
|
|
|
|
vo_skip_frame(video_out);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
mpctx->hrseek_active = false;
|
2013-11-27 19:57:08 +00:00
|
|
|
double last_pts = mpctx->video_next_pts;
|
|
|
|
if (last_pts == MP_NOPTS_VALUE)
|
|
|
|
last_pts = pts;
|
2013-11-29 14:06:29 +00:00
|
|
|
double frame_time = pts - last_pts;
|
|
|
|
if (frame_time < 0 || frame_time >= 60) {
|
2013-10-29 21:38:29 +00:00
|
|
|
// Assume a PTS difference >= 60 seconds is a discontinuity.
|
2013-11-27 19:57:08 +00:00
|
|
|
MP_WARN(mpctx, "Jump in video pts: %f -> %f\n", last_pts, pts);
|
|
|
|
frame_time = 0;
|
2013-10-29 21:38:29 +00:00
|
|
|
}
|
2013-11-27 19:57:08 +00:00
|
|
|
mpctx->video_next_pts = pts;
|
2013-11-23 20:22:17 +00:00
|
|
|
if (mpctx->d_audio)
|
2013-10-29 21:38:29 +00:00
|
|
|
mpctx->delay -= frame_time;
|
|
|
|
return frame_time;
|
|
|
|
}
|