mirror of
https://github.com/mpv-player/mpv
synced 2025-01-07 23:50:25 +00:00
c4b08a9a11
There was a MPOpts fullscreen field, a mp_vo_opts.fs field, and VOFLAG_FULLSCREEN. Remove all these and introduce a mp_vo_opts.fullscreen flag instead. When VOs receive VOCTRL_FULLSCREEN, they are supposed to set the current fullscreen mode to the state in mp_vo_opts.fullscreen. They also should do this implicitly on config(). VOs which are capable of doing so can update the mp_vo_opts.fullscreen if the actual fullscreen mode changes (e.g. if the user uses the window manager controls). If fullscreen mode switching fails, they can also set mp_vo_opts.fullscreen to the actual state. Note that the X11 backend does almost none of this, and it has a private fs flag to store the fullscreen flag, instead of getting it from the WM. (Possibly because it has to deal with broken WMs.) The fullscreen option has to be checked on config() to deal with the -fs option, especially with something like: mpv --fs file1.mkv --{ --no-fs file2.mkv --} (It should start in fullscreen mode, but go to windowed mode when playing file2.mkv.) Wayland changes by: Alexander Preisinger <alexander.preisinger@gmail.com> Cocoa changes by: Stefano Pigozzi <stefano.pigozzi@gmail.com>
202 lines
6.6 KiB
C
202 lines
6.6 KiB
C
/*
|
|
* 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 <stdbool.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <assert.h>
|
|
|
|
#include "config.h"
|
|
#include "core/mp_msg.h"
|
|
#include "core/options.h"
|
|
|
|
#include "video/img_format.h"
|
|
|
|
#include "stream/stream.h"
|
|
#include "demux/stheader.h"
|
|
#include "dec_video.h"
|
|
|
|
#include "vd.h"
|
|
#include "video/filter/vf.h"
|
|
#include "video/out/vo.h"
|
|
|
|
extern const vd_functions_t mpcodecs_vd_ffmpeg;
|
|
|
|
/* Please do not add any new decoders here. If you want to implement a new
|
|
* decoder, add it to libavcodec, except for wrappers around external
|
|
* libraries and decoders requiring binary support. */
|
|
|
|
const vd_functions_t * const mpcodecs_vd_drivers[] = {
|
|
&mpcodecs_vd_ffmpeg,
|
|
/* Please do not add any new decoders here. If you want to implement a new
|
|
* decoder, add it to libavcodec, except for wrappers around external
|
|
* libraries and decoders requiring binary support. */
|
|
NULL
|
|
};
|
|
|
|
int mpcodecs_reconfig_vo(sh_video_t *sh, const struct mp_image_params *params)
|
|
{
|
|
struct MPOpts *opts = sh->opts;
|
|
vf_instance_t *vf = sh->vfilter;
|
|
int vocfg_flags = 0;
|
|
struct mp_image_params p = *params;
|
|
|
|
if (!p.w || !p.h) {
|
|
// ideally, this should be dead code
|
|
mp_msg(MSGT_DECVIDEO, MSGL_WARN, "Unknown size, using container size.\n");
|
|
p.w = sh->disp_w;
|
|
p.h = sh->disp_h;
|
|
} else {
|
|
sh->disp_w = p.w;
|
|
sh->disp_h = p.h;
|
|
}
|
|
|
|
mp_msg(MSGT_DECVIDEO, MSGL_V,
|
|
"VIDEO: %dx%d %5.3f fps %5.1f kbps (%4.1f kB/s)\n",
|
|
sh->disp_w, sh->disp_h, sh->fps, sh->i_bps * 0.008,
|
|
sh->i_bps / 1000.0);
|
|
|
|
if (!sh->disp_w || !sh->disp_h)
|
|
return -1;
|
|
|
|
mp_msg(MSGT_DECVIDEO, MSGL_V, "VDec: vo config request - %d x %d (%s)\n",
|
|
p.w, p.h, vo_format_name(p.imgfmt));
|
|
|
|
if (get_video_quality_max(sh) <= 0 && opts->divx_quality) {
|
|
// user wants postprocess but no pp filter yet:
|
|
sh->vfilter = vf = vf_open_filter(opts, vf, "pp", NULL);
|
|
}
|
|
|
|
// check if libvo and codec has common outfmt (no conversion):
|
|
int flags = 0;
|
|
for (;;) {
|
|
mp_msg(MSGT_VFILTER, MSGL_V, "Trying filter chain:\n");
|
|
vf_print_filter_chain(MSGL_V, vf);
|
|
|
|
flags = vf->query_format(vf, p.imgfmt);
|
|
mp_msg(MSGT_CPLAYER, MSGL_DBG2, "vo_debug: query(%s) returned 0x%X \n",
|
|
vo_format_name(p.imgfmt), flags);
|
|
if ((flags & VFCAP_CSP_SUPPORTED_BY_HW)
|
|
|| (flags & VFCAP_CSP_SUPPORTED))
|
|
{
|
|
break;
|
|
}
|
|
// TODO: no match - we should use conversion...
|
|
if (strcmp(vf->info->name, "scale")) {
|
|
mp_tmsg(MSGT_DECVIDEO, MSGL_INFO, "Could not find matching colorspace - retrying with -vf scale...\n");
|
|
vf = vf_open_filter(opts, vf, "scale", NULL);
|
|
continue;
|
|
}
|
|
mp_tmsg(MSGT_CPLAYER, MSGL_WARN,
|
|
"The selected video_out device is incompatible with this codec.\n"\
|
|
"Try appending the scale filter to your filter list,\n"\
|
|
"e.g. -vf filter,scale instead of -vf filter.\n");
|
|
mp_tmsg(MSGT_VFILTER, MSGL_WARN, "Attempted filter chain:\n");
|
|
vf_print_filter_chain(MSGL_WARN, vf);
|
|
sh->vf_initialized = -1;
|
|
return -1; // failed
|
|
}
|
|
sh->vfilter = vf;
|
|
|
|
// autodetect flipping
|
|
bool flip = opts->flip;
|
|
if (flip && !(flags & VFCAP_FLIP)) {
|
|
// we need to flip, but no flipping filter avail.
|
|
vf_add_before_vo(&vf, "flip", NULL);
|
|
sh->vfilter = vf;
|
|
flip = false;
|
|
}
|
|
// time to do aspect ratio corrections...
|
|
|
|
if (opts->movie_aspect > -1.0)
|
|
sh->aspect = opts->movie_aspect; // cmdline overrides autodetect
|
|
else if (sh->stream_aspect != 0.0)
|
|
sh->aspect = sh->stream_aspect;
|
|
|
|
int d_w = sh->disp_w;
|
|
int d_h = sh->disp_h;
|
|
|
|
if (sh->aspect > 0.01) {
|
|
int new_w = d_h * sh->aspect;
|
|
int new_h = d_h;
|
|
// we don't like horizontal downscale
|
|
if (new_w < d_w) {
|
|
new_w = d_w;
|
|
new_h = d_w / sh->aspect;
|
|
}
|
|
if (abs(d_w - new_w) >= 4 || abs(d_h - new_h) >= 4) {
|
|
d_w = new_w;
|
|
d_h = new_h;
|
|
mp_tmsg(MSGT_CPLAYER, MSGL_V, "Aspect ratio is %.2f:1 - "
|
|
"scaling to correct movie aspect.\n", sh->aspect);
|
|
}
|
|
|
|
mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_VIDEO_ASPECT=%1.4f\n", sh->aspect);
|
|
}
|
|
|
|
p.d_w = d_w;
|
|
p.d_h = d_h;
|
|
|
|
// Apply user overrides
|
|
if (opts->requested_colorspace != MP_CSP_AUTO)
|
|
p.colorspace = opts->requested_colorspace;
|
|
if (opts->requested_input_range != MP_CSP_LEVELS_AUTO)
|
|
p.colorlevels = opts->requested_input_range;
|
|
|
|
// Detect colorspace from resolution.
|
|
// Make sure the user-overrides are consistent (no RGB csp for YUV, etc.).
|
|
mp_image_params_guess_csp(&p);
|
|
|
|
vocfg_flags = (flip ? VOFLAG_FLIPPING : 0);
|
|
|
|
// Time to config libvo!
|
|
mp_msg(MSGT_CPLAYER, MSGL_V,
|
|
"VO Config (%dx%d->%dx%d,flags=%d,0x%X)\n", sh->disp_w,
|
|
sh->disp_h, d_w, d_h, vocfg_flags, p.imgfmt);
|
|
|
|
if (vf_reconfig_wrapper(vf, &p, vocfg_flags) < 0) {
|
|
mp_tmsg(MSGT_CPLAYER, MSGL_WARN, "FATAL: Cannot initialize video driver.\n");
|
|
sh->vf_initialized = -1;
|
|
return -1;
|
|
}
|
|
|
|
mp_tmsg(MSGT_VFILTER, MSGL_V, "Video filter chain:\n");
|
|
vf_print_filter_chain(MSGL_V, vf);
|
|
|
|
sh->vf_initialized = 1;
|
|
|
|
if (!sh->vf_input)
|
|
sh->vf_input = talloc(sh, struct mp_image_params);
|
|
*sh->vf_input = p;
|
|
|
|
set_video_output_levels(sh);
|
|
|
|
if (opts->gamma_gamma != 1000)
|
|
set_video_colors(sh, "gamma", opts->gamma_gamma);
|
|
if (opts->gamma_brightness != 1000)
|
|
set_video_colors(sh, "brightness", opts->gamma_brightness);
|
|
if (opts->gamma_contrast != 1000)
|
|
set_video_colors(sh, "contrast", opts->gamma_contrast);
|
|
if (opts->gamma_saturation != 1000)
|
|
set_video_colors(sh, "saturation", opts->gamma_saturation);
|
|
if (opts->gamma_hue != 1000)
|
|
set_video_colors(sh, "hue", opts->gamma_hue);
|
|
|
|
return 0;
|
|
}
|