diff options
| author | sfan5 <sfan5@live.de> | 2020-09-20 12:04:25 +0200 |
|---|---|---|
| committer | sfan5 <sfan5@live.de> | 2020-09-20 12:04:25 +0200 |
| commit | 3054bcc62c04f8d360aba3c6f24982e78b25bcb0 (patch) | |
| tree | c54188323ff6f18c5e6a2c132d99044c6982783a /options | |
| parent | 7831e52238790bf1742b194e0469cf3db5f59bdd (diff) | |
| download | mpv-3054bcc62c04f8d360aba3c6f24982e78b25bcb0.tar.bz2 mpv-3054bcc62c04f8d360aba3c6f24982e78b25bcb0.tar.xz | |
options: simplify --android-surface-size handling
Diffstat (limited to 'options')
| -rw-r--r-- | options/m_option.h | 1 | ||||
| -rw-r--r-- | options/options.c | 8 | ||||
| -rw-r--r-- | options/options.h | 3 |
3 files changed, 5 insertions, 7 deletions
diff --git a/options/m_option.h b/options/m_option.h index bfaaef8d07..afd86eaf96 100644 --- a/options/m_option.h +++ b/options/m_option.h @@ -417,7 +417,6 @@ char *format_file_size(int64_t size); #define UPDATE_SCREENSAVER (1 << 16) // --stop-screensaver #define UPDATE_VOL (1 << 17) // softvol related options #define UPDATE_LAVFI_COMPLEX (1 << 18) // --lavfi-complex -#define UPDATE_VO_RESIZE (1 << 19) // --android-surface-size #define UPDATE_HWDEC (1 << 20) // --hwdec #define UPDATE_DVB_PROG (1 << 21) // some --dvbin-... #define UPDATE_SUB_HARD (1 << 22) // subtitle opts. that need full reinit diff --git a/options/options.c b/options/options.c index 1f6f943fdc..88b78565ed 100644 --- a/options/options.c +++ b/options/options.c @@ -92,7 +92,6 @@ extern const struct m_sub_options d3d11va_conf; extern const struct m_sub_options angle_conf; extern const struct m_sub_options cocoa_conf; extern const struct m_sub_options macos_conf; -extern const struct m_sub_options android_conf; extern const struct m_sub_options wayland_conf; extern const struct m_sub_options vaapi_conf; @@ -167,6 +166,9 @@ static const m_option_t mp_vo_opt_list[] = { #if HAVE_DRM {"", OPT_SUBSTRUCT(drm_opts, drm_conf)}, #endif +#if HAVE_EGL_ANDROID + {"android-surface-size", OPT_SIZE_BOX(android_surface_size)}, +#endif {"swapchain-depth", OPT_INT(swapchain_depth), M_RANGE(1, 8)}, {0} }; @@ -784,10 +786,6 @@ static const m_option_t mp_opts[] = { {"", OPT_SUBSTRUCT(macos_opts, macos_conf)}, #endif -#if HAVE_EGL_ANDROID - {"", OPT_SUBSTRUCT(android_opts, android_conf)}, -#endif - #if HAVE_WAYLAND {"", OPT_SUBSTRUCT(wayland_opts, wayland_conf)}, #endif diff --git a/options/options.h b/options/options.h index 62eef010d7..9b93588bec 100644 --- a/options/options.h +++ b/options/options.h @@ -62,6 +62,8 @@ typedef struct mp_vo_opts { // vo_drm struct drm_opts *drm_opts; + struct m_geometry android_surface_size; + int swapchain_depth; // max number of images to render ahead } mp_vo_opts; @@ -340,7 +342,6 @@ typedef struct MPOpts { struct d3d11va_opts *d3d11va_opts; struct cocoa_opts *cocoa_opts; struct macos_opts *macos_opts; - struct android_opts *android_opts; struct wayland_opts *wayland_opts; struct dvd_opts *dvd_opts; struct vaapi_opts *vaapi_opts; |