RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity
mpv/video/out/vo_sdl.c

1048 lines
31 KiB
C
Raw Normal View History

vo/ao: SDL 1.2+ audio driver, SDL 2.0+ accelerated video driver This mainly serves as a fallback for platforms where nothing better is available; also as a debugging help. Both the audio and video driver are not first class - the audio driver lacks delay detection, and the video driver only supports a single YUV color space. Configure options: --disable-sdl2 to disable SDL 2.0+ detection, --disable-sdl to disable SDL 1.2+ detection. Both options need to be specified to turn off SDL support entirely.
2012-12-28 07:07:14 +00:00
/*
sdl, encode_lavc: fix copyright headers Some of them had changes in 2012; extend their header. Fix project name.
2012-12-28 10:41:30 +00:00
* video output driver for SDL 2.0+
Update license headers Signed-off-by: wm4 <wm4@nowhere>
2015-04-13 07:36:54 +00:00
*
sdl, encode_lavc: fix copyright headers Some of them had changes in 2012; extend their header. Fix project name.
2012-12-28 10:41:30 +00:00
* Copyright (C) 2012 Rudolf Polzer <divVerent@xonotic.org>
vo/ao: SDL 1.2+ audio driver, SDL 2.0+ accelerated video driver This mainly serves as a fallback for platforms where nothing better is available; also as a debugging help. Both the audio and video driver are not first class - the audio driver lacks delay detection, and the video driver only supports a single YUV color space. Configure options: --disable-sdl2 to disable SDL 2.0+ detection, --disable-sdl to disable SDL 1.2+ detection. Both options need to be specified to turn off SDL support entirely.
2012-12-28 07:07:14 +00:00
*
sdl, encode_lavc: fix copyright headers Some of them had changes in 2012; extend their header. Fix project name.
2012-12-28 10:41:30 +00:00
* This file is part of mpv.
vo/ao: SDL 1.2+ audio driver, SDL 2.0+ accelerated video driver This mainly serves as a fallback for platforms where nothing better is available; also as a debugging help. Both the audio and video driver are not first class - the audio driver lacks delay detection, and the video driver only supports a single YUV color space. Configure options: --disable-sdl2 to disable SDL 2.0+ detection, --disable-sdl to disable SDL 1.2+ detection. Both options need to be specified to turn off SDL support entirely.
2012-12-28 07:07:14 +00:00
*
Update license headers Signed-off-by: wm4 <wm4@nowhere>
2015-04-13 07:36:54 +00:00
* mpv is free software; you can redistribute it and/or modify
vo/ao: SDL 1.2+ audio driver, SDL 2.0+ accelerated video driver This mainly serves as a fallback for platforms where nothing better is available; also as a debugging help. Both the audio and video driver are not first class - the audio driver lacks delay detection, and the video driver only supports a single YUV color space. Configure options: --disable-sdl2 to disable SDL 2.0+ detection, --disable-sdl to disable SDL 1.2+ detection. Both options need to be specified to turn off SDL support entirely.
2012-12-28 07:07:14 +00:00
* 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.
*
Update license headers Signed-off-by: wm4 <wm4@nowhere>
2015-04-13 07:36:54 +00:00
* mpv is distributed in the hope that it will be useful,
vo/ao: SDL 1.2+ audio driver, SDL 2.0+ accelerated video driver This mainly serves as a fallback for platforms where nothing better is available; also as a debugging help. Both the audio and video driver are not first class - the audio driver lacks delay detection, and the video driver only supports a single YUV color space. Configure options: --disable-sdl2 to disable SDL 2.0+ detection, --disable-sdl to disable SDL 1.2+ detection. Both options need to be specified to turn off SDL support entirely.
2012-12-28 07:07:14 +00:00
* 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
Update license headers Signed-off-by: wm4 <wm4@nowhere>
2015-04-13 07:36:54 +00:00
* with mpv. If not, see <http://www.gnu.org/licenses/>.
vo/ao: SDL 1.2+ audio driver, SDL 2.0+ accelerated video driver This mainly serves as a fallback for platforms where nothing better is available; also as a debugging help. Both the audio and video driver are not first class - the audio driver lacks delay detection, and the video driver only supports a single YUV color space. Configure options: --disable-sdl2 to disable SDL 2.0+ detection, --disable-sdl to disable SDL 1.2+ detection. Both options need to be specified to turn off SDL support entirely.
2012-12-28 07:07:14 +00:00
*/
#include <stdio.h>
#include <stdlib.h>
#include <sys/stat.h>
#include <unistd.h>
#include <string.h>
#include <time.h>
#include <errno.h>
#include <assert.h>
#include <SDL.h>
Move mpvcore/input/ to input/
2013-12-17 00:23:09 +00:00
#include "input/input.h"
#include "input/keycodes.h"
#include "input/input.h"
Split mpvcore/ into common/, misc/, bstr/
2013-12-17 01:39:45 +00:00
#include "common/msg.h"
Move options/config related files from mpvcore/ to options/ Since m_option.h and options.h are extremely often included, a lot of files have to be changed. Moving path.c/h to options/ is a bit questionable, but since this is mainly about access to config files (which are also handled in options/), it's probably ok.
2013-12-17 01:02:25 +00:00
#include "options/options.h"
vo/ao: SDL 1.2+ audio driver, SDL 2.0+ accelerated video driver This mainly serves as a fallback for platforms where nothing better is available; also as a debugging help. Both the audio and video driver are not first class - the audio driver lacks delay detection, and the video driver only supports a single YUV color space. Configure options: --disable-sdl2 to disable SDL 2.0+ detection, --disable-sdl to disable SDL 1.2+ detection. Both options need to be specified to turn off SDL support entirely.
2012-12-28 07:07:14 +00:00
#include "osdep/timer.h"
Rename sub.c/.h to osd.c/.h This was way too misleading. osd.c merely calls the subtitle renderers, instead of actually dealing with subtitles.
2013-11-24 11:58:06 +00:00
#include "sub/osd.h"
vo/ao: SDL 1.2+ audio driver, SDL 2.0+ accelerated video driver This mainly serves as a fallback for platforms where nothing better is available; also as a debugging help. Both the audio and video driver are not first class - the audio driver lacks delay detection, and the video driver only supports a single YUV color space. Configure options: --disable-sdl2 to disable SDL 2.0+ detection, --disable-sdl to disable SDL 1.2+ detection. Both options need to be specified to turn off SDL support entirely.
2012-12-28 07:07:14 +00:00
#include "video/mp_image.h"
vo_sdl: don't use VOCTRL_UPDATE_SCREENINFO
2014-05-06 18:35:19 +00:00
#include "win_state.h"
vo/ao: SDL 1.2+ audio driver, SDL 2.0+ accelerated video driver This mainly serves as a fallback for platforms where nothing better is available; also as a debugging help. Both the audio and video driver are not first class - the audio driver lacks delay detection, and the video driver only supports a single YUV color space. Configure options: --disable-sdl2 to disable SDL 2.0+ detection, --disable-sdl to disable SDL 1.2+ detection. Both options need to be specified to turn off SDL support entirely.
2012-12-28 07:07:14 +00:00
#include "config.h"
#include "vo.h"
struct formatmap_entry {
Uint32 sdl;
unsigned int mpv;
int is_rgba;
};
const struct formatmap_entry formats[] = {
video: decouple internal pixel formats from FourCCs mplayer's video chain traditionally used FourCCs for pixel formats. For example, it used IMGFMT_YV12 for 4:2:0 YUV, which was defined to the string 'YV12' interpreted as unsigned int. Additionally, it used to encode information into the numeric values of some formats. The RGB formats had their bit depth and endian encoded into the least significant byte. Extended planar formats (420P10 etc.) had chroma shift, endian, and component bit depth encoded. (This has been removed in recent commits.) Replace the FourCC mess with a simple enum. Remove all the redundant formats like YV12/I420/IYUV. Replace some image format names by something more intuitive, most importantly IMGFMT_YV12 -> IMGFMT_420P. Add img_fourcc.h, which contains the old IDs for code that actually uses FourCCs. Change the way demuxers, that output raw video, identify the video format: they set either MP_FOURCC_RAWVIDEO or MP_FOURCC_IMGFMT to request the rawvideo decoder, and sh_video->imgfmt specifies the pixel format. Like the previous hack, this is supposed to avoid the need for a complete codecs.cfg entry per format, or other lookup tables. (Note that the RGB raw video FourCCs mostly rely on ffmpeg's mappings for NUT raw video, but this is still considered better than adding a raw video decoder - even if trivial, it would be full of annoying lookup tables.) The TV code has not been tested. Some corrective changes regarding endian and other image format flags creep in.
2012-12-23 19:03:30 +00:00
{SDL_PIXELFORMAT_YV12, IMGFMT_420P, 0},
{SDL_PIXELFORMAT_IYUV, IMGFMT_420P, 0},
{SDL_PIXELFORMAT_YUY2, IMGFMT_YUYV, 0},
vo/ao: SDL 1.2+ audio driver, SDL 2.0+ accelerated video driver This mainly serves as a fallback for platforms where nothing better is available; also as a debugging help. Both the audio and video driver are not first class - the audio driver lacks delay detection, and the video driver only supports a single YUV color space. Configure options: --disable-sdl2 to disable SDL 2.0+ detection, --disable-sdl to disable SDL 1.2+ detection. Both options need to be specified to turn off SDL support entirely.
2012-12-28 07:07:14 +00:00
{SDL_PIXELFORMAT_UYVY, IMGFMT_UYVY, 0},
video: decouple internal pixel formats from FourCCs mplayer's video chain traditionally used FourCCs for pixel formats. For example, it used IMGFMT_YV12 for 4:2:0 YUV, which was defined to the string 'YV12' interpreted as unsigned int. Additionally, it used to encode information into the numeric values of some formats. The RGB formats had their bit depth and endian encoded into the least significant byte. Extended planar formats (420P10 etc.) had chroma shift, endian, and component bit depth encoded. (This has been removed in recent commits.) Replace the FourCC mess with a simple enum. Remove all the redundant formats like YV12/I420/IYUV. Replace some image format names by something more intuitive, most importantly IMGFMT_YV12 -> IMGFMT_420P. Add img_fourcc.h, which contains the old IDs for code that actually uses FourCCs. Change the way demuxers, that output raw video, identify the video format: they set either MP_FOURCC_RAWVIDEO or MP_FOURCC_IMGFMT to request the rawvideo decoder, and sh_video->imgfmt specifies the pixel format. Like the previous hack, this is supposed to avoid the need for a complete codecs.cfg entry per format, or other lookup tables. (Note that the RGB raw video FourCCs mostly rely on ffmpeg's mappings for NUT raw video, but this is still considered better than adding a raw video decoder - even if trivial, it would be full of annoying lookup tables.) The TV code has not been tested. Some corrective changes regarding endian and other image format flags creep in.
2012-12-23 19:03:30 +00:00
//{SDL_PIXELFORMAT_YVYU, IMGFMT_YVYU, 0},
vo/ao: SDL 1.2+ audio driver, SDL 2.0+ accelerated video driver This mainly serves as a fallback for platforms where nothing better is available; also as a debugging help. Both the audio and video driver are not first class - the audio driver lacks delay detection, and the video driver only supports a single YUV color space. Configure options: --disable-sdl2 to disable SDL 2.0+ detection, --disable-sdl to disable SDL 1.2+ detection. Both options need to be specified to turn off SDL support entirely.
2012-12-28 07:07:14 +00:00
#if BYTE_ORDER == BIG_ENDIAN
{SDL_PIXELFORMAT_RGBX8888, IMGFMT_RGBA, 0}, // has no alpha -> bad for OSD
{SDL_PIXELFORMAT_BGRX8888, IMGFMT_BGRA, 0}, // has no alpha -> bad for OSD
vo_sdl: some OSD optimizations The premultiplied-alpha hack is changed: - The first stage now uses a colormod of black with an unmodified texture. This saves on applying the AND mask of 0xFF000000 to keep alpha only. - The second stage no longer uses an AND mask, but only an OR mask of 0xFF000000 to cancel out alpha. - The texture uploads are no longer done using SDL_LockTexture, SDL_ConvertPixels, SDL_UnlockTexture when the mpv pixel format matches the OSD's pixel format. Instead, SDL_UploadTexture is used, which saves a copy when using the "opengl" renderer.
2012-12-28 13:27:03 +00:00
{SDL_PIXELFORMAT_ARGB8888, IMGFMT_ARGB, 1}, // matches SUBBITMAP_RGBA
vo/ao: SDL 1.2+ audio driver, SDL 2.0+ accelerated video driver This mainly serves as a fallback for platforms where nothing better is available; also as a debugging help. Both the audio and video driver are not first class - the audio driver lacks delay detection, and the video driver only supports a single YUV color space. Configure options: --disable-sdl2 to disable SDL 2.0+ detection, --disable-sdl to disable SDL 1.2+ detection. Both options need to be specified to turn off SDL support entirely.
2012-12-28 07:07:14 +00:00
{SDL_PIXELFORMAT_RGBA8888, IMGFMT_RGBA, 1},
{SDL_PIXELFORMAT_ABGR8888, IMGFMT_ABGR, 1},
{SDL_PIXELFORMAT_BGRA8888, IMGFMT_BGRA, 1},
{SDL_PIXELFORMAT_RGB24, IMGFMT_RGB24, 0},
{SDL_PIXELFORMAT_BGR24, IMGFMT_BGR24, 0},
{SDL_PIXELFORMAT_RGB888, IMGFMT_RGB24, 0},
{SDL_PIXELFORMAT_BGR888, IMGFMT_BGR24, 0},
video: synchronize mpv rgb pixel format names with ffmpeg names This affects packed RGB formats up to 16 bits per pixel. The old mplayer names used LSB-to-MSB order, while FFmpeg (and some other libraries) use MSB-to-LSB. Nothing should change with this commit, i.e. no bit order or endian bugs should be added or fixed. In some cases, the name stays the same, even though the byte order changes, e.g. RGB8->BGR8 and BGR8->RGB8, and this affects the user-visible names too; this might cause confusion.
2014-06-14 08:03:04 +00:00
{SDL_PIXELFORMAT_RGB565, IMGFMT_BGR565, 0},
{SDL_PIXELFORMAT_BGR565, IMGFMT_RGB565, 0},
{SDL_PIXELFORMAT_RGB555, IMGFMT_BGR555, 0},
{SDL_PIXELFORMAT_BGR555, IMGFMT_RGB555, 0},
{SDL_PIXELFORMAT_RGB444, IMGFMT_BGR444, 0}
vo/ao: SDL 1.2+ audio driver, SDL 2.0+ accelerated video driver This mainly serves as a fallback for platforms where nothing better is available; also as a debugging help. Both the audio and video driver are not first class - the audio driver lacks delay detection, and the video driver only supports a single YUV color space. Configure options: --disable-sdl2 to disable SDL 2.0+ detection, --disable-sdl to disable SDL 1.2+ detection. Both options need to be specified to turn off SDL support entirely.
2012-12-28 07:07:14 +00:00
#else
{SDL_PIXELFORMAT_RGBX8888, IMGFMT_ABGR, 0}, // has no alpha -> bad for OSD
{SDL_PIXELFORMAT_BGRX8888, IMGFMT_ARGB, 0}, // has no alpha -> bad for OSD
vo_sdl: some OSD optimizations The premultiplied-alpha hack is changed: - The first stage now uses a colormod of black with an unmodified texture. This saves on applying the AND mask of 0xFF000000 to keep alpha only. - The second stage no longer uses an AND mask, but only an OR mask of 0xFF000000 to cancel out alpha. - The texture uploads are no longer done using SDL_LockTexture, SDL_ConvertPixels, SDL_UnlockTexture when the mpv pixel format matches the OSD's pixel format. Instead, SDL_UploadTexture is used, which saves a copy when using the "opengl" renderer.
2012-12-28 13:27:03 +00:00
{SDL_PIXELFORMAT_ARGB8888, IMGFMT_BGRA, 1}, // matches SUBBITMAP_RGBA
vo/ao: SDL 1.2+ audio driver, SDL 2.0+ accelerated video driver This mainly serves as a fallback for platforms where nothing better is available; also as a debugging help. Both the audio and video driver are not first class - the audio driver lacks delay detection, and the video driver only supports a single YUV color space. Configure options: --disable-sdl2 to disable SDL 2.0+ detection, --disable-sdl to disable SDL 1.2+ detection. Both options need to be specified to turn off SDL support entirely.
2012-12-28 07:07:14 +00:00
{SDL_PIXELFORMAT_RGBA8888, IMGFMT_ABGR, 1},
{SDL_PIXELFORMAT_ABGR8888, IMGFMT_RGBA, 1},
{SDL_PIXELFORMAT_BGRA8888, IMGFMT_ARGB, 1},
{SDL_PIXELFORMAT_RGB24, IMGFMT_RGB24, 0},
{SDL_PIXELFORMAT_BGR24, IMGFMT_BGR24, 0},
{SDL_PIXELFORMAT_RGB888, IMGFMT_BGR24, 0},
{SDL_PIXELFORMAT_BGR888, IMGFMT_RGB24, 0},
video: synchronize mpv rgb pixel format names with ffmpeg names This affects packed RGB formats up to 16 bits per pixel. The old mplayer names used LSB-to-MSB order, while FFmpeg (and some other libraries) use MSB-to-LSB. Nothing should change with this commit, i.e. no bit order or endian bugs should be added or fixed. In some cases, the name stays the same, even though the byte order changes, e.g. RGB8->BGR8 and BGR8->RGB8, and this affects the user-visible names too; this might cause confusion.
2014-06-14 08:03:04 +00:00
{SDL_PIXELFORMAT_RGB565, IMGFMT_RGB565, 0},
{SDL_PIXELFORMAT_BGR565, IMGFMT_RGB565, 0},
{SDL_PIXELFORMAT_RGB555, IMGFMT_RGB555, 0},
{SDL_PIXELFORMAT_BGR555, IMGFMT_BGR555, 0},
{SDL_PIXELFORMAT_RGB444, IMGFMT_RGB444, 0}
vo/ao: SDL 1.2+ audio driver, SDL 2.0+ accelerated video driver This mainly serves as a fallback for platforms where nothing better is available; also as a debugging help. Both the audio and video driver are not first class - the audio driver lacks delay detection, and the video driver only supports a single YUV color space. Configure options: --disable-sdl2 to disable SDL 2.0+ detection, --disable-sdl to disable SDL 1.2+ detection. Both options need to be specified to turn off SDL support entirely.
2012-12-28 07:07:14 +00:00
#endif
};
struct keymap_entry {
SDL_Keycode sdl;
int mpv;
};
const struct keymap_entry keys[] = {
Prefix keycode defines with MP_ Do this to reduce conflicts with <linux/input.h>, which contains some conflicting defines. This changes the meaning of MP_KEY_DOWN: KEY_DOWN is renamed to MP_KEY_DOWN (cursor down key) MP_KEY_DOWN is renamed to MP_KEY_STATE_DOWN (modifier for key down state)
2013-02-12 00:34:04 +00:00
{SDLK_RETURN, MP_KEY_ENTER},
{SDLK_ESCAPE, MP_KEY_ESC},
{SDLK_BACKSPACE, MP_KEY_BACKSPACE},
{SDLK_TAB, MP_KEY_TAB},
{SDLK_PRINTSCREEN, MP_KEY_PRINT},
{SDLK_PAUSE, MP_KEY_PAUSE},
{SDLK_INSERT, MP_KEY_INSERT},
{SDLK_HOME, MP_KEY_HOME},
{SDLK_PAGEUP, MP_KEY_PAGE_UP},
{SDLK_DELETE, MP_KEY_DELETE},
{SDLK_END, MP_KEY_END},
{SDLK_PAGEDOWN, MP_KEY_PAGE_DOWN},
{SDLK_RIGHT, MP_KEY_RIGHT},
{SDLK_LEFT, MP_KEY_LEFT},
{SDLK_DOWN, MP_KEY_DOWN},
{SDLK_UP, MP_KEY_UP},
{SDLK_KP_ENTER, MP_KEY_KPENTER},
{SDLK_KP_1, MP_KEY_KP1},
{SDLK_KP_2, MP_KEY_KP2},
{SDLK_KP_3, MP_KEY_KP3},
{SDLK_KP_4, MP_KEY_KP4},
{SDLK_KP_5, MP_KEY_KP5},
{SDLK_KP_6, MP_KEY_KP6},
{SDLK_KP_7, MP_KEY_KP7},
{SDLK_KP_8, MP_KEY_KP8},
{SDLK_KP_9, MP_KEY_KP9},
{SDLK_KP_0, MP_KEY_KP0},
{SDLK_KP_PERIOD, MP_KEY_KPDEC},
{SDLK_POWER, MP_KEY_POWER},
{SDLK_MENU, MP_KEY_MENU},
{SDLK_STOP, MP_KEY_STOP},
{SDLK_MUTE, MP_KEY_MUTE},
{SDLK_VOLUMEUP, MP_KEY_VOLUME_UP},
{SDLK_VOLUMEDOWN, MP_KEY_VOLUME_DOWN},
{SDLK_KP_COMMA, MP_KEY_KPDEC},
{SDLK_AUDIONEXT, MP_KEY_NEXT},
{SDLK_AUDIOPREV, MP_KEY_PREV},
{SDLK_AUDIOSTOP, MP_KEY_STOP},
{SDLK_AUDIOPLAY, MP_KEY_PLAY},
{SDLK_AUDIOMUTE, MP_KEY_MUTE},
{SDLK_F1, MP_KEY_F + 1},
{SDLK_F2, MP_KEY_F + 2},
{SDLK_F3, MP_KEY_F + 3},
{SDLK_F4, MP_KEY_F + 4},
{SDLK_F5, MP_KEY_F + 5},
{SDLK_F6, MP_KEY_F + 6},
{SDLK_F7, MP_KEY_F + 7},
{SDLK_F8, MP_KEY_F + 8},
{SDLK_F9, MP_KEY_F + 9},
{SDLK_F10, MP_KEY_F + 10},
{SDLK_F11, MP_KEY_F + 11},
{SDLK_F12, MP_KEY_F + 12},
{SDLK_F13, MP_KEY_F + 13},
{SDLK_F14, MP_KEY_F + 14},
{SDLK_F15, MP_KEY_F + 15},
{SDLK_F16, MP_KEY_F + 16},
{SDLK_F17, MP_KEY_F + 17},
{SDLK_F18, MP_KEY_F + 18},
{SDLK_F19, MP_KEY_F + 19},
{SDLK_F20, MP_KEY_F + 20},
{SDLK_F21, MP_KEY_F + 21},
{SDLK_F22, MP_KEY_F + 22},
{SDLK_F23, MP_KEY_F + 23},
{SDLK_F24, MP_KEY_F + 24}
vo/ao: SDL 1.2+ audio driver, SDL 2.0+ accelerated video driver This mainly serves as a fallback for platforms where nothing better is available; also as a debugging help. Both the audio and video driver are not first class - the audio driver lacks delay detection, and the video driver only supports a single YUV color space. Configure options: --disable-sdl2 to disable SDL 2.0+ detection, --disable-sdl to disable SDL 1.2+ detection. Both options need to be specified to turn off SDL support entirely.
2012-12-28 07:07:14 +00:00
};
struct priv {
bool reinit_renderer;
SDL_Window *window;
SDL_Renderer *renderer;
vo_sdl: add a "sw" flag like in opengl Also, rework the renderer creation for the flag being generally effective even if the "SW renderer" is detected only after creating a context.
2013-01-04 16:43:37 +00:00
int renderer_index;
vo/ao: SDL 1.2+ audio driver, SDL 2.0+ accelerated video driver This mainly serves as a fallback for platforms where nothing better is available; also as a debugging help. Both the audio and video driver are not first class - the audio driver lacks delay detection, and the video driver only supports a single YUV color space. Configure options: --disable-sdl2 to disable SDL 2.0+ detection, --disable-sdl to disable SDL 1.2+ detection. Both options need to be specified to turn off SDL support entirely.
2012-12-28 07:07:14 +00:00
SDL_RendererInfo renderer_info;
SDL_Texture *tex;
video: decouple internal pixel formats from FourCCs mplayer's video chain traditionally used FourCCs for pixel formats. For example, it used IMGFMT_YV12 for 4:2:0 YUV, which was defined to the string 'YV12' interpreted as unsigned int. Additionally, it used to encode information into the numeric values of some formats. The RGB formats had their bit depth and endian encoded into the least significant byte. Extended planar formats (420P10 etc.) had chroma shift, endian, and component bit depth encoded. (This has been removed in recent commits.) Replace the FourCC mess with a simple enum. Remove all the redundant formats like YV12/I420/IYUV. Replace some image format names by something more intuitive, most importantly IMGFMT_YV12 -> IMGFMT_420P. Add img_fourcc.h, which contains the old IDs for code that actually uses FourCCs. Change the way demuxers, that output raw video, identify the video format: they set either MP_FOURCC_RAWVIDEO or MP_FOURCC_IMGFMT to request the rawvideo decoder, and sh_video->imgfmt specifies the pixel format. Like the previous hack, this is supposed to avoid the need for a complete codecs.cfg entry per format, or other lookup tables. (Note that the RGB raw video FourCCs mostly rely on ffmpeg's mappings for NUT raw video, but this is still considered better than adding a raw video decoder - even if trivial, it would be full of annoying lookup tables.) The TV code has not been tested. Some corrective changes regarding endian and other image format flags creep in.
2012-12-23 19:03:30 +00:00
int tex_swapped;
vo_sdl: fix clearing the screen on reconfig Clear the texture on reconfig(). (We could probably also do this simpler with a flag, but this is actually less complicated - except that we move the code to "map" a texture to a separate function.)
2014-06-18 18:18:22 +00:00
struct mp_image_params params;
vo/ao: SDL 1.2+ audio driver, SDL 2.0+ accelerated video driver This mainly serves as a fallback for platforms where nothing better is available; also as a debugging help. Both the audio and video driver are not first class - the audio driver lacks delay detection, and the video driver only supports a single YUV color space. Configure options: --disable-sdl2 to disable SDL 2.0+ detection, --disable-sdl to disable SDL 1.2+ detection. Both options need to be specified to turn off SDL support entirely.
2012-12-28 07:07:14 +00:00
struct mp_rect src_rect;
struct mp_rect dst_rect;
struct mp_osd_res osd_res;
struct formatmap_entry osd_format;
struct osd_bitmap_surface {
osd: simplify an aspect of change detection handling There was a somewhat obscure optimization in the OSD and subtitle rendering path: if only the position of the sub-images changed, and not the actual image data, uploading of the image data could be skipped. In theory, this could speed up things like scrolling subtitles. But it turns out that even in the rare cases subtitles have such scrolls or axis-aligned movement, modern libass rarely signals this kind of change. Possibly this is because of sub-pixel handling and such, which break this. As such, it's a worthless optimization and just introduces additional complexity and subtle bugs (especially in cases libass does the opposite: incorrectly signaling a position change only, which happened before). Remove this optimization, and rename bitmap_pos_id to change_id.
2015-03-18 11:33:14 +00:00
int change_id;
vo/ao: SDL 1.2+ audio driver, SDL 2.0+ accelerated video driver This mainly serves as a fallback for platforms where nothing better is available; also as a debugging help. Both the audio and video driver are not first class - the audio driver lacks delay detection, and the video driver only supports a single YUV color space. Configure options: --disable-sdl2 to disable SDL 2.0+ detection, --disable-sdl to disable SDL 1.2+ detection. Both options need to be specified to turn off SDL support entirely.
2012-12-28 07:07:14 +00:00
struct osd_target {
SDL_Rect source;
SDL_Rect dest;
SDL_Texture *tex;
SDL_Texture *tex2;
} *targets;
int num_targets;
int targets_size;
} osd_surfaces[MAX_OSD_PARTS];
video/out: change aspects of OSD handling Let the VOs draw the OSD on their own, instead of making OSD drawing a separate VO driver call. Further, let it be the VOs responsibility to request subtitles with the correct PTS. We also basically allow the VO to request OSD/subtitles at any time. OSX changes untested.
2014-06-15 18:46:57 +00:00
double osd_pts;
vo/ao: SDL 1.2+ audio driver, SDL 2.0+ accelerated video driver This mainly serves as a fallback for platforms where nothing better is available; also as a debugging help. Both the audio and video driver are not first class - the audio driver lacks delay detection, and the video driver only supports a single YUV color space. Configure options: --disable-sdl2 to disable SDL 2.0+ detection, --disable-sdl to disable SDL 1.2+ detection. Both options need to be specified to turn off SDL support entirely.
2012-12-28 07:07:14 +00:00
int mouse_hidden;
int brightness, contrast;
video: move display and timing to a separate thread The VO is run inside its own thread. It also does most of video timing. The playloop hands the image data and a realtime timestamp to the VO, and the VO does the rest. In particular, this allows the playloop to do other things, instead of blocking for video redraw. But if anything accesses the VO during video timing, it will block. This also fixes vo_sdl.c event handling; but that is only a side-effect, since reimplementing the broken way would require more effort. Also drop --softsleep. In theory, this option helps if the kernel's sleeping mechanism is too inaccurate for video timing. In practice, I haven't ever encountered a situation where it helps, and it just burns CPU cycles. On the other hand it's probably actively harmful, because it prevents the libavcodec decoder threads from doing real work. Side note: Originally, I intended that multiple frames can be queued to the VO. But this is not done, due to problems with OSD and other certain features. OSD in particular is simply designed in a way that it can be neither timed nor copied, so you do have to render it into the video frame before you can draw the next frame. (Subtitles have no such restriction. sd_lavc was even updated to fix this.) It seems the right solution to queuing multiple VO frames is rendering on VO-backed framebuffers, like vo_vdpau.c does. This requires VO driver support, and is out of scope of this commit. As consequence, the VO has a queue size of 1. The existing video queue is just needed to compute frame duration, and will be moved out in the next commit.
2014-08-12 21:02:08 +00:00
Uint32 wakeup_event;
vo_sdl: add a "sw" flag like in opengl Also, rework the renderer creation for the flag being generally effective even if the "SW renderer" is detected only after creating a context.
2013-01-04 16:43:37 +00:00
// options
int allow_sw;
video/out: remove video mode switching (--vm) This allowed making the player switch the monitor video mode when creating the video window. This was a questionable feature, and with today's LCD screens certainly not useful anymore. Switching to a random video mode (going by video width/height) doesn't sound too useful either. I'm not sure about the win32 implementation, but the X part had several bugs. Even in mplayer-svn (where x11_common.c hasn't been receiving any larger changes for a long time), this code is buggy and doesn't do the right thing anyway. (And what the hell _did_ it do when using multiple physical monitors?) If you really want this, write a shell script that calls xrandr before and after calling mpv. vo_sdl still can do mode switching, because SDL has native support for it, and using it is trivial. Add a new sub-option for this.
2013-02-24 22:36:40 +00:00
int switch_mode;
options: remove --no-vsync Latest nvidia drivers ignore the application setting, so this switch makes even less sense than before. It's still possible to control this with VO specific suboptions.
2013-03-05 23:24:34 +00:00
int vsync;
vo/ao: SDL 1.2+ audio driver, SDL 2.0+ accelerated video driver This mainly serves as a fallback for platforms where nothing better is available; also as a debugging help. Both the audio and video driver are not first class - the audio driver lacks delay detection, and the video driver only supports a single YUV color space. Configure options: --disable-sdl2 to disable SDL 2.0+ detection, --disable-sdl to disable SDL 1.2+ detection. Both options need to be specified to turn off SDL support entirely.
2012-12-28 07:07:14 +00:00
};
vo_sdl: fix clearing the screen on reconfig Clear the texture on reconfig(). (We could probably also do this simpler with a flag, but this is actually less complicated - except that we move the code to "map" a texture to a separate function.)
2014-06-18 18:18:22 +00:00
static bool lock_texture(struct vo *vo, struct mp_image *texmpi)
{
struct priv *vc = vo->priv;
*texmpi = (struct mp_image){0};
mp_image_set_size(texmpi, vc->params.w, vc->params.h);
mp_image_setfmt(texmpi, vc->params.imgfmt);
switch (texmpi->num_planes) {
case 1:
case 3:
break;
default:
MP_ERR(vo, "Invalid plane count\n");
return false;
}
void *pixels;
int pitch;
if (SDL_LockTexture(vc->tex, NULL, &pixels, &pitch)) {
MP_ERR(vo, "SDL_LockTexture failed\n");
return false;
}
texmpi->planes[0] = pixels;
texmpi->stride[0] = pitch;
if (texmpi->num_planes == 3) {
if (vc->tex_swapped) {
texmpi->planes[2] =
((Uint8 *) texmpi->planes[0] + texmpi->h * pitch);
texmpi->stride[2] = pitch / 2;
texmpi->planes[1] =
((Uint8 *) texmpi->planes[2] + (texmpi->h * pitch) / 4);
texmpi->stride[1] = pitch / 2;
} else {
texmpi->planes[1] =
((Uint8 *) texmpi->planes[0] + texmpi->h * pitch);
texmpi->stride[1] = pitch / 2;
texmpi->planes[2] =
((Uint8 *) texmpi->planes[1] + (texmpi->h * pitch) / 4);
texmpi->stride[2] = pitch / 2;
}
}
return true;
}
vo_sdl: add a "sw" flag like in opengl Also, rework the renderer creation for the flag being generally effective even if the "SW renderer" is detected only after creating a context.
2013-01-04 16:43:37 +00:00
static bool is_good_renderer(SDL_RendererInfo *ri,
const char *driver_name_wanted, int allow_sw,
struct formatmap_entry *osd_format)
vo/ao: SDL 1.2+ audio driver, SDL 2.0+ accelerated video driver This mainly serves as a fallback for platforms where nothing better is available; also as a debugging help. Both the audio and video driver are not first class - the audio driver lacks delay detection, and the video driver only supports a single YUV color space. Configure options: --disable-sdl2 to disable SDL 2.0+ detection, --disable-sdl to disable SDL 1.2+ detection. Both options need to be specified to turn off SDL support entirely.
2012-12-28 07:07:14 +00:00
{
if (driver_name_wanted && driver_name_wanted[0])
vo_sdl: add a "sw" flag like in opengl Also, rework the renderer creation for the flag being generally effective even if the "SW renderer" is detected only after creating a context.
2013-01-04 16:43:37 +00:00
if (strcmp(driver_name_wanted, ri->name))
vo/ao: SDL 1.2+ audio driver, SDL 2.0+ accelerated video driver This mainly serves as a fallback for platforms where nothing better is available; also as a debugging help. Both the audio and video driver are not first class - the audio driver lacks delay detection, and the video driver only supports a single YUV color space. Configure options: --disable-sdl2 to disable SDL 2.0+ detection, --disable-sdl to disable SDL 1.2+ detection. Both options need to be specified to turn off SDL support entirely.
2012-12-28 07:07:14 +00:00
return false;
vo_sdl: add a "sw" flag like in opengl Also, rework the renderer creation for the flag being generally effective even if the "SW renderer" is detected only after creating a context.
2013-01-04 16:43:37 +00:00
if (!allow_sw &&
!(ri->flags & SDL_RENDERER_ACCELERATED))
return false;
vo/ao: SDL 1.2+ audio driver, SDL 2.0+ accelerated video driver This mainly serves as a fallback for platforms where nothing better is available; also as a debugging help. Both the audio and video driver are not first class - the audio driver lacks delay detection, and the video driver only supports a single YUV color space. Configure options: --disable-sdl2 to disable SDL 2.0+ detection, --disable-sdl to disable SDL 1.2+ detection. Both options need to be specified to turn off SDL support entirely.
2012-12-28 07:07:14 +00:00
int i, j;
vo_sdl: add a "sw" flag like in opengl Also, rework the renderer creation for the flag being generally effective even if the "SW renderer" is detected only after creating a context.
2013-01-04 16:43:37 +00:00
for (i = 0; i < ri->num_texture_formats; ++i)
vo/ao: SDL 1.2+ audio driver, SDL 2.0+ accelerated video driver This mainly serves as a fallback for platforms where nothing better is available; also as a debugging help. Both the audio and video driver are not first class - the audio driver lacks delay detection, and the video driver only supports a single YUV color space. Configure options: --disable-sdl2 to disable SDL 2.0+ detection, --disable-sdl to disable SDL 1.2+ detection. Both options need to be specified to turn off SDL support entirely.
2012-12-28 07:07:14 +00:00
for (j = 0; j < sizeof(formats) / sizeof(formats[0]); ++j)
vo_sdl: add a "sw" flag like in opengl Also, rework the renderer creation for the flag being generally effective even if the "SW renderer" is detected only after creating a context.
2013-01-04 16:43:37 +00:00
if (ri->texture_formats[i] == formats[j].sdl)
if (formats[j].is_rgba) {
if (osd_format)
*osd_format = formats[j];
vo/ao: SDL 1.2+ audio driver, SDL 2.0+ accelerated video driver This mainly serves as a fallback for platforms where nothing better is available; also as a debugging help. Both the audio and video driver are not first class - the audio driver lacks delay detection, and the video driver only supports a single YUV color space. Configure options: --disable-sdl2 to disable SDL 2.0+ detection, --disable-sdl to disable SDL 1.2+ detection. Both options need to be specified to turn off SDL support entirely.
2012-12-28 07:07:14 +00:00
return true;
vo_sdl: add a "sw" flag like in opengl Also, rework the renderer creation for the flag being generally effective even if the "SW renderer" is detected only after creating a context.
2013-01-04 16:43:37 +00:00
}
vo/ao: SDL 1.2+ audio driver, SDL 2.0+ accelerated video driver This mainly serves as a fallback for platforms where nothing better is available; also as a debugging help. Both the audio and video driver are not first class - the audio driver lacks delay detection, and the video driver only supports a single YUV color space. Configure options: --disable-sdl2 to disable SDL 2.0+ detection, --disable-sdl to disable SDL 1.2+ detection. Both options need to be specified to turn off SDL support entirely.
2012-12-28 07:07:14 +00:00
return false;
}
static void destroy_renderer(struct vo *vo)
{
struct priv *vc = vo->priv;
// free ALL the textures
if (vc->tex) {
SDL_DestroyTexture(vc->tex);
vc->tex = NULL;
}
int i, j;
for (i = 0; i < MAX_OSD_PARTS; ++i) {
for (j = 0; j < vc->osd_surfaces[i].targets_size; ++j) {
if (vc->osd_surfaces[i].targets[j].tex) {
SDL_DestroyTexture(vc->osd_surfaces[i].targets[j].tex);
vc->osd_surfaces[i].targets[j].tex = NULL;
}
if (vc->osd_surfaces[i].targets[j].tex2) {
SDL_DestroyTexture(vc->osd_surfaces[i].targets[j].tex2);
vc->osd_surfaces[i].targets[j].tex2 = NULL;
}
}
}
if (vc->renderer) {
SDL_DestroyRenderer(vc->renderer);
vc->renderer = NULL;
}
if (vc->window) {
SDL_DestroyWindow(vc->window);
vc->window = NULL;
}
}
vo_sdl: add a "sw" flag like in opengl Also, rework the renderer creation for the flag being generally effective even if the "SW renderer" is detected only after creating a context.
2013-01-04 16:43:37 +00:00
static bool try_create_renderer(struct vo *vo, int i, const char *driver,
vo_sdl: don't use VOCTRL_UPDATE_SCREENINFO
2014-05-06 18:35:19 +00:00
struct mp_rect *rc, int flags)
vo/ao: SDL 1.2+ audio driver, SDL 2.0+ accelerated video driver This mainly serves as a fallback for platforms where nothing better is available; also as a debugging help. Both the audio and video driver are not first class - the audio driver lacks delay detection, and the video driver only supports a single YUV color space. Configure options: --disable-sdl2 to disable SDL 2.0+ detection, --disable-sdl to disable SDL 1.2+ detection. Both options need to be specified to turn off SDL support entirely.
2012-12-28 07:07:14 +00:00
{
struct priv *vc = vo->priv;
vo_sdl: add a "sw" flag like in opengl Also, rework the renderer creation for the flag being generally effective even if the "SW renderer" is detected only after creating a context.
2013-01-04 16:43:37 +00:00
// first probe
SDL_RendererInfo ri;
if (SDL_GetRenderDriverInfo(i, &ri))
return false;
if (!is_good_renderer(&ri, driver, vc->allow_sw, NULL))
return false;
vo_sdl: don't use VOCTRL_UPDATE_SCREENINFO
2014-05-06 18:35:19 +00:00
bool xy_valid = flags & VO_WIN_FORCE_POS;
options: move -geometry parsing to m_option.c This also means the option is verified on program start, not when the VO is created. The actual code becomes a bit more complex, because the screen width/height is not available at program start. The actual parsing code is still the same, with its unusual sscanf() usage.
2013-01-23 09:56:11 +00:00
vo_sdl: add a "sw" flag like in opengl Also, rework the renderer creation for the flag being generally effective even if the "SW renderer" is detected only after creating a context.
2013-01-04 16:43:37 +00:00
// then actually try
vo/ao: SDL 1.2+ audio driver, SDL 2.0+ accelerated video driver This mainly serves as a fallback for platforms where nothing better is available; also as a debugging help. Both the audio and video driver are not first class - the audio driver lacks delay detection, and the video driver only supports a single YUV color space. Configure options: --disable-sdl2 to disable SDL 2.0+ detection, --disable-sdl to disable SDL 1.2+ detection. Both options need to be specified to turn off SDL support entirely.
2012-12-28 07:07:14 +00:00
vc->window = SDL_CreateWindow("MPV",
vo_sdl: don't use VOCTRL_UPDATE_SCREENINFO
2014-05-06 18:35:19 +00:00
xy_valid ? rc->x0 : SDL_WINDOWPOS_UNDEFINED,
xy_valid ? rc->y0 : SDL_WINDOWPOS_UNDEFINED,
rc->x1 - rc->x0, rc->y1 - rc->y0,
vo/ao: SDL 1.2+ audio driver, SDL 2.0+ accelerated video driver This mainly serves as a fallback for platforms where nothing better is available; also as a debugging help. Both the audio and video driver are not first class - the audio driver lacks delay detection, and the video driver only supports a single YUV color space. Configure options: --disable-sdl2 to disable SDL 2.0+ detection, --disable-sdl to disable SDL 1.2+ detection. Both options need to be specified to turn off SDL support entirely.
2012-12-28 07:07:14 +00:00
SDL_WINDOW_RESIZABLE | SDL_WINDOW_HIDDEN);
if (!vc->window) {
vo_sdl: fix typo
2014-09-05 20:10:20 +00:00
MP_ERR(vo, "SDL_CreateWindow failed\n");
vo/ao: SDL 1.2+ audio driver, SDL 2.0+ accelerated video driver This mainly serves as a fallback for platforms where nothing better is available; also as a debugging help. Both the audio and video driver are not first class - the audio driver lacks delay detection, and the video driver only supports a single YUV color space. Configure options: --disable-sdl2 to disable SDL 2.0+ detection, --disable-sdl to disable SDL 1.2+ detection. Both options need to be specified to turn off SDL support entirely.
2012-12-28 07:07:14 +00:00
destroy_renderer(vo);
vo_sdl: add a "sw" flag like in opengl Also, rework the renderer creation for the flag being generally effective even if the "SW renderer" is detected only after creating a context.
2013-01-04 16:43:37 +00:00
return false;
vo/ao: SDL 1.2+ audio driver, SDL 2.0+ accelerated video driver This mainly serves as a fallback for platforms where nothing better is available; also as a debugging help. Both the audio and video driver are not first class - the audio driver lacks delay detection, and the video driver only supports a single YUV color space. Configure options: --disable-sdl2 to disable SDL 2.0+ detection, --disable-sdl to disable SDL 1.2+ detection. Both options need to be specified to turn off SDL support entirely.
2012-12-28 07:07:14 +00:00
}
vc->renderer = SDL_CreateRenderer(vc->window, i, 0);
if (!vc->renderer) {
Some more mp_msg conversions Also add a note to mp_msg.h, since it might be not clear which of the two mechanisms is preferred.
2013-08-23 21:30:09 +00:00
MP_ERR(vo, "SDL_CreateRenderer failed\n");
vo/ao: SDL 1.2+ audio driver, SDL 2.0+ accelerated video driver This mainly serves as a fallback for platforms where nothing better is available; also as a debugging help. Both the audio and video driver are not first class - the audio driver lacks delay detection, and the video driver only supports a single YUV color space. Configure options: --disable-sdl2 to disable SDL 2.0+ detection, --disable-sdl to disable SDL 1.2+ detection. Both options need to be specified to turn off SDL support entirely.
2012-12-28 07:07:14 +00:00
destroy_renderer(vo);
vo_sdl: add a "sw" flag like in opengl Also, rework the renderer creation for the flag being generally effective even if the "SW renderer" is detected only after creating a context.
2013-01-04 16:43:37 +00:00
return false;
vo/ao: SDL 1.2+ audio driver, SDL 2.0+ accelerated video driver This mainly serves as a fallback for platforms where nothing better is available; also as a debugging help. Both the audio and video driver are not first class - the audio driver lacks delay detection, and the video driver only supports a single YUV color space. Configure options: --disable-sdl2 to disable SDL 2.0+ detection, --disable-sdl to disable SDL 1.2+ detection. Both options need to be specified to turn off SDL support entirely.
2012-12-28 07:07:14 +00:00
}
if (SDL_GetRendererInfo(vc->renderer, &vc->renderer_info)) {
Some more mp_msg conversions Also add a note to mp_msg.h, since it might be not clear which of the two mechanisms is preferred.
2013-08-23 21:30:09 +00:00
MP_ERR(vo, "SDL_GetRendererInfo failed\n");
vo/ao: SDL 1.2+ audio driver, SDL 2.0+ accelerated video driver This mainly serves as a fallback for platforms where nothing better is available; also as a debugging help. Both the audio and video driver are not first class - the audio driver lacks delay detection, and the video driver only supports a single YUV color space. Configure options: --disable-sdl2 to disable SDL 2.0+ detection, --disable-sdl to disable SDL 1.2+ detection. Both options need to be specified to turn off SDL support entirely.
2012-12-28 07:07:14 +00:00
destroy_renderer(vo);
vo_sdl: add a "sw" flag like in opengl Also, rework the renderer creation for the flag being generally effective even if the "SW renderer" is detected only after creating a context.
2013-01-04 16:43:37 +00:00
return false;
vo/ao: SDL 1.2+ audio driver, SDL 2.0+ accelerated video driver This mainly serves as a fallback for platforms where nothing better is available; also as a debugging help. Both the audio and video driver are not first class - the audio driver lacks delay detection, and the video driver only supports a single YUV color space. Configure options: --disable-sdl2 to disable SDL 2.0+ detection, --disable-sdl to disable SDL 1.2+ detection. Both options need to be specified to turn off SDL support entirely.
2012-12-28 07:07:14 +00:00
}
vo_sdl: add a "sw" flag like in opengl Also, rework the renderer creation for the flag being generally effective even if the "SW renderer" is detected only after creating a context.
2013-01-04 16:43:37 +00:00
if (!is_good_renderer(&vc->renderer_info, NULL, vc->allow_sw,
&vc->osd_format)) {
Some more mp_msg conversions Also add a note to mp_msg.h, since it might be not clear which of the two mechanisms is preferred.
2013-08-23 21:30:09 +00:00
MP_ERR(vo, "Renderer '%s' does not fulfill "
vo_sdl: add a "sw" flag like in opengl Also, rework the renderer creation for the flag being generally effective even if the "SW renderer" is detected only after creating a context.
2013-01-04 16:43:37 +00:00
"requirements on this system\n",
vc->renderer_info.name);
destroy_renderer(vo);
return false;
}
vo/ao: SDL 1.2+ audio driver, SDL 2.0+ accelerated video driver This mainly serves as a fallback for platforms where nothing better is available; also as a debugging help. Both the audio and video driver are not first class - the audio driver lacks delay detection, and the video driver only supports a single YUV color space. Configure options: --disable-sdl2 to disable SDL 2.0+ detection, --disable-sdl to disable SDL 1.2+ detection. Both options need to be specified to turn off SDL support entirely.
2012-12-28 07:07:14 +00:00
vo_sdl: add a "sw" flag like in opengl Also, rework the renderer creation for the flag being generally effective even if the "SW renderer" is detected only after creating a context.
2013-01-04 16:43:37 +00:00
if (vc->renderer_index != i) {
Some more mp_msg conversions Also add a note to mp_msg.h, since it might be not clear which of the two mechanisms is preferred.
2013-08-23 21:30:09 +00:00
MP_INFO(vo, "Using %s\n", vc->renderer_info.name);
vo_sdl: add a "sw" flag like in opengl Also, rework the renderer creation for the flag being generally effective even if the "SW renderer" is detected only after creating a context.
2013-01-04 16:43:37 +00:00
vc->renderer_index = i;
}
vo/ao: SDL 1.2+ audio driver, SDL 2.0+ accelerated video driver This mainly serves as a fallback for platforms where nothing better is available; also as a debugging help. Both the audio and video driver are not first class - the audio driver lacks delay detection, and the video driver only supports a single YUV color space. Configure options: --disable-sdl2 to disable SDL 2.0+ detection, --disable-sdl to disable SDL 1.2+ detection. Both options need to be specified to turn off SDL support entirely.
2012-12-28 07:07:14 +00:00
vo_sdl: add a "sw" flag like in opengl Also, rework the renderer creation for the flag being generally effective even if the "SW renderer" is detected only after creating a context.
2013-01-04 16:43:37 +00:00
return true;
}
vo_sdl: don't use VOCTRL_UPDATE_SCREENINFO
2014-05-06 18:35:19 +00:00
// flags: VO_WIN_* bits
static int init_renderer(struct vo *vo, struct mp_rect *rc, int flags)
vo_sdl: add a "sw" flag like in opengl Also, rework the renderer creation for the flag being generally effective even if the "SW renderer" is detected only after creating a context.
2013-01-04 16:43:37 +00:00
{
struct priv *vc = vo->priv;
int n = SDL_GetNumRenderDrivers();
int i;
if (vc->renderer_index >= 0)
vo_sdl: don't use VOCTRL_UPDATE_SCREENINFO
2014-05-06 18:35:19 +00:00
if (try_create_renderer(vo, vc->renderer_index, NULL, rc, flags))
vo_sdl: add a "sw" flag like in opengl Also, rework the renderer creation for the flag being generally effective even if the "SW renderer" is detected only after creating a context.
2013-01-04 16:43:37 +00:00
return 0;
for (i = 0; i < n; ++i)
if (try_create_renderer(vo, i, SDL_GetHint(SDL_HINT_RENDER_DRIVER),
vo_sdl: don't use VOCTRL_UPDATE_SCREENINFO
2014-05-06 18:35:19 +00:00
rc, flags))
vo_sdl: add a "sw" flag like in opengl Also, rework the renderer creation for the flag being generally effective even if the "SW renderer" is detected only after creating a context.
2013-01-04 16:43:37 +00:00
return 0;
for (i = 0; i < n; ++i)
vo_sdl: don't use VOCTRL_UPDATE_SCREENINFO
2014-05-06 18:35:19 +00:00
if (try_create_renderer(vo, i, NULL, rc, flags))
vo_sdl: add a "sw" flag like in opengl Also, rework the renderer creation for the flag being generally effective even if the "SW renderer" is detected only after creating a context.
2013-01-04 16:43:37 +00:00
return 0;
Some more mp_msg conversions Also add a note to mp_msg.h, since it might be not clear which of the two mechanisms is preferred.
2013-08-23 21:30:09 +00:00
MP_ERR(vo, "No supported renderer\n");
vo_sdl: add a "sw" flag like in opengl Also, rework the renderer creation for the flag being generally effective even if the "SW renderer" is detected only after creating a context.
2013-01-04 16:43:37 +00:00
return -1;
vo/ao: SDL 1.2+ audio driver, SDL 2.0+ accelerated video driver This mainly serves as a fallback for platforms where nothing better is available; also as a debugging help. Both the audio and video driver are not first class - the audio driver lacks delay detection, and the video driver only supports a single YUV color space. Configure options: --disable-sdl2 to disable SDL 2.0+ detection, --disable-sdl to disable SDL 1.2+ detection. Both options need to be specified to turn off SDL support entirely.
2012-12-28 07:07:14 +00:00
}
static void resize(struct vo *vo, int w, int h)
{
struct priv *vc = vo->priv;
vo->dwidth = w;
vo->dheight = h;
vo_get_src_dst_rects(vo, &vc->src_rect, &vc->dst_rect,
&vc->osd_res);
SDL_RenderSetLogicalSize(vc->renderer, w, h);
vo->want_redraw = true;
video: move display and timing to a separate thread The VO is run inside its own thread. It also does most of video timing. The playloop hands the image data and a realtime timestamp to the VO, and the VO does the rest. In particular, this allows the playloop to do other things, instead of blocking for video redraw. But if anything accesses the VO during video timing, it will block. This also fixes vo_sdl.c event handling; but that is only a side-effect, since reimplementing the broken way would require more effort. Also drop --softsleep. In theory, this option helps if the kernel's sleeping mechanism is too inaccurate for video timing. In practice, I haven't ever encountered a situation where it helps, and it just burns CPU cycles. On the other hand it's probably actively harmful, because it prevents the libavcodec decoder threads from doing real work. Side note: Originally, I intended that multiple frames can be queued to the VO. But this is not done, due to problems with OSD and other certain features. OSD in particular is simply designed in a way that it can be neither timed nor copied, so you do have to render it into the video frame before you can draw the next frame. (Subtitles have no such restriction. sd_lavc was even updated to fix this.) It seems the right solution to queuing multiple VO frames is rendering on VO-backed framebuffers, like vo_vdpau.c does. This requires VO driver support, and is out of scope of this commit. As consequence, the VO has a queue size of 1. The existing video queue is just needed to compute frame duration, and will be moved out in the next commit.
2014-08-12 21:02:08 +00:00
vo_wakeup(vo);
vo/ao: SDL 1.2+ audio driver, SDL 2.0+ accelerated video driver This mainly serves as a fallback for platforms where nothing better is available; also as a debugging help. Both the audio and video driver are not first class - the audio driver lacks delay detection, and the video driver only supports a single YUV color space. Configure options: --disable-sdl2 to disable SDL 2.0+ detection, --disable-sdl to disable SDL 1.2+ detection. Both options need to be specified to turn off SDL support entirely.
2012-12-28 07:07:14 +00:00
}
static void force_resize(struct vo *vo)
{
struct priv *vc = vo->priv;
int w, h;
SDL_GetWindowSize(vc->window, &w, &h);
resize(vo, w, h);
}
static void check_resize(struct vo *vo)
{
struct priv *vc = vo->priv;
int w, h;
SDL_GetWindowSize(vc->window, &w, &h);
if (vo->dwidth != w || vo->dheight != h)
resize(vo, w, h);
}
video: remove fullscreen flags chaos 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>
2013-07-18 12:05:39 +00:00
static void set_fullscreen(struct vo *vo)
vo/ao: SDL 1.2+ audio driver, SDL 2.0+ accelerated video driver This mainly serves as a fallback for platforms where nothing better is available; also as a debugging help. Both the audio and video driver are not first class - the audio driver lacks delay detection, and the video driver only supports a single YUV color space. Configure options: --disable-sdl2 to disable SDL 2.0+ detection, --disable-sdl to disable SDL 1.2+ detection. Both options need to be specified to turn off SDL support entirely.
2012-12-28 07:07:14 +00:00
{
struct priv *vc = vo->priv;
video: remove fullscreen flags chaos 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>
2013-07-18 12:05:39 +00:00
int fs = vo->opts->fullscreen;
vo/ao: SDL 1.2+ audio driver, SDL 2.0+ accelerated video driver This mainly serves as a fallback for platforms where nothing better is available; also as a debugging help. Both the audio and video driver are not first class - the audio driver lacks delay detection, and the video driver only supports a single YUV color space. Configure options: --disable-sdl2 to disable SDL 2.0+ detection, --disable-sdl to disable SDL 1.2+ detection. Both options need to be specified to turn off SDL support entirely.
2012-12-28 07:07:14 +00:00
video: remove fullscreen flags chaos 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>
2013-07-18 12:05:39 +00:00
Uint32 fs_flag;
if (vc->switch_mode)
fs_flag = SDL_WINDOW_FULLSCREEN;
else
fs_flag = SDL_WINDOW_FULLSCREEN_DESKTOP;
Uint32 old_flags = SDL_GetWindowFlags(vc->window);
int prev_fs = !!(old_flags & fs_flag);
if (fs == prev_fs)
return;
Uint32 flags = 0;
if (fs)
flags |= fs_flag;
vo/ao: SDL 1.2+ audio driver, SDL 2.0+ accelerated video driver This mainly serves as a fallback for platforms where nothing better is available; also as a debugging help. Both the audio and video driver are not first class - the audio driver lacks delay detection, and the video driver only supports a single YUV color space. Configure options: --disable-sdl2 to disable SDL 2.0+ detection, --disable-sdl to disable SDL 1.2+ detection. Both options need to be specified to turn off SDL support entirely.
2012-12-28 07:07:14 +00:00
video: remove fullscreen flags chaos 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>
2013-07-18 12:05:39 +00:00
if (SDL_SetWindowFullscreen(vc->window, flags)) {
Some more mp_msg conversions Also add a note to mp_msg.h, since it might be not clear which of the two mechanisms is preferred.
2013-08-23 21:30:09 +00:00
MP_ERR(vo, "SDL_SetWindowFullscreen failed\n");
vo/ao: SDL 1.2+ audio driver, SDL 2.0+ accelerated video driver This mainly serves as a fallback for platforms where nothing better is available; also as a debugging help. Both the audio and video driver are not first class - the audio driver lacks delay detection, and the video driver only supports a single YUV color space. Configure options: --disable-sdl2 to disable SDL 2.0+ detection, --disable-sdl to disable SDL 1.2+ detection. Both options need to be specified to turn off SDL support entirely.
2012-12-28 07:07:14 +00:00
return;
}
// toggling fullscreen might recreate the window, so better guard for this
SDL_DisableScreenSaver();
force_resize(vo);
}
vo_sdl: don't use VOCTRL_UPDATE_SCREENINFO
2014-05-06 18:35:19 +00:00
static void update_screeninfo(struct vo *vo, struct mp_rect *screenrc)
{
struct priv *vc = vo->priv;
SDL_DisplayMode mode;
if (SDL_GetCurrentDisplayMode(SDL_GetWindowDisplayIndex(vc->window),
&mode)) {
MP_ERR(vo, "SDL_GetCurrentDisplayMode failed\n");
return;
}
*screenrc = (struct mp_rect){0, 0, mode.w, mode.h};
}
video/out: do remaining config to reconfig replacements The main difference between the old and new callbacks is that the old callbacks required passing the window size, which is and always was very inconvenient and confusing, since the window size is already in vo->dwidth and vo->dheight.
2014-01-24 20:22:25 +00:00
static int reconfig(struct vo *vo, struct mp_image_params *params, int flags)
vo/ao: SDL 1.2+ audio driver, SDL 2.0+ accelerated video driver This mainly serves as a fallback for platforms where nothing better is available; also as a debugging help. Both the audio and video driver are not first class - the audio driver lacks delay detection, and the video driver only supports a single YUV color space. Configure options: --disable-sdl2 to disable SDL 2.0+ detection, --disable-sdl to disable SDL 1.2+ detection. Both options need to be specified to turn off SDL support entirely.
2012-12-28 07:07:14 +00:00
{
struct priv *vc = vo->priv;
vo_sdl: don't use VOCTRL_UPDATE_SCREENINFO
2014-05-06 18:35:19 +00:00
struct vo_win_geometry geo;
struct mp_rect screenrc;
update_screeninfo(vo, &screenrc);
vo_calc_window_geometry(vo, &screenrc, &geo);
vo_apply_window_geometry(vo, &geo);
video/out: do remaining config to reconfig replacements The main difference between the old and new callbacks is that the old callbacks required passing the window size, which is and always was very inconvenient and confusing, since the window size is already in vo->dwidth and vo->dheight.
2014-01-24 20:22:25 +00:00
int win_w = vo->dwidth;
int win_h = vo->dheight;
vo/ao: SDL 1.2+ audio driver, SDL 2.0+ accelerated video driver This mainly serves as a fallback for platforms where nothing better is available; also as a debugging help. Both the audio and video driver are not first class - the audio driver lacks delay detection, and the video driver only supports a single YUV color space. Configure options: --disable-sdl2 to disable SDL 2.0+ detection, --disable-sdl to disable SDL 1.2+ detection. Both options need to be specified to turn off SDL support entirely.
2012-12-28 07:07:14 +00:00
if (vc->reinit_renderer) {
destroy_renderer(vo);
vc->reinit_renderer = false;
}
if (vc->window)
video/out: do remaining config to reconfig replacements The main difference between the old and new callbacks is that the old callbacks required passing the window size, which is and always was very inconvenient and confusing, since the window size is already in vo->dwidth and vo->dheight.
2014-01-24 20:22:25 +00:00
SDL_SetWindowSize(vc->window, win_w, win_h);
vo/ao: SDL 1.2+ audio driver, SDL 2.0+ accelerated video driver This mainly serves as a fallback for platforms where nothing better is available; also as a debugging help. Both the audio and video driver are not first class - the audio driver lacks delay detection, and the video driver only supports a single YUV color space. Configure options: --disable-sdl2 to disable SDL 2.0+ detection, --disable-sdl to disable SDL 1.2+ detection. Both options need to be specified to turn off SDL support entirely.
2012-12-28 07:07:14 +00:00
else {
vo_sdl: don't use VOCTRL_UPDATE_SCREENINFO
2014-05-06 18:35:19 +00:00
if (init_renderer(vo, &geo.win, geo.flags) != 0)
vo/ao: SDL 1.2+ audio driver, SDL 2.0+ accelerated video driver This mainly serves as a fallback for platforms where nothing better is available; also as a debugging help. Both the audio and video driver are not first class - the audio driver lacks delay detection, and the video driver only supports a single YUV color space. Configure options: --disable-sdl2 to disable SDL 2.0+ detection, --disable-sdl to disable SDL 1.2+ detection. Both options need to be specified to turn off SDL support entirely.
2012-12-28 07:07:14 +00:00
return -1;
}
if (vc->tex)
SDL_DestroyTexture(vc->tex);
Uint32 texfmt = SDL_PIXELFORMAT_UNKNOWN;
int i, j;
for (i = 0; i < vc->renderer_info.num_texture_formats; ++i)
for (j = 0; j < sizeof(formats) / sizeof(formats[0]); ++j)
if (vc->renderer_info.texture_formats[i] == formats[j].sdl)
vo_sdl: fix compilation Still untested, because now it crashes inside of libSDL for unknown reasons. (This also happens with mpv git from yesterday - probably an installation problem, or SDL doing weird things it shouldn't be doing.)
2014-01-24 23:20:26 +00:00
if (params->imgfmt == formats[j].mpv)
vo/ao: SDL 1.2+ audio driver, SDL 2.0+ accelerated video driver This mainly serves as a fallback for platforms where nothing better is available; also as a debugging help. Both the audio and video driver are not first class - the audio driver lacks delay detection, and the video driver only supports a single YUV color space. Configure options: --disable-sdl2 to disable SDL 2.0+ detection, --disable-sdl to disable SDL 1.2+ detection. Both options need to be specified to turn off SDL support entirely.
2012-12-28 07:07:14 +00:00
texfmt = formats[j].sdl;
if (texfmt == SDL_PIXELFORMAT_UNKNOWN) {
Some more mp_msg conversions Also add a note to mp_msg.h, since it might be not clear which of the two mechanisms is preferred.
2013-08-23 21:30:09 +00:00
MP_ERR(vo, "Invalid pixel format\n");
vo/ao: SDL 1.2+ audio driver, SDL 2.0+ accelerated video driver This mainly serves as a fallback for platforms where nothing better is available; also as a debugging help. Both the audio and video driver are not first class - the audio driver lacks delay detection, and the video driver only supports a single YUV color space. Configure options: --disable-sdl2 to disable SDL 2.0+ detection, --disable-sdl to disable SDL 1.2+ detection. Both options need to be specified to turn off SDL support entirely.
2012-12-28 07:07:14 +00:00
return -1;
}
video: decouple internal pixel formats from FourCCs mplayer's video chain traditionally used FourCCs for pixel formats. For example, it used IMGFMT_YV12 for 4:2:0 YUV, which was defined to the string 'YV12' interpreted as unsigned int. Additionally, it used to encode information into the numeric values of some formats. The RGB formats had their bit depth and endian encoded into the least significant byte. Extended planar formats (420P10 etc.) had chroma shift, endian, and component bit depth encoded. (This has been removed in recent commits.) Replace the FourCC mess with a simple enum. Remove all the redundant formats like YV12/I420/IYUV. Replace some image format names by something more intuitive, most importantly IMGFMT_YV12 -> IMGFMT_420P. Add img_fourcc.h, which contains the old IDs for code that actually uses FourCCs. Change the way demuxers, that output raw video, identify the video format: they set either MP_FOURCC_RAWVIDEO or MP_FOURCC_IMGFMT to request the rawvideo decoder, and sh_video->imgfmt specifies the pixel format. Like the previous hack, this is supposed to avoid the need for a complete codecs.cfg entry per format, or other lookup tables. (Note that the RGB raw video FourCCs mostly rely on ffmpeg's mappings for NUT raw video, but this is still considered better than adding a raw video decoder - even if trivial, it would be full of annoying lookup tables.) The TV code has not been tested. Some corrective changes regarding endian and other image format flags creep in.
2012-12-23 19:03:30 +00:00
vc->tex_swapped = texfmt == SDL_PIXELFORMAT_YV12;
vo/ao: SDL 1.2+ audio driver, SDL 2.0+ accelerated video driver This mainly serves as a fallback for platforms where nothing better is available; also as a debugging help. Both the audio and video driver are not first class - the audio driver lacks delay detection, and the video driver only supports a single YUV color space. Configure options: --disable-sdl2 to disable SDL 2.0+ detection, --disable-sdl to disable SDL 1.2+ detection. Both options need to be specified to turn off SDL support entirely.
2012-12-28 07:07:14 +00:00
vc->tex = SDL_CreateTexture(vc->renderer, texfmt,
video/out: do remaining config to reconfig replacements The main difference between the old and new callbacks is that the old callbacks required passing the window size, which is and always was very inconvenient and confusing, since the window size is already in vo->dwidth and vo->dheight.
2014-01-24 20:22:25 +00:00
SDL_TEXTUREACCESS_STREAMING,
params->w, params->h);
vo/ao: SDL 1.2+ audio driver, SDL 2.0+ accelerated video driver This mainly serves as a fallback for platforms where nothing better is available; also as a debugging help. Both the audio and video driver are not first class - the audio driver lacks delay detection, and the video driver only supports a single YUV color space. Configure options: --disable-sdl2 to disable SDL 2.0+ detection, --disable-sdl to disable SDL 1.2+ detection. Both options need to be specified to turn off SDL support entirely.
2012-12-28 07:07:14 +00:00
if (!vc->tex) {
Some more mp_msg conversions Also add a note to mp_msg.h, since it might be not clear which of the two mechanisms is preferred.
2013-08-23 21:30:09 +00:00
MP_ERR(vo, "Could not create a texture\n");
vo/ao: SDL 1.2+ audio driver, SDL 2.0+ accelerated video driver This mainly serves as a fallback for platforms where nothing better is available; also as a debugging help. Both the audio and video driver are not first class - the audio driver lacks delay detection, and the video driver only supports a single YUV color space. Configure options: --disable-sdl2 to disable SDL 2.0+ detection, --disable-sdl to disable SDL 1.2+ detection. Both options need to be specified to turn off SDL support entirely.
2012-12-28 07:07:14 +00:00
return -1;
}
vo_sdl: fix clearing the screen on reconfig Clear the texture on reconfig(). (We could probably also do this simpler with a flag, but this is actually less complicated - except that we move the code to "map" a texture to a separate function.)
2014-06-18 18:18:22 +00:00
vc->params = *params;
struct mp_image tmp;
if (!lock_texture(vo, &tmp)) {
vo/ao: SDL 1.2+ audio driver, SDL 2.0+ accelerated video driver This mainly serves as a fallback for platforms where nothing better is available; also as a debugging help. Both the audio and video driver are not first class - the audio driver lacks delay detection, and the video driver only supports a single YUV color space. Configure options: --disable-sdl2 to disable SDL 2.0+ detection, --disable-sdl to disable SDL 1.2+ detection. Both options need to be specified to turn off SDL support entirely.
2012-12-28 07:07:14 +00:00
SDL_DestroyTexture(vc->tex);
vc->tex = NULL;
return -1;
}
vo_sdl: fix clearing the screen on reconfig Clear the texture on reconfig(). (We could probably also do this simpler with a flag, but this is actually less complicated - except that we move the code to "map" a texture to a separate function.)
2014-06-18 18:18:22 +00:00
mp_image_clear(&tmp, 0, 0, tmp.w, tmp.h);
SDL_UnlockTexture(vc->tex);
vo/ao: SDL 1.2+ audio driver, SDL 2.0+ accelerated video driver This mainly serves as a fallback for platforms where nothing better is available; also as a debugging help. Both the audio and video driver are not first class - the audio driver lacks delay detection, and the video driver only supports a single YUV color space. Configure options: --disable-sdl2 to disable SDL 2.0+ detection, --disable-sdl to disable SDL 1.2+ detection. Both options need to be specified to turn off SDL support entirely.
2012-12-28 07:07:14 +00:00
video/out: do remaining config to reconfig replacements The main difference between the old and new callbacks is that the old callbacks required passing the window size, which is and always was very inconvenient and confusing, since the window size is already in vo->dwidth and vo->dheight.
2014-01-24 20:22:25 +00:00
resize(vo, win_w, win_h);
vo/ao: SDL 1.2+ audio driver, SDL 2.0+ accelerated video driver This mainly serves as a fallback for platforms where nothing better is available; also as a debugging help. Both the audio and video driver are not first class - the audio driver lacks delay detection, and the video driver only supports a single YUV color space. Configure options: --disable-sdl2 to disable SDL 2.0+ detection, --disable-sdl to disable SDL 1.2+ detection. Both options need to be specified to turn off SDL support entirely.
2012-12-28 07:07:14 +00:00
SDL_DisableScreenSaver();
video: remove fullscreen flags chaos 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>
2013-07-18 12:05:39 +00:00
set_fullscreen(vo);
vo/ao: SDL 1.2+ audio driver, SDL 2.0+ accelerated video driver This mainly serves as a fallback for platforms where nothing better is available; also as a debugging help. Both the audio and video driver are not first class - the audio driver lacks delay detection, and the video driver only supports a single YUV color space. Configure options: --disable-sdl2 to disable SDL 2.0+ detection, --disable-sdl to disable SDL 1.2+ detection. Both options need to be specified to turn off SDL support entirely.
2012-12-28 07:07:14 +00:00
SDL_SetWindowTitle(vc->window, vo_get_window_title(vo));
SDL_ShowWindow(vc->window);
check_resize(vo);
return 0;
}
static void flip_page(struct vo *vo)
{
struct priv *vc = vo->priv;
SDL_RenderPresent(vc->renderer);
}
video: move display and timing to a separate thread The VO is run inside its own thread. It also does most of video timing. The playloop hands the image data and a realtime timestamp to the VO, and the VO does the rest. In particular, this allows the playloop to do other things, instead of blocking for video redraw. But if anything accesses the VO during video timing, it will block. This also fixes vo_sdl.c event handling; but that is only a side-effect, since reimplementing the broken way would require more effort. Also drop --softsleep. In theory, this option helps if the kernel's sleeping mechanism is too inaccurate for video timing. In practice, I haven't ever encountered a situation where it helps, and it just burns CPU cycles. On the other hand it's probably actively harmful, because it prevents the libavcodec decoder threads from doing real work. Side note: Originally, I intended that multiple frames can be queued to the VO. But this is not done, due to problems with OSD and other certain features. OSD in particular is simply designed in a way that it can be neither timed nor copied, so you do have to render it into the video frame before you can draw the next frame. (Subtitles have no such restriction. sd_lavc was even updated to fix this.) It seems the right solution to queuing multiple VO frames is rendering on VO-backed framebuffers, like vo_vdpau.c does. This requires VO driver support, and is out of scope of this commit. As consequence, the VO has a queue size of 1. The existing video queue is just needed to compute frame duration, and will be moved out in the next commit.
2014-08-12 21:02:08 +00:00
static void wakeup(struct vo *vo)
vo/ao: SDL 1.2+ audio driver, SDL 2.0+ accelerated video driver This mainly serves as a fallback for platforms where nothing better is available; also as a debugging help. Both the audio and video driver are not first class - the audio driver lacks delay detection, and the video driver only supports a single YUV color space. Configure options: --disable-sdl2 to disable SDL 2.0+ detection, --disable-sdl to disable SDL 1.2+ detection. Both options need to be specified to turn off SDL support entirely.
2012-12-28 07:07:14 +00:00
{
video: move display and timing to a separate thread The VO is run inside its own thread. It also does most of video timing. The playloop hands the image data and a realtime timestamp to the VO, and the VO does the rest. In particular, this allows the playloop to do other things, instead of blocking for video redraw. But if anything accesses the VO during video timing, it will block. This also fixes vo_sdl.c event handling; but that is only a side-effect, since reimplementing the broken way would require more effort. Also drop --softsleep. In theory, this option helps if the kernel's sleeping mechanism is too inaccurate for video timing. In practice, I haven't ever encountered a situation where it helps, and it just burns CPU cycles. On the other hand it's probably actively harmful, because it prevents the libavcodec decoder threads from doing real work. Side note: Originally, I intended that multiple frames can be queued to the VO. But this is not done, due to problems with OSD and other certain features. OSD in particular is simply designed in a way that it can be neither timed nor copied, so you do have to render it into the video frame before you can draw the next frame. (Subtitles have no such restriction. sd_lavc was even updated to fix this.) It seems the right solution to queuing multiple VO frames is rendering on VO-backed framebuffers, like vo_vdpau.c does. This requires VO driver support, and is out of scope of this commit. As consequence, the VO has a queue size of 1. The existing video queue is just needed to compute frame duration, and will be moved out in the next commit.
2014-08-12 21:02:08 +00:00
struct priv *vc = vo->priv;
SDL_Event event = {.type = vc->wakeup_event};
// Note that there is no context - SDL is a singleton.
SDL_PushEvent(&event);
}
static int wait_events(struct vo *vo, int64_t until_time_us)
{
int64_t wait_us = until_time_us - mp_time_us();
int timeout_ms = MPCLAMP((wait_us + 500) / 1000, 0, 10000);
vo/ao: SDL 1.2+ audio driver, SDL 2.0+ accelerated video driver This mainly serves as a fallback for platforms where nothing better is available; also as a debugging help. Both the audio and video driver are not first class - the audio driver lacks delay detection, and the video driver only supports a single YUV color space. Configure options: --disable-sdl2 to disable SDL 2.0+ detection, --disable-sdl to disable SDL 1.2+ detection. Both options need to be specified to turn off SDL support entirely.
2012-12-28 07:07:14 +00:00
SDL_Event ev;
video: move display and timing to a separate thread The VO is run inside its own thread. It also does most of video timing. The playloop hands the image data and a realtime timestamp to the VO, and the VO does the rest. In particular, this allows the playloop to do other things, instead of blocking for video redraw. But if anything accesses the VO during video timing, it will block. This also fixes vo_sdl.c event handling; but that is only a side-effect, since reimplementing the broken way would require more effort. Also drop --softsleep. In theory, this option helps if the kernel's sleeping mechanism is too inaccurate for video timing. In practice, I haven't ever encountered a situation where it helps, and it just burns CPU cycles. On the other hand it's probably actively harmful, because it prevents the libavcodec decoder threads from doing real work. Side note: Originally, I intended that multiple frames can be queued to the VO. But this is not done, due to problems with OSD and other certain features. OSD in particular is simply designed in a way that it can be neither timed nor copied, so you do have to render it into the video frame before you can draw the next frame. (Subtitles have no such restriction. sd_lavc was even updated to fix this.) It seems the right solution to queuing multiple VO frames is rendering on VO-backed framebuffers, like vo_vdpau.c does. This requires VO driver support, and is out of scope of this commit. As consequence, the VO has a queue size of 1. The existing video queue is just needed to compute frame duration, and will be moved out in the next commit.
2014-08-12 21:02:08 +00:00
while (SDL_WaitEventTimeout(&ev, timeout_ms)) {
timeout_ms = 0;
vo/ao: SDL 1.2+ audio driver, SDL 2.0+ accelerated video driver This mainly serves as a fallback for platforms where nothing better is available; also as a debugging help. Both the audio and video driver are not first class - the audio driver lacks delay detection, and the video driver only supports a single YUV color space. Configure options: --disable-sdl2 to disable SDL 2.0+ detection, --disable-sdl to disable SDL 1.2+ detection. Both options need to be specified to turn off SDL support entirely.
2012-12-28 07:07:14 +00:00
switch (ev.type) {
case SDL_WINDOWEVENT:
switch (ev.window.event) {
case SDL_WINDOWEVENT_EXPOSED:
vo->want_redraw = true;
break;
case SDL_WINDOWEVENT_SIZE_CHANGED:
check_resize(vo);
command: make window-scale property observable Add a generic mechanism to the VO to relay "extra" events from VO to player. Use it to notify the core of window resizes, which in turn will be used to mark all affected properties ("window-scale" in this case) as changed. (I refrained from hacking this as internal command into input_ctx, or to poll the state change, etc. - but in the end, maybe it would be best to actually pass the client API context directly to the places where events can happen.)
2014-11-02 19:26:51 +00:00
vo_event(vo, VO_EVENT_RESIZE);
vo/ao: SDL 1.2+ audio driver, SDL 2.0+ accelerated video driver This mainly serves as a fallback for platforms where nothing better is available; also as a debugging help. Both the audio and video driver are not first class - the audio driver lacks delay detection, and the video driver only supports a single YUV color space. Configure options: --disable-sdl2 to disable SDL 2.0+ detection, --disable-sdl to disable SDL 1.2+ detection. Both options need to be specified to turn off SDL support entirely.
2012-12-28 07:07:14 +00:00
break;
}
break;
case SDL_QUIT:
core: cleanup more mp_fifo leftovers Now only the OSX and Wayland parts are using this.
2013-07-02 12:04:36 +00:00
mp_input_put_key(vo->input_ctx, MP_KEY_CLOSE_WIN);
vo/ao: SDL 1.2+ audio driver, SDL 2.0+ accelerated video driver This mainly serves as a fallback for platforms where nothing better is available; also as a debugging help. Both the audio and video driver are not first class - the audio driver lacks delay detection, and the video driver only supports a single YUV color space. Configure options: --disable-sdl2 to disable SDL 2.0+ detection, --disable-sdl to disable SDL 1.2+ detection. Both options need to be specified to turn off SDL support entirely.
2012-12-28 07:07:14 +00:00
break;
case SDL_TEXTINPUT: {
int sdl_mod = SDL_GetModState();
int mpv_mod = 0;
options: add option to disable using right Alt key as Alt Gr mpv was hardcoded to always consider the right Alt key as Alt Gr, but there are parituclar combinations of platforms and keyboard layouts where it's more convenient to treat the right Alt as a keyboard modifier just like the left one. Fixes #388
2013-12-01 05:23:39 +00:00
// we ignore KMOD_LSHIFT, KMOD_RSHIFT and KMOD_RALT (if
// mp_input_use_alt_gr() is true) because these are already
// factored into ev.text.text
vo/ao: SDL 1.2+ audio driver, SDL 2.0+ accelerated video driver This mainly serves as a fallback for platforms where nothing better is available; also as a debugging help. Both the audio and video driver are not first class - the audio driver lacks delay detection, and the video driver only supports a single YUV color space. Configure options: --disable-sdl2 to disable SDL 2.0+ detection, --disable-sdl to disable SDL 1.2+ detection. Both options need to be specified to turn off SDL support entirely.
2012-12-28 07:07:14 +00:00
if (sdl_mod & (KMOD_LCTRL | KMOD_RCTRL))
Prefix keycode defines with MP_ Do this to reduce conflicts with <linux/input.h>, which contains some conflicting defines. This changes the meaning of MP_KEY_DOWN: KEY_DOWN is renamed to MP_KEY_DOWN (cursor down key) MP_KEY_DOWN is renamed to MP_KEY_STATE_DOWN (modifier for key down state)
2013-02-12 00:34:04 +00:00
mpv_mod |= MP_KEY_MODIFIER_CTRL;
options: add option to disable using right Alt key as Alt Gr mpv was hardcoded to always consider the right Alt key as Alt Gr, but there are parituclar combinations of platforms and keyboard layouts where it's more convenient to treat the right Alt as a keyboard modifier just like the left one. Fixes #388
2013-12-01 05:23:39 +00:00
if ((sdl_mod & KMOD_LALT) ||
buid: readd -Wparentheses This warning wasn't overly helpful in the past, and warned against perfectly fine code. But at least with recent gcc versions, this is the warning that complains about assignments in if expressions (why???), so we want to enable it. Also change all the code this warning complains about for no reason.
2015-03-02 18:09:25 +00:00
((sdl_mod & KMOD_RALT) && !mp_input_use_alt_gr(vo->input_ctx)))
Prefix keycode defines with MP_ Do this to reduce conflicts with <linux/input.h>, which contains some conflicting defines. This changes the meaning of MP_KEY_DOWN: KEY_DOWN is renamed to MP_KEY_DOWN (cursor down key) MP_KEY_DOWN is renamed to MP_KEY_STATE_DOWN (modifier for key down state)
2013-02-12 00:34:04 +00:00
mpv_mod |= MP_KEY_MODIFIER_ALT;
vo/ao: SDL 1.2+ audio driver, SDL 2.0+ accelerated video driver This mainly serves as a fallback for platforms where nothing better is available; also as a debugging help. Both the audio and video driver are not first class - the audio driver lacks delay detection, and the video driver only supports a single YUV color space. Configure options: --disable-sdl2 to disable SDL 2.0+ detection, --disable-sdl to disable SDL 1.2+ detection. Both options need to be specified to turn off SDL support entirely.
2012-12-28 07:07:14 +00:00
if (sdl_mod & (KMOD_LGUI | KMOD_RGUI))
Prefix keycode defines with MP_ Do this to reduce conflicts with <linux/input.h>, which contains some conflicting defines. This changes the meaning of MP_KEY_DOWN: KEY_DOWN is renamed to MP_KEY_DOWN (cursor down key) MP_KEY_DOWN is renamed to MP_KEY_STATE_DOWN (modifier for key down state)
2013-02-12 00:34:04 +00:00
mpv_mod |= MP_KEY_MODIFIER_META;
vo/ao: SDL 1.2+ audio driver, SDL 2.0+ accelerated video driver This mainly serves as a fallback for platforms where nothing better is available; also as a debugging help. Both the audio and video driver are not first class - the audio driver lacks delay detection, and the video driver only supports a single YUV color space. Configure options: --disable-sdl2 to disable SDL 2.0+ detection, --disable-sdl to disable SDL 1.2+ detection. Both options need to be specified to turn off SDL support entirely.
2012-12-28 07:07:14 +00:00
struct bstr t = {
ev.text.text, strlen(ev.text.text)
};
core: cleanup more mp_fifo leftovers Now only the OSX and Wayland parts are using this.
2013-07-02 12:04:36 +00:00
mp_input_put_key_utf8(vo->input_ctx, mpv_mod, t);
vo/ao: SDL 1.2+ audio driver, SDL 2.0+ accelerated video driver This mainly serves as a fallback for platforms where nothing better is available; also as a debugging help. Both the audio and video driver are not first class - the audio driver lacks delay detection, and the video driver only supports a single YUV color space. Configure options: --disable-sdl2 to disable SDL 2.0+ detection, --disable-sdl to disable SDL 1.2+ detection. Both options need to be specified to turn off SDL support entirely.
2012-12-28 07:07:14 +00:00
break;
}
case SDL_KEYDOWN: {
// Issue: we don't know in advance whether this keydown event
// will ALSO cause a SDL_TEXTINPUT event
// So we're conservative, and only map non printable keycodes
// (e.g. function keys, arrow keys, etc.)
// However, this does lose some keypresses at least on X11
// (e.g. Ctrl-A generates SDL_KEYDOWN only, but the key is
// 'a'... and 'a' is normally also handled by SDL_TEXTINPUT).
// The default config does not use Ctrl, so this is fine...
int keycode = 0;
int i;
for (i = 0; i < sizeof(keys) / sizeof(keys[0]); ++i)
if (keys[i].sdl == ev.key.keysym.sym) {
keycode = keys[i].mpv;
break;
}
if (keycode) {
if (ev.key.keysym.mod & (KMOD_LSHIFT | KMOD_RSHIFT))
Prefix keycode defines with MP_ Do this to reduce conflicts with <linux/input.h>, which contains some conflicting defines. This changes the meaning of MP_KEY_DOWN: KEY_DOWN is renamed to MP_KEY_DOWN (cursor down key) MP_KEY_DOWN is renamed to MP_KEY_STATE_DOWN (modifier for key down state)
2013-02-12 00:34:04 +00:00
keycode |= MP_KEY_MODIFIER_SHIFT;
vo/ao: SDL 1.2+ audio driver, SDL 2.0+ accelerated video driver This mainly serves as a fallback for platforms where nothing better is available; also as a debugging help. Both the audio and video driver are not first class - the audio driver lacks delay detection, and the video driver only supports a single YUV color space. Configure options: --disable-sdl2 to disable SDL 2.0+ detection, --disable-sdl to disable SDL 1.2+ detection. Both options need to be specified to turn off SDL support entirely.
2012-12-28 07:07:14 +00:00
if (ev.key.keysym.mod & (KMOD_LCTRL | KMOD_RCTRL))
Prefix keycode defines with MP_ Do this to reduce conflicts with <linux/input.h>, which contains some conflicting defines. This changes the meaning of MP_KEY_DOWN: KEY_DOWN is renamed to MP_KEY_DOWN (cursor down key) MP_KEY_DOWN is renamed to MP_KEY_STATE_DOWN (modifier for key down state)
2013-02-12 00:34:04 +00:00
keycode |= MP_KEY_MODIFIER_CTRL;
vo/ao: SDL 1.2+ audio driver, SDL 2.0+ accelerated video driver This mainly serves as a fallback for platforms where nothing better is available; also as a debugging help. Both the audio and video driver are not first class - the audio driver lacks delay detection, and the video driver only supports a single YUV color space. Configure options: --disable-sdl2 to disable SDL 2.0+ detection, --disable-sdl to disable SDL 1.2+ detection. Both options need to be specified to turn off SDL support entirely.
2012-12-28 07:07:14 +00:00
if (ev.key.keysym.mod & (KMOD_LALT | KMOD_RALT))
Prefix keycode defines with MP_ Do this to reduce conflicts with <linux/input.h>, which contains some conflicting defines. This changes the meaning of MP_KEY_DOWN: KEY_DOWN is renamed to MP_KEY_DOWN (cursor down key) MP_KEY_DOWN is renamed to MP_KEY_STATE_DOWN (modifier for key down state)
2013-02-12 00:34:04 +00:00
keycode |= MP_KEY_MODIFIER_ALT;
vo/ao: SDL 1.2+ audio driver, SDL 2.0+ accelerated video driver This mainly serves as a fallback for platforms where nothing better is available; also as a debugging help. Both the audio and video driver are not first class - the audio driver lacks delay detection, and the video driver only supports a single YUV color space. Configure options: --disable-sdl2 to disable SDL 2.0+ detection, --disable-sdl to disable SDL 1.2+ detection. Both options need to be specified to turn off SDL support entirely.
2012-12-28 07:07:14 +00:00
if (ev.key.keysym.mod & (KMOD_LGUI | KMOD_RGUI))
Prefix keycode defines with MP_ Do this to reduce conflicts with <linux/input.h>, which contains some conflicting defines. This changes the meaning of MP_KEY_DOWN: KEY_DOWN is renamed to MP_KEY_DOWN (cursor down key) MP_KEY_DOWN is renamed to MP_KEY_STATE_DOWN (modifier for key down state)
2013-02-12 00:34:04 +00:00
keycode |= MP_KEY_MODIFIER_META;
core: cleanup more mp_fifo leftovers Now only the OSX and Wayland parts are using this.
2013-07-02 12:04:36 +00:00
mp_input_put_key(vo->input_ctx, keycode);
vo/ao: SDL 1.2+ audio driver, SDL 2.0+ accelerated video driver This mainly serves as a fallback for platforms where nothing better is available; also as a debugging help. Both the audio and video driver are not first class - the audio driver lacks delay detection, and the video driver only supports a single YUV color space. Configure options: --disable-sdl2 to disable SDL 2.0+ detection, --disable-sdl to disable SDL 1.2+ detection. Both options need to be specified to turn off SDL support entirely.
2012-12-28 07:07:14 +00:00
}
break;
}
case SDL_MOUSEMOTION:
vo: remove vo_mouse_movement() wrapper So that VO backends don't have to access the VO just for that.
2014-07-27 19:53:29 +00:00
mp_input_set_mouse_pos(vo->input_ctx, ev.motion.x, ev.motion.y);
vo/ao: SDL 1.2+ audio driver, SDL 2.0+ accelerated video driver This mainly serves as a fallback for platforms where nothing better is available; also as a debugging help. Both the audio and video driver are not first class - the audio driver lacks delay detection, and the video driver only supports a single YUV color space. Configure options: --disable-sdl2 to disable SDL 2.0+ detection, --disable-sdl to disable SDL 1.2+ detection. Both options need to be specified to turn off SDL support entirely.
2012-12-28 07:07:14 +00:00
break;
case SDL_MOUSEBUTTONDOWN:
core: cleanup more mp_fifo leftovers Now only the OSX and Wayland parts are using this.
2013-07-02 12:04:36 +00:00
mp_input_put_key(vo->input_ctx,
Prefix keycode defines with MP_ Do this to reduce conflicts with <linux/input.h>, which contains some conflicting defines. This changes the meaning of MP_KEY_DOWN: KEY_DOWN is renamed to MP_KEY_DOWN (cursor down key) MP_KEY_DOWN is renamed to MP_KEY_STATE_DOWN (modifier for key down state)
2013-02-12 00:34:04 +00:00
(MP_MOUSE_BTN0 + ev.button.button - 1) | MP_KEY_STATE_DOWN);
vo/ao: SDL 1.2+ audio driver, SDL 2.0+ accelerated video driver This mainly serves as a fallback for platforms where nothing better is available; also as a debugging help. Both the audio and video driver are not first class - the audio driver lacks delay detection, and the video driver only supports a single YUV color space. Configure options: --disable-sdl2 to disable SDL 2.0+ detection, --disable-sdl to disable SDL 1.2+ detection. Both options need to be specified to turn off SDL support entirely.
2012-12-28 07:07:14 +00:00
break;
case SDL_MOUSEBUTTONUP:
core: cleanup more mp_fifo leftovers Now only the OSX and Wayland parts are using this.
2013-07-02 12:04:36 +00:00
mp_input_put_key(vo->input_ctx,
input: require VOs to send key up events, redo input key lookup Making key up events implicit was sort-of a nice idea, but it's too tricky and unreliable and makes the key lookup code (interpret_keys()) hard to reason about. See e.g. previous commit for subtle bugs and issues this caused. Make key-up events explicit instead. Add key up events to all VOs. Any time MP_KEY_STATE_DOWN is used, the matching key up event must use MP_KEY_STATE_UP. Rewrite the key lookup code. It should be simpler and more robust now. (Even though the LOC increases, because the new code is less "compact".)
2013-07-01 21:54:59 +00:00
(MP_MOUSE_BTN0 + ev.button.button - 1) | MP_KEY_STATE_UP);
vo/ao: SDL 1.2+ audio driver, SDL 2.0+ accelerated video driver This mainly serves as a fallback for platforms where nothing better is available; also as a debugging help. Both the audio and video driver are not first class - the audio driver lacks delay detection, and the video driver only supports a single YUV color space. Configure options: --disable-sdl2 to disable SDL 2.0+ detection, --disable-sdl to disable SDL 1.2+ detection. Both options need to be specified to turn off SDL support entirely.
2012-12-28 07:07:14 +00:00
break;
case SDL_MOUSEWHEEL:
break;
}
}
video: move display and timing to a separate thread The VO is run inside its own thread. It also does most of video timing. The playloop hands the image data and a realtime timestamp to the VO, and the VO does the rest. In particular, this allows the playloop to do other things, instead of blocking for video redraw. But if anything accesses the VO during video timing, it will block. This also fixes vo_sdl.c event handling; but that is only a side-effect, since reimplementing the broken way would require more effort. Also drop --softsleep. In theory, this option helps if the kernel's sleeping mechanism is too inaccurate for video timing. In practice, I haven't ever encountered a situation where it helps, and it just burns CPU cycles. On the other hand it's probably actively harmful, because it prevents the libavcodec decoder threads from doing real work. Side note: Originally, I intended that multiple frames can be queued to the VO. But this is not done, due to problems with OSD and other certain features. OSD in particular is simply designed in a way that it can be neither timed nor copied, so you do have to render it into the video frame before you can draw the next frame. (Subtitles have no such restriction. sd_lavc was even updated to fix this.) It seems the right solution to queuing multiple VO frames is rendering on VO-backed framebuffers, like vo_vdpau.c does. This requires VO driver support, and is out of scope of this commit. As consequence, the VO has a queue size of 1. The existing video queue is just needed to compute frame duration, and will be moved out in the next commit.
2014-08-12 21:02:08 +00:00
return 0;
vo/ao: SDL 1.2+ audio driver, SDL 2.0+ accelerated video driver This mainly serves as a fallback for platforms where nothing better is available; also as a debugging help. Both the audio and video driver are not first class - the audio driver lacks delay detection, and the video driver only supports a single YUV color space. Configure options: --disable-sdl2 to disable SDL 2.0+ detection, --disable-sdl to disable SDL 1.2+ detection. Both options need to be specified to turn off SDL support entirely.
2012-12-28 07:07:14 +00:00
}
static void uninit(struct vo *vo)
{
struct priv *vc = vo->priv;
destroy_renderer(vo);
SDL_QuitSubSystem(SDL_INIT_VIDEO);
talloc_free(vc);
}
vo_sdl: some OSD optimizations The premultiplied-alpha hack is changed: - The first stage now uses a colormod of black with an unmodified texture. This saves on applying the AND mask of 0xFF000000 to keep alpha only. - The second stage no longer uses an AND mask, but only an OR mask of 0xFF000000 to cancel out alpha. - The texture uploads are no longer done using SDL_LockTexture, SDL_ConvertPixels, SDL_UnlockTexture when the mpv pixel format matches the OSD's pixel format. Instead, SDL_UploadTexture is used, which saves a copy when using the "opengl" renderer.
2012-12-28 13:27:03 +00:00
static inline void upload_to_texture(struct vo *vo, SDL_Texture *tex,
int w, int h, void *bitmap, int stride)
vo/ao: SDL 1.2+ audio driver, SDL 2.0+ accelerated video driver This mainly serves as a fallback for platforms where nothing better is available; also as a debugging help. Both the audio and video driver are not first class - the audio driver lacks delay detection, and the video driver only supports a single YUV color space. Configure options: --disable-sdl2 to disable SDL 2.0+ detection, --disable-sdl to disable SDL 1.2+ detection. Both options need to be specified to turn off SDL support entirely.
2012-12-28 07:07:14 +00:00
{
struct priv *vc = vo->priv;
vo_sdl: some OSD optimizations The premultiplied-alpha hack is changed: - The first stage now uses a colormod of black with an unmodified texture. This saves on applying the AND mask of 0xFF000000 to keep alpha only. - The second stage no longer uses an AND mask, but only an OR mask of 0xFF000000 to cancel out alpha. - The texture uploads are no longer done using SDL_LockTexture, SDL_ConvertPixels, SDL_UnlockTexture when the mpv pixel format matches the OSD's pixel format. Instead, SDL_UploadTexture is used, which saves a copy when using the "opengl" renderer.
2012-12-28 13:27:03 +00:00
if (vc->osd_format.sdl == SDL_PIXELFORMAT_ARGB8888) {
// NOTE: this optimization is questionable, because SDL docs say
// that this way is slow.
// It did measure up faster, though...
SDL_UpdateTexture(tex, NULL, bitmap, stride);
return;
vo/ao: SDL 1.2+ audio driver, SDL 2.0+ accelerated video driver This mainly serves as a fallback for platforms where nothing better is available; also as a debugging help. Both the audio and video driver are not first class - the audio driver lacks delay detection, and the video driver only supports a single YUV color space. Configure options: --disable-sdl2 to disable SDL 2.0+ detection, --disable-sdl to disable SDL 1.2+ detection. Both options need to be specified to turn off SDL support entirely.
2012-12-28 07:07:14 +00:00
}
void *pixels;
int pitch;
if (SDL_LockTexture(tex, NULL, &pixels, &pitch)) {
Some more mp_msg conversions Also add a note to mp_msg.h, since it might be not clear which of the two mechanisms is preferred.
2013-08-23 21:30:09 +00:00
MP_ERR(vo, "Could not lock texture\n");
vo/ao: SDL 1.2+ audio driver, SDL 2.0+ accelerated video driver This mainly serves as a fallback for platforms where nothing better is available; also as a debugging help. Both the audio and video driver are not first class - the audio driver lacks delay detection, and the video driver only supports a single YUV color space. Configure options: --disable-sdl2 to disable SDL 2.0+ detection, --disable-sdl to disable SDL 1.2+ detection. Both options need to be specified to turn off SDL support entirely.
2012-12-28 07:07:14 +00:00
} else {
vo_sdl: some OSD optimizations The premultiplied-alpha hack is changed: - The first stage now uses a colormod of black with an unmodified texture. This saves on applying the AND mask of 0xFF000000 to keep alpha only. - The second stage no longer uses an AND mask, but only an OR mask of 0xFF000000 to cancel out alpha. - The texture uploads are no longer done using SDL_LockTexture, SDL_ConvertPixels, SDL_UnlockTexture when the mpv pixel format matches the OSD's pixel format. Instead, SDL_UploadTexture is used, which saves a copy when using the "opengl" renderer.
2012-12-28 13:27:03 +00:00
SDL_ConvertPixels(w, h, SDL_PIXELFORMAT_ARGB8888,
bitmap, stride,
vo/ao: SDL 1.2+ audio driver, SDL 2.0+ accelerated video driver This mainly serves as a fallback for platforms where nothing better is available; also as a debugging help. Both the audio and video driver are not first class - the audio driver lacks delay detection, and the video driver only supports a single YUV color space. Configure options: --disable-sdl2 to disable SDL 2.0+ detection, --disable-sdl to disable SDL 1.2+ detection. Both options need to be specified to turn off SDL support entirely.
2012-12-28 07:07:14 +00:00
vc->osd_format.sdl,
pixels, pitch);
SDL_UnlockTexture(tex);
}
vo_sdl: some OSD optimizations The premultiplied-alpha hack is changed: - The first stage now uses a colormod of black with an unmodified texture. This saves on applying the AND mask of 0xFF000000 to keep alpha only. - The second stage no longer uses an AND mask, but only an OR mask of 0xFF000000 to cancel out alpha. - The texture uploads are no longer done using SDL_LockTexture, SDL_ConvertPixels, SDL_UnlockTexture when the mpv pixel format matches the OSD's pixel format. Instead, SDL_UploadTexture is used, which saves a copy when using the "opengl" renderer.
2012-12-28 13:27:03 +00:00
}
static inline void subbitmap_to_texture(struct vo *vo, SDL_Texture *tex,
struct sub_bitmap *bmp,
uint32_t ormask)
{
if (ormask == 0) {
upload_to_texture(vo, tex, bmp->w, bmp->h,
bmp->bitmap, bmp->stride);
} else {
uint32_t *temppixels;
temppixels = talloc_array(vo, uint32_t, bmp->w * bmp->h);
int x, y;
for (y = 0; y < bmp->h; ++y) {
const uint32_t *src =
(const uint32_t *) ((const char *) bmp->bitmap + y * bmp->stride);
uint32_t *dst = temppixels + y * bmp->w;
for (x = 0; x < bmp->w; ++x)
dst[x] = src[x] | ormask;
}
vo/ao: SDL 1.2+ audio driver, SDL 2.0+ accelerated video driver This mainly serves as a fallback for platforms where nothing better is available; also as a debugging help. Both the audio and video driver are not first class - the audio driver lacks delay detection, and the video driver only supports a single YUV color space. Configure options: --disable-sdl2 to disable SDL 2.0+ detection, --disable-sdl to disable SDL 1.2+ detection. Both options need to be specified to turn off SDL support entirely.
2012-12-28 07:07:14 +00:00
vo_sdl: some OSD optimizations The premultiplied-alpha hack is changed: - The first stage now uses a colormod of black with an unmodified texture. This saves on applying the AND mask of 0xFF000000 to keep alpha only. - The second stage no longer uses an AND mask, but only an OR mask of 0xFF000000 to cancel out alpha. - The texture uploads are no longer done using SDL_LockTexture, SDL_ConvertPixels, SDL_UnlockTexture when the mpv pixel format matches the OSD's pixel format. Instead, SDL_UploadTexture is used, which saves a copy when using the "opengl" renderer.
2012-12-28 13:27:03 +00:00
upload_to_texture(vo, tex, bmp->w, bmp->h,
temppixels, sizeof(uint32_t) * bmp->w);
talloc_free(temppixels);
}
vo/ao: SDL 1.2+ audio driver, SDL 2.0+ accelerated video driver This mainly serves as a fallback for platforms where nothing better is available; also as a debugging help. Both the audio and video driver are not first class - the audio driver lacks delay detection, and the video driver only supports a single YUV color space. Configure options: --disable-sdl2 to disable SDL 2.0+ detection, --disable-sdl to disable SDL 1.2+ detection. Both options need to be specified to turn off SDL support entirely.
2012-12-28 07:07:14 +00:00
}
static void generate_osd_part(struct vo *vo, struct sub_bitmaps *imgs)
{
struct priv *vc = vo->priv;
struct osd_bitmap_surface *sfc = &vc->osd_surfaces[imgs->render_index];
if (imgs->format == SUBBITMAP_EMPTY || imgs->num_parts == 0)
return;
osd: simplify an aspect of change detection handling There was a somewhat obscure optimization in the OSD and subtitle rendering path: if only the position of the sub-images changed, and not the actual image data, uploading of the image data could be skipped. In theory, this could speed up things like scrolling subtitles. But it turns out that even in the rare cases subtitles have such scrolls or axis-aligned movement, modern libass rarely signals this kind of change. Possibly this is because of sub-pixel handling and such, which break this. As such, it's a worthless optimization and just introduces additional complexity and subtle bugs (especially in cases libass does the opposite: incorrectly signaling a position change only, which happened before). Remove this optimization, and rename bitmap_pos_id to change_id.
2015-03-18 11:33:14 +00:00
if (imgs->change_id == sfc->change_id)
vo/ao: SDL 1.2+ audio driver, SDL 2.0+ accelerated video driver This mainly serves as a fallback for platforms where nothing better is available; also as a debugging help. Both the audio and video driver are not first class - the audio driver lacks delay detection, and the video driver only supports a single YUV color space. Configure options: --disable-sdl2 to disable SDL 2.0+ detection, --disable-sdl to disable SDL 1.2+ detection. Both options need to be specified to turn off SDL support entirely.
2012-12-28 07:07:14 +00:00
return;
if (imgs->num_parts > sfc->targets_size) {
sfc->targets = talloc_realloc(vc, sfc->targets,
struct osd_target, imgs->num_parts);
memset(&sfc->targets[sfc->targets_size], 0, sizeof(struct osd_target) *
(imgs->num_parts - sfc->targets_size));
sfc->targets_size = imgs->num_parts;
}
sfc->num_targets = imgs->num_parts;
for (int i = 0; i < imgs->num_parts; i++) {
struct osd_target *target = sfc->targets + i;
struct sub_bitmap *bmp = imgs->parts + i;
target->source = (SDL_Rect){
0, 0, bmp->w, bmp->h
};
target->dest = (SDL_Rect){
bmp->x, bmp->y, bmp->dw, bmp->dh
};
osd: simplify an aspect of change detection handling There was a somewhat obscure optimization in the OSD and subtitle rendering path: if only the position of the sub-images changed, and not the actual image data, uploading of the image data could be skipped. In theory, this could speed up things like scrolling subtitles. But it turns out that even in the rare cases subtitles have such scrolls or axis-aligned movement, modern libass rarely signals this kind of change. Possibly this is because of sub-pixel handling and such, which break this. As such, it's a worthless optimization and just introduces additional complexity and subtle bugs (especially in cases libass does the opposite: incorrectly signaling a position change only, which happened before). Remove this optimization, and rename bitmap_pos_id to change_id.
2015-03-18 11:33:14 +00:00
// tex: alpha blended texture
if (target->tex) {
SDL_DestroyTexture(target->tex);
target->tex = NULL;
}
if (!target->tex)
target->tex = SDL_CreateTexture(vc->renderer,
vc->osd_format.sdl, SDL_TEXTUREACCESS_STREAMING,
bmp->w, bmp->h);
if (!target->tex) {
MP_ERR(vo, "Could not create texture\n");
}
if (target->tex) {
SDL_SetTextureBlendMode(target->tex,
SDL_BLENDMODE_BLEND);
SDL_SetTextureColorMod(target->tex, 0, 0, 0);
subbitmap_to_texture(vo, target->tex, bmp, 0); // RGBA -> 000A
}
vo/ao: SDL 1.2+ audio driver, SDL 2.0+ accelerated video driver This mainly serves as a fallback for platforms where nothing better is available; also as a debugging help. Both the audio and video driver are not first class - the audio driver lacks delay detection, and the video driver only supports a single YUV color space. Configure options: --disable-sdl2 to disable SDL 2.0+ detection, --disable-sdl to disable SDL 1.2+ detection. Both options need to be specified to turn off SDL support entirely.
2012-12-28 07:07:14 +00:00
osd: simplify an aspect of change detection handling There was a somewhat obscure optimization in the OSD and subtitle rendering path: if only the position of the sub-images changed, and not the actual image data, uploading of the image data could be skipped. In theory, this could speed up things like scrolling subtitles. But it turns out that even in the rare cases subtitles have such scrolls or axis-aligned movement, modern libass rarely signals this kind of change. Possibly this is because of sub-pixel handling and such, which break this. As such, it's a worthless optimization and just introduces additional complexity and subtle bugs (especially in cases libass does the opposite: incorrectly signaling a position change only, which happened before). Remove this optimization, and rename bitmap_pos_id to change_id.
2015-03-18 11:33:14 +00:00
// tex2: added texture
if (target->tex2) {
SDL_DestroyTexture(target->tex2);
target->tex2 = NULL;
}
if (!target->tex2)
target->tex2 = SDL_CreateTexture(vc->renderer,
vc->osd_format.sdl, SDL_TEXTUREACCESS_STREAMING,
bmp->w, bmp->h);
if (!target->tex2) {
MP_ERR(vo, "Could not create texture\n");
}
if (target->tex2) {
SDL_SetTextureBlendMode(target->tex2,
SDL_BLENDMODE_ADD);
subbitmap_to_texture(vo, target->tex2, bmp,
0xFF000000); // RGBA -> RGB1
vo/ao: SDL 1.2+ audio driver, SDL 2.0+ accelerated video driver This mainly serves as a fallback for platforms where nothing better is available; also as a debugging help. Both the audio and video driver are not first class - the audio driver lacks delay detection, and the video driver only supports a single YUV color space. Configure options: --disable-sdl2 to disable SDL 2.0+ detection, --disable-sdl to disable SDL 1.2+ detection. Both options need to be specified to turn off SDL support entirely.
2012-12-28 07:07:14 +00:00
}
}
osd: simplify an aspect of change detection handling There was a somewhat obscure optimization in the OSD and subtitle rendering path: if only the position of the sub-images changed, and not the actual image data, uploading of the image data could be skipped. In theory, this could speed up things like scrolling subtitles. But it turns out that even in the rare cases subtitles have such scrolls or axis-aligned movement, modern libass rarely signals this kind of change. Possibly this is because of sub-pixel handling and such, which break this. As such, it's a worthless optimization and just introduces additional complexity and subtle bugs (especially in cases libass does the opposite: incorrectly signaling a position change only, which happened before). Remove this optimization, and rename bitmap_pos_id to change_id.
2015-03-18 11:33:14 +00:00
sfc->change_id = imgs->change_id;
vo/ao: SDL 1.2+ audio driver, SDL 2.0+ accelerated video driver This mainly serves as a fallback for platforms where nothing better is available; also as a debugging help. Both the audio and video driver are not first class - the audio driver lacks delay detection, and the video driver only supports a single YUV color space. Configure options: --disable-sdl2 to disable SDL 2.0+ detection, --disable-sdl to disable SDL 1.2+ detection. Both options need to be specified to turn off SDL support entirely.
2012-12-28 07:07:14 +00:00
}
static void draw_osd_part(struct vo *vo, int index)
{
struct priv *vc = vo->priv;
struct osd_bitmap_surface *sfc = &vc->osd_surfaces[index];
int i;
for (i = 0; i < sfc->num_targets; i++) {
struct osd_target *target = sfc->targets + i;
if (target->tex)
SDL_RenderCopy(vc->renderer, target->tex,
&target->source, &target->dest);
if (target->tex2)
SDL_RenderCopy(vc->renderer, target->tex2,
&target->source, &target->dest);
}
}
static void draw_osd_cb(void *ctx, struct sub_bitmaps *imgs)
{
struct vo *vo = ctx;
generate_osd_part(vo, imgs);
draw_osd_part(vo, imgs->render_index);
}
video/out: change aspects of OSD handling Let the VOs draw the OSD on their own, instead of making OSD drawing a separate VO driver call. Further, let it be the VOs responsibility to request subtitles with the correct PTS. We also basically allow the VO to request OSD/subtitles at any time. OSX changes untested.
2014-06-15 18:46:57 +00:00
static void draw_osd(struct vo *vo)
vo/ao: SDL 1.2+ audio driver, SDL 2.0+ accelerated video driver This mainly serves as a fallback for platforms where nothing better is available; also as a debugging help. Both the audio and video driver are not first class - the audio driver lacks delay detection, and the video driver only supports a single YUV color space. Configure options: --disable-sdl2 to disable SDL 2.0+ detection, --disable-sdl to disable SDL 1.2+ detection. Both options need to be specified to turn off SDL support entirely.
2012-12-28 07:07:14 +00:00
{
struct priv *vc = vo->priv;
Fix some -Wshadow warnings In general, this warning can hint to actual bugs. We don't enable it yet, because it would conflict with some unmerged code, and we should check with clang too (this commit was done by testing with gcc).
2013-07-22 22:45:23 +00:00
static const bool osdformats[SUBBITMAP_COUNT] = {
vo/ao: SDL 1.2+ audio driver, SDL 2.0+ accelerated video driver This mainly serves as a fallback for platforms where nothing better is available; also as a debugging help. Both the audio and video driver are not first class - the audio driver lacks delay detection, and the video driver only supports a single YUV color space. Configure options: --disable-sdl2 to disable SDL 2.0+ detection, --disable-sdl to disable SDL 1.2+ detection. Both options need to be specified to turn off SDL support entirely.
2012-12-28 07:07:14 +00:00
[SUBBITMAP_RGBA] = true,
};
video/out: change aspects of OSD handling Let the VOs draw the OSD on their own, instead of making OSD drawing a separate VO driver call. Further, let it be the VOs responsibility to request subtitles with the correct PTS. We also basically allow the VO to request OSD/subtitles at any time. OSX changes untested.
2014-06-15 18:46:57 +00:00
osd_draw(vo->osd, vc->osd_res, vc->osd_pts, 0, osdformats, draw_osd_cb, vo);
vo/ao: SDL 1.2+ audio driver, SDL 2.0+ accelerated video driver This mainly serves as a fallback for platforms where nothing better is available; also as a debugging help. Both the audio and video driver are not first class - the audio driver lacks delay detection, and the video driver only supports a single YUV color space. Configure options: --disable-sdl2 to disable SDL 2.0+ detection, --disable-sdl to disable SDL 1.2+ detection. Both options need to be specified to turn off SDL support entirely.
2012-12-28 07:07:14 +00:00
}
video/out: remove options argument from preinit() All VOs use proper option parsing now, and compatibility hacks are not needed.
2013-07-22 20:52:42 +00:00
static int preinit(struct vo *vo)
vo/ao: SDL 1.2+ audio driver, SDL 2.0+ accelerated video driver This mainly serves as a fallback for platforms where nothing better is available; also as a debugging help. Both the audio and video driver are not first class - the audio driver lacks delay detection, and the video driver only supports a single YUV color space. Configure options: --disable-sdl2 to disable SDL 2.0+ detection, --disable-sdl to disable SDL 1.2+ detection. Both options need to be specified to turn off SDL support entirely.
2012-12-28 07:07:14 +00:00
{
struct priv *vc = vo->priv;
if (SDL_WasInit(SDL_INIT_VIDEO)) {
Some more mp_msg conversions Also add a note to mp_msg.h, since it might be not clear which of the two mechanisms is preferred.
2013-08-23 21:30:09 +00:00
MP_ERR(vo, "already initialized\n");
vo/ao: SDL 1.2+ audio driver, SDL 2.0+ accelerated video driver This mainly serves as a fallback for platforms where nothing better is available; also as a debugging help. Both the audio and video driver are not first class - the audio driver lacks delay detection, and the video driver only supports a single YUV color space. Configure options: --disable-sdl2 to disable SDL 2.0+ detection, --disable-sdl to disable SDL 1.2+ detection. Both options need to be specified to turn off SDL support entirely.
2012-12-28 07:07:14 +00:00
return -1;
}
// predefine SDL defaults (SDL env vars shall override)
SDL_SetHintWithPriority(SDL_HINT_RENDER_SCALE_QUALITY, "1",
SDL_HINT_DEFAULT);
vo_sdl: we don't want to minize the window when losing focus Because: this makes multi-monitor use entirely useless (as soon as pointer leaves left screen, mpv gets auto minimized).
2013-03-06 17:09:35 +00:00
SDL_SetHintWithPriority(SDL_HINT_VIDEO_MINIMIZE_ON_FOCUS_LOSS, "0",
SDL_HINT_DEFAULT);
vo/ao: SDL 1.2+ audio driver, SDL 2.0+ accelerated video driver This mainly serves as a fallback for platforms where nothing better is available; also as a debugging help. Both the audio and video driver are not first class - the audio driver lacks delay detection, and the video driver only supports a single YUV color space. Configure options: --disable-sdl2 to disable SDL 2.0+ detection, --disable-sdl to disable SDL 1.2+ detection. Both options need to be specified to turn off SDL support entirely.
2012-12-28 07:07:14 +00:00
// predefine MPV options (SDL env vars shall be overridden)
options: remove --no-vsync Latest nvidia drivers ignore the application setting, so this switch makes even less sense than before. It's still possible to control this with VO specific suboptions.
2013-03-05 23:24:34 +00:00
SDL_SetHintWithPriority(SDL_HINT_RENDER_VSYNC, vc->vsync ? "1" : "0",
SDL_HINT_OVERRIDE);
vo/ao: SDL 1.2+ audio driver, SDL 2.0+ accelerated video driver This mainly serves as a fallback for platforms where nothing better is available; also as a debugging help. Both the audio and video driver are not first class - the audio driver lacks delay detection, and the video driver only supports a single YUV color space. Configure options: --disable-sdl2 to disable SDL 2.0+ detection, --disable-sdl to disable SDL 1.2+ detection. Both options need to be specified to turn off SDL support entirely.
2012-12-28 07:07:14 +00:00
if (SDL_InitSubSystem(SDL_INIT_VIDEO)) {
Some more mp_msg conversions Also add a note to mp_msg.h, since it might be not clear which of the two mechanisms is preferred.
2013-08-23 21:30:09 +00:00
MP_ERR(vo, "SDL_Init failed\n");
vo/ao: SDL 1.2+ audio driver, SDL 2.0+ accelerated video driver This mainly serves as a fallback for platforms where nothing better is available; also as a debugging help. Both the audio and video driver are not first class - the audio driver lacks delay detection, and the video driver only supports a single YUV color space. Configure options: --disable-sdl2 to disable SDL 2.0+ detection, --disable-sdl to disable SDL 1.2+ detection. Both options need to be specified to turn off SDL support entirely.
2012-12-28 07:07:14 +00:00
return -1;
}
// try creating a renderer (this also gets the renderer_info data
// for query_format to use!)
vo_sdl: don't use VOCTRL_UPDATE_SCREENINFO
2014-05-06 18:35:19 +00:00
if (init_renderer(vo, &(struct mp_rect){.x1 = 640, .y1 = 480}, 0) != 0)
vo/ao: SDL 1.2+ audio driver, SDL 2.0+ accelerated video driver This mainly serves as a fallback for platforms where nothing better is available; also as a debugging help. Both the audio and video driver are not first class - the audio driver lacks delay detection, and the video driver only supports a single YUV color space. Configure options: --disable-sdl2 to disable SDL 2.0+ detection, --disable-sdl to disable SDL 1.2+ detection. Both options need to be specified to turn off SDL support entirely.
2012-12-28 07:07:14 +00:00
return -1;
// please reinitialize the renderer to proper size on config()
vc->reinit_renderer = true;
video: move display and timing to a separate thread The VO is run inside its own thread. It also does most of video timing. The playloop hands the image data and a realtime timestamp to the VO, and the VO does the rest. In particular, this allows the playloop to do other things, instead of blocking for video redraw. But if anything accesses the VO during video timing, it will block. This also fixes vo_sdl.c event handling; but that is only a side-effect, since reimplementing the broken way would require more effort. Also drop --softsleep. In theory, this option helps if the kernel's sleeping mechanism is too inaccurate for video timing. In practice, I haven't ever encountered a situation where it helps, and it just burns CPU cycles. On the other hand it's probably actively harmful, because it prevents the libavcodec decoder threads from doing real work. Side note: Originally, I intended that multiple frames can be queued to the VO. But this is not done, due to problems with OSD and other certain features. OSD in particular is simply designed in a way that it can be neither timed nor copied, so you do have to render it into the video frame before you can draw the next frame. (Subtitles have no such restriction. sd_lavc was even updated to fix this.) It seems the right solution to queuing multiple VO frames is rendering on VO-backed framebuffers, like vo_vdpau.c does. This requires VO driver support, and is out of scope of this commit. As consequence, the VO has a queue size of 1. The existing video queue is just needed to compute frame duration, and will be moved out in the next commit.
2014-08-12 21:02:08 +00:00
vc->wakeup_event = SDL_RegisterEvents(1);
if (vc->wakeup_event == (Uint32)-1)
MP_ERR(vo, "SDL_RegisterEvents() failed.\n");
vo/ao: SDL 1.2+ audio driver, SDL 2.0+ accelerated video driver This mainly serves as a fallback for platforms where nothing better is available; also as a debugging help. Both the audio and video driver are not first class - the audio driver lacks delay detection, and the video driver only supports a single YUV color space. Configure options: --disable-sdl2 to disable SDL 2.0+ detection, --disable-sdl to disable SDL 1.2+ detection. Both options need to be specified to turn off SDL support entirely.
2012-12-28 07:07:14 +00:00
return 0;
}
video: remove vfcap.h And remove all uses of the VFCAP_CSP_SUPPORTED* constants. This is supposed to reduce conversions if many filters are used (with many incompatible pixel formats), and also for preferring the VO's natively supported pixel formats (as opposed to conversion). This is worthless by now. Not only do the main VOs not use software conversion, but also the way vf_lavfi and libavfilter work mostly break the way the old MPlayer mechanism worked. Other important filters like vf_vapoursynth do not support "proper" format negotation either. Part of this was already removed with the vf_scale cleanup from today. While I'm touching every single VO, also fix the query_format argument (it's not a FourCC anymore).
2015-01-21 21:08:24 +00:00
static int query_format(struct vo *vo, int format)
vo/ao: SDL 1.2+ audio driver, SDL 2.0+ accelerated video driver This mainly serves as a fallback for platforms where nothing better is available; also as a debugging help. Both the audio and video driver are not first class - the audio driver lacks delay detection, and the video driver only supports a single YUV color space. Configure options: --disable-sdl2 to disable SDL 2.0+ detection, --disable-sdl to disable SDL 1.2+ detection. Both options need to be specified to turn off SDL support entirely.
2012-12-28 07:07:14 +00:00
{
struct priv *vc = vo->priv;
int i, j;
for (i = 0; i < vc->renderer_info.num_texture_formats; ++i)
for (j = 0; j < sizeof(formats) / sizeof(formats[0]); ++j)
if (vc->renderer_info.texture_formats[i] == formats[j].sdl)
if (format == formats[j].mpv)
video: remove vfcap.h And remove all uses of the VFCAP_CSP_SUPPORTED* constants. This is supposed to reduce conversions if many filters are used (with many incompatible pixel formats), and also for preferring the VO's natively supported pixel formats (as opposed to conversion). This is worthless by now. Not only do the main VOs not use software conversion, but also the way vf_lavfi and libavfilter work mostly break the way the old MPlayer mechanism worked. Other important filters like vf_vapoursynth do not support "proper" format negotation either. Part of this was already removed with the vf_scale cleanup from today. While I'm touching every single VO, also fix the query_format argument (it's not a FourCC anymore).
2015-01-21 21:08:24 +00:00
return 1;
vo/ao: SDL 1.2+ audio driver, SDL 2.0+ accelerated video driver This mainly serves as a fallback for platforms where nothing better is available; also as a debugging help. Both the audio and video driver are not first class - the audio driver lacks delay detection, and the video driver only supports a single YUV color space. Configure options: --disable-sdl2 to disable SDL 2.0+ detection, --disable-sdl to disable SDL 1.2+ detection. Both options need to be specified to turn off SDL support entirely.
2012-12-28 07:07:14 +00:00
return 0;
}
video/out: make draw_image mandatory, remove VOCTRL_DRAW_IMAGE Remove VOCTRL_DRAW_IMAGE and always set vo_driver.draw_image in VOs. Make draw_image mandatory: change some VOs (like vo_x11) to support it, and remove the image-to-slices fallback in vf_vo. Remove vo_driver.is_new. This member indicated whether draw_image is supported unconditionally, which is now always the case. draw_image_pts is a hack until the video filter chain is changed to include the PTS as field in mp_image. Then vo_vdpau and vo_lavc will be changed to use draw_image.
2012-11-04 14:56:04 +00:00
static void draw_image(struct vo *vo, mp_image_t *mpi)
vo/ao: SDL 1.2+ audio driver, SDL 2.0+ accelerated video driver This mainly serves as a fallback for platforms where nothing better is available; also as a debugging help. Both the audio and video driver are not first class - the audio driver lacks delay detection, and the video driver only supports a single YUV color space. Configure options: --disable-sdl2 to disable SDL 2.0+ detection, --disable-sdl to disable SDL 1.2+ detection. Both options need to be specified to turn off SDL support entirely.
2012-12-28 07:07:14 +00:00
{
struct priv *vc = vo->priv;
// decode brightness/contrast
int color_add = 0;
int color_mod = 255;
int brightness = vc->brightness;
int contrast = vc->contrast;
// only in this range it is possible to do brightness/contrast control
// properly, using just additive render operations and color modding
// (SDL2 provides no subtractive rendering, sorry)
if (2 * brightness < contrast) {
//brightness = (brightness + 2 * contrast) / 5; // closest point
brightness = (brightness + contrast) / 3; // equal adjustment
contrast = 2 * brightness;
}
// convert to values SDL2 likes
color_mod = ((contrast + 100) * 255 + 50) / 100;
color_add = ((2 * brightness - contrast) * 255 + 100) / 200;
// clamp
if (color_mod < 0)
color_mod = 0;
if (color_mod > 255)
color_mod = 255;
// color_add can't be < 0
if (color_add > 255)
color_add = 255;
video: cleanup: replace old mp_image function names mp_image_alloc() also changes argument order compared to alloc_mpi(). The format now comes first, then width/height.
2012-12-22 20:46:22 +00:00
// typically this runs in parallel with the following mp_image_copy call
vo/ao: SDL 1.2+ audio driver, SDL 2.0+ accelerated video driver This mainly serves as a fallback for platforms where nothing better is available; also as a debugging help. Both the audio and video driver are not first class - the audio driver lacks delay detection, and the video driver only supports a single YUV color space. Configure options: --disable-sdl2 to disable SDL 2.0+ detection, --disable-sdl to disable SDL 1.2+ detection. Both options need to be specified to turn off SDL support entirely.
2012-12-28 07:07:14 +00:00
SDL_SetRenderDrawColor(vc->renderer, color_add, color_add, color_add, 255);
SDL_RenderClear(vc->renderer);
// use additive blending for the video texture only if the clear color is
// not black (faster especially for the software renderer)
if (color_add)
SDL_SetTextureBlendMode(vc->tex, SDL_BLENDMODE_ADD);
else
SDL_SetTextureBlendMode(vc->tex, SDL_BLENDMODE_NONE);
if (mpi) {
video/out: change aspects of OSD handling Let the VOs draw the OSD on their own, instead of making OSD drawing a separate VO driver call. Further, let it be the VOs responsibility to request subtitles with the correct PTS. We also basically allow the VO to request OSD/subtitles at any time. OSX changes untested.
2014-06-15 18:46:57 +00:00
vc->osd_pts = mpi->pts;
vo_sdl: fix clearing the screen on reconfig Clear the texture on reconfig(). (We could probably also do this simpler with a flag, but this is actually less complicated - except that we move the code to "map" a texture to a separate function.)
2014-06-18 18:18:22 +00:00
mp_image_t texmpi;
if (!lock_texture(vo, &texmpi)) {
vo: make draw_image and vo_queue_image transfer image ownership Basically a cosmetic change. This is probably more intuitive.
2014-06-17 21:05:50 +00:00
talloc_free(mpi);
vo/ao: SDL 1.2+ audio driver, SDL 2.0+ accelerated video driver This mainly serves as a fallback for platforms where nothing better is available; also as a debugging help. Both the audio and video driver are not first class - the audio driver lacks delay detection, and the video driver only supports a single YUV color space. Configure options: --disable-sdl2 to disable SDL 2.0+ detection, --disable-sdl to disable SDL 1.2+ detection. Both options need to be specified to turn off SDL support entirely.
2012-12-28 07:07:14 +00:00
return;
}
vo_sdl: fix clearing the screen on reconfig Clear the texture on reconfig(). (We could probably also do this simpler with a flag, but this is actually less complicated - except that we move the code to "map" a texture to a separate function.)
2014-06-18 18:18:22 +00:00
mp_image_copy(&texmpi, mpi);
vo/ao: SDL 1.2+ audio driver, SDL 2.0+ accelerated video driver This mainly serves as a fallback for platforms where nothing better is available; also as a debugging help. Both the audio and video driver are not first class - the audio driver lacks delay detection, and the video driver only supports a single YUV color space. Configure options: --disable-sdl2 to disable SDL 2.0+ detection, --disable-sdl to disable SDL 1.2+ detection. Both options need to be specified to turn off SDL support entirely.
2012-12-28 07:07:14 +00:00
SDL_UnlockTexture(vc->tex);
vo_sdl: fix glaring memory leak Who knows when this broke?
2015-06-25 07:55:24 +00:00
talloc_free(mpi);
vo/ao: SDL 1.2+ audio driver, SDL 2.0+ accelerated video driver This mainly serves as a fallback for platforms where nothing better is available; also as a debugging help. Both the audio and video driver are not first class - the audio driver lacks delay detection, and the video driver only supports a single YUV color space. Configure options: --disable-sdl2 to disable SDL 2.0+ detection, --disable-sdl to disable SDL 1.2+ detection. Both options need to be specified to turn off SDL support entirely.
2012-12-28 07:07:14 +00:00
}
SDL_Rect src, dst;
src.x = vc->src_rect.x0;
src.y = vc->src_rect.y0;
src.w = vc->src_rect.x1 - vc->src_rect.x0;
src.h = vc->src_rect.y1 - vc->src_rect.y0;
dst.x = vc->dst_rect.x0;
dst.y = vc->dst_rect.y0;
dst.w = vc->dst_rect.x1 - vc->dst_rect.x0;
dst.h = vc->dst_rect.y1 - vc->dst_rect.y0;
video: cleanup: replace old mp_image function names mp_image_alloc() also changes argument order compared to alloc_mpi(). The format now comes first, then width/height.
2012-12-22 20:46:22 +00:00
// typically this runs in parallel with the following mp_image_copy call
vo/ao: SDL 1.2+ audio driver, SDL 2.0+ accelerated video driver This mainly serves as a fallback for platforms where nothing better is available; also as a debugging help. Both the audio and video driver are not first class - the audio driver lacks delay detection, and the video driver only supports a single YUV color space. Configure options: --disable-sdl2 to disable SDL 2.0+ detection, --disable-sdl to disable SDL 1.2+ detection. Both options need to be specified to turn off SDL support entirely.
2012-12-28 07:07:14 +00:00
if (color_mod > 255) {
SDL_SetTextureColorMod(vc->tex, color_mod / 2, color_mod / 2, color_mod / 2);
SDL_RenderCopy(vc->renderer, vc->tex, &src, &dst);
SDL_RenderCopy(vc->renderer, vc->tex, &src, &dst);
} else {
SDL_SetTextureColorMod(vc->tex, color_mod, color_mod, color_mod);
SDL_RenderCopy(vc->renderer, vc->tex, &src, &dst);
}
video/out: change aspects of OSD handling Let the VOs draw the OSD on their own, instead of making OSD drawing a separate VO driver call. Further, let it be the VOs responsibility to request subtitles with the correct PTS. We also basically allow the VO to request OSD/subtitles at any time. OSX changes untested.
2014-06-15 18:46:57 +00:00
draw_osd(vo);
vo/ao: SDL 1.2+ audio driver, SDL 2.0+ accelerated video driver This mainly serves as a fallback for platforms where nothing better is available; also as a debugging help. Both the audio and video driver are not first class - the audio driver lacks delay detection, and the video driver only supports a single YUV color space. Configure options: --disable-sdl2 to disable SDL 2.0+ detection, --disable-sdl to disable SDL 1.2+ detection. Both options need to be specified to turn off SDL support entirely.
2012-12-28 07:07:14 +00:00
}
static struct mp_image *get_window_screenshot(struct vo *vo)
{
struct priv *vc = vo->priv;
video: cleanup: replace old mp_image function names mp_image_alloc() also changes argument order compared to alloc_mpi(). The format now comes first, then width/height.
2012-12-22 20:46:22 +00:00
struct mp_image *image = mp_image_alloc(vc->osd_format.mpv, vo->dwidth,
vo->dheight);
video: introduce failure path for image allocations Until now, failure to allocate image data resulted in a crash (i.e. abort() was called). This was intentional, because it's pretty silly to degrade playback, and in almost all situations, the OOM will probably kill you anyway. (And then there's the standard Linux overcommit behavior, which also will kill you at some point.) But I changed my opinion, so here we go. This change does not affect _all_ memory allocations, just image data. Now in most failure cases, the output will just be skipped. For video filters, this coincidentally means that failure is treated as EOF (because the playback core assumes EOF if nothing comes out of the video filter chain). In other situations, output might be in some way degraded, like skipping frames, not scaling OSD, and such. Functions whose return values changed semantics: mp_image_alloc mp_image_new_copy mp_image_new_ref mp_image_make_writeable mp_image_setrefp mp_image_to_av_frame_and_unref mp_image_from_av_frame mp_image_new_external_ref mp_image_new_custom_ref mp_image_pool_make_writeable mp_image_pool_get mp_image_pool_new_copy mp_vdpau_mixed_frame_create vf_alloc_out_image vf_make_out_image_writeable glGetWindowScreenshot
2014-06-17 20:43:43 +00:00
if (!image)
return NULL;
vo/ao: SDL 1.2+ audio driver, SDL 2.0+ accelerated video driver This mainly serves as a fallback for platforms where nothing better is available; also as a debugging help. Both the audio and video driver are not first class - the audio driver lacks delay detection, and the video driver only supports a single YUV color space. Configure options: --disable-sdl2 to disable SDL 2.0+ detection, --disable-sdl to disable SDL 1.2+ detection. Both options need to be specified to turn off SDL support entirely.
2012-12-28 07:07:14 +00:00
if (SDL_RenderReadPixels(vc->renderer, NULL, vc->osd_format.sdl,
image->planes[0], image->stride[0])) {
Some more mp_msg conversions Also add a note to mp_msg.h, since it might be not clear which of the two mechanisms is preferred.
2013-08-23 21:30:09 +00:00
MP_ERR(vo, "SDL_RenderReadPixels failed\n");
video: cleanup: replace old mp_image function names mp_image_alloc() also changes argument order compared to alloc_mpi(). The format now comes first, then width/height.
2012-12-22 20:46:22 +00:00
talloc_free(image);
vo/ao: SDL 1.2+ audio driver, SDL 2.0+ accelerated video driver This mainly serves as a fallback for platforms where nothing better is available; also as a debugging help. Both the audio and video driver are not first class - the audio driver lacks delay detection, and the video driver only supports a single YUV color space. Configure options: --disable-sdl2 to disable SDL 2.0+ detection, --disable-sdl to disable SDL 1.2+ detection. Both options need to be specified to turn off SDL support entirely.
2012-12-28 07:07:14 +00:00
return NULL;
}
return image;
}
static int set_eq(struct vo *vo, const char *name, int value)
{
struct priv *vc = vo->priv;
video/out: use strcmp() instead of strcasecmp() for equalizers This makes it more consistent with the more important VOs.
2014-07-10 06:26:44 +00:00
if (!strcmp(name, "brightness"))
vo/ao: SDL 1.2+ audio driver, SDL 2.0+ accelerated video driver This mainly serves as a fallback for platforms where nothing better is available; also as a debugging help. Both the audio and video driver are not first class - the audio driver lacks delay detection, and the video driver only supports a single YUV color space. Configure options: --disable-sdl2 to disable SDL 2.0+ detection, --disable-sdl to disable SDL 1.2+ detection. Both options need to be specified to turn off SDL support entirely.
2012-12-28 07:07:14 +00:00
vc->brightness = value;
video/out: use strcmp() instead of strcasecmp() for equalizers This makes it more consistent with the more important VOs.
2014-07-10 06:26:44 +00:00
else if (!strcmp(name, "contrast"))
vo/ao: SDL 1.2+ audio driver, SDL 2.0+ accelerated video driver This mainly serves as a fallback for platforms where nothing better is available; also as a debugging help. Both the audio and video driver are not first class - the audio driver lacks delay detection, and the video driver only supports a single YUV color space. Configure options: --disable-sdl2 to disable SDL 2.0+ detection, --disable-sdl to disable SDL 1.2+ detection. Both options need to be specified to turn off SDL support entirely.
2012-12-28 07:07:14 +00:00
vc->contrast = value;
else
return VO_NOTIMPL;
vo->want_redraw = true;
return VO_TRUE;
}
static int get_eq(struct vo *vo, const char *name, int *value)
{
struct priv *vc = vo->priv;
video/out: use strcmp() instead of strcasecmp() for equalizers This makes it more consistent with the more important VOs.
2014-07-10 06:26:44 +00:00
if (!strcmp(name, "brightness"))
vo/ao: SDL 1.2+ audio driver, SDL 2.0+ accelerated video driver This mainly serves as a fallback for platforms where nothing better is available; also as a debugging help. Both the audio and video driver are not first class - the audio driver lacks delay detection, and the video driver only supports a single YUV color space. Configure options: --disable-sdl2 to disable SDL 2.0+ detection, --disable-sdl to disable SDL 1.2+ detection. Both options need to be specified to turn off SDL support entirely.
2012-12-28 07:07:14 +00:00
*value = vc->brightness;
video/out: use strcmp() instead of strcasecmp() for equalizers This makes it more consistent with the more important VOs.
2014-07-10 06:26:44 +00:00
else if (!strcmp(name, "contrast"))
vo/ao: SDL 1.2+ audio driver, SDL 2.0+ accelerated video driver This mainly serves as a fallback for platforms where nothing better is available; also as a debugging help. Both the audio and video driver are not first class - the audio driver lacks delay detection, and the video driver only supports a single YUV color space. Configure options: --disable-sdl2 to disable SDL 2.0+ detection, --disable-sdl to disable SDL 1.2+ detection. Both options need to be specified to turn off SDL support entirely.
2012-12-28 07:07:14 +00:00
*value = vc->contrast;
else
return VO_NOTIMPL;
return VO_TRUE;
}
static int control(struct vo *vo, uint32_t request, void *data)
{
video/out: introduce VOCTRL_UPDATE_WINDOW_TITLE Instead of implicitly changing the window title on config(), do it as part of the new VOCTRL. At first I wanted to make all VOs use the VOCTRL argument directly, but on a second thought it appears vo_get_window_title() is much more useful for some (namely, if the window is created lazily on first config()). Not all VOs are changed. Wayland and OSX have to follow.
2013-06-15 17:04:20 +00:00
struct priv *vc = vo->priv;
vo/ao: SDL 1.2+ audio driver, SDL 2.0+ accelerated video driver This mainly serves as a fallback for platforms where nothing better is available; also as a debugging help. Both the audio and video driver are not first class - the audio driver lacks delay detection, and the video driver only supports a single YUV color space. Configure options: --disable-sdl2 to disable SDL 2.0+ detection, --disable-sdl to disable SDL 1.2+ detection. Both options need to be specified to turn off SDL support entirely.
2012-12-28 07:07:14 +00:00
switch (request) {
case VOCTRL_FULLSCREEN:
command: unify handling of fullscreen and other VO flags The "ontop" and "border" properties already used a common mp_property_vo_flag() function, and the corresponding VOCTRLs used the same conventions. "fullscreen" is pretty similar, but was handled slightly similar. Change how VOCTRL_FULLSCREEN behaves, and use the same helper function for "fullscreen" as the other flags.
2015-01-16 22:07:13 +00:00
vo->opts->fullscreen = !vo->opts->fullscreen;
video: remove fullscreen flags chaos 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>
2013-07-18 12:05:39 +00:00
set_fullscreen(vo);
vo/ao: SDL 1.2+ audio driver, SDL 2.0+ accelerated video driver This mainly serves as a fallback for platforms where nothing better is available; also as a debugging help. Both the audio and video driver are not first class - the audio driver lacks delay detection, and the video driver only supports a single YUV color space. Configure options: --disable-sdl2 to disable SDL 2.0+ detection, --disable-sdl to disable SDL 1.2+ detection. Both options need to be specified to turn off SDL support entirely.
2012-12-28 07:07:14 +00:00
return 1;
case VOCTRL_REDRAW_FRAME:
video/out: make draw_image mandatory, remove VOCTRL_DRAW_IMAGE Remove VOCTRL_DRAW_IMAGE and always set vo_driver.draw_image in VOs. Make draw_image mandatory: change some VOs (like vo_x11) to support it, and remove the image-to-slices fallback in vf_vo. Remove vo_driver.is_new. This member indicated whether draw_image is supported unconditionally, which is now always the case. draw_image_pts is a hack until the video filter chain is changed to include the PTS as field in mp_image. Then vo_vdpau and vo_lavc will be changed to use draw_image.
2012-11-04 14:56:04 +00:00
draw_image(vo, NULL);
vo/ao: SDL 1.2+ audio driver, SDL 2.0+ accelerated video driver This mainly serves as a fallback for platforms where nothing better is available; also as a debugging help. Both the audio and video driver are not first class - the audio driver lacks delay detection, and the video driver only supports a single YUV color space. Configure options: --disable-sdl2 to disable SDL 2.0+ detection, --disable-sdl to disable SDL 1.2+ detection. Both options need to be specified to turn off SDL support entirely.
2012-12-28 07:07:14 +00:00
return 1;
case VOCTRL_GET_PANSCAN:
return VO_TRUE;
case VOCTRL_SET_PANSCAN:
force_resize(vo);
return VO_TRUE;
case VOCTRL_SET_EQUALIZER: {
struct voctrl_set_equalizer_args *args = data;
return set_eq(vo, args->name, args->value);
}
case VOCTRL_GET_EQUALIZER: {
struct voctrl_get_equalizer_args *args = data;
return get_eq(vo, args->name, args->valueptr);
}
video: separate screenshot modes Use different VOCTRLs for "window" and normal screenshot modes. The normal one will probably be removed, and replaced by generic code in vo.c, and this commit is preparation for this. (Doing it the other way around would be slightly simpler, but I haven't decided yet about the second one, and touching every VO is needed anyway in order to remove the unneeded crap. E.g. has_osd has been unused for a long time.)
2015-01-23 21:06:12 +00:00
case VOCTRL_SCREENSHOT_WIN:
*(struct mp_image **)data = get_window_screenshot(vo);
vo/ao: SDL 1.2+ audio driver, SDL 2.0+ accelerated video driver This mainly serves as a fallback for platforms where nothing better is available; also as a debugging help. Both the audio and video driver are not first class - the audio driver lacks delay detection, and the video driver only supports a single YUV color space. Configure options: --disable-sdl2 to disable SDL 2.0+ detection, --disable-sdl to disable SDL 1.2+ detection. Both options need to be specified to turn off SDL support entirely.
2012-12-28 07:07:14 +00:00
return true;
vo_sdl: use VOCTRL_SET_CURSOR_VISIBILITY
2013-05-16 21:37:17 +00:00
case VOCTRL_SET_CURSOR_VISIBILITY:
SDL_ShowCursor(*(bool *)data);
return true;
video/out: introduce VOCTRL_UPDATE_WINDOW_TITLE Instead of implicitly changing the window title on config(), do it as part of the new VOCTRL. At first I wanted to make all VOs use the VOCTRL argument directly, but on a second thought it appears vo_get_window_title() is much more useful for some (namely, if the window is created lazily on first config()). Not all VOs are changed. Wayland and OSX have to follow.
2013-06-15 17:04:20 +00:00
case VOCTRL_UPDATE_WINDOW_TITLE:
if (vc->window)
SDL_SetWindowTitle(vc->window, vo_get_window_title(vo));
return true;
vo/ao: SDL 1.2+ audio driver, SDL 2.0+ accelerated video driver This mainly serves as a fallback for platforms where nothing better is available; also as a debugging help. Both the audio and video driver are not first class - the audio driver lacks delay detection, and the video driver only supports a single YUV color space. Configure options: --disable-sdl2 to disable SDL 2.0+ detection, --disable-sdl to disable SDL 1.2+ detection. Both options need to be specified to turn off SDL support entirely.
2012-12-28 07:07:14 +00:00
}
return VO_NOTIMPL;
}
#define OPT_BASE_STRUCT struct priv
const struct vo_driver video_out_sdl = {
video/out: remove useless info struct and redundant fields The author and comment fields were printed only in -v mode.
2013-10-23 17:06:14 +00:00
.description = "SDL 2.0 Renderer",
.name = "sdl",
vo/ao: SDL 1.2+ audio driver, SDL 2.0+ accelerated video driver This mainly serves as a fallback for platforms where nothing better is available; also as a debugging help. Both the audio and video driver are not first class - the audio driver lacks delay detection, and the video driver only supports a single YUV color space. Configure options: --disable-sdl2 to disable SDL 2.0+ detection, --disable-sdl to disable SDL 1.2+ detection. Both options need to be specified to turn off SDL support entirely.
2012-12-28 07:07:14 +00:00
.priv_size = sizeof(struct priv),
vo_sdl: add a "sw" flag like in opengl Also, rework the renderer creation for the flag being generally effective even if the "SW renderer" is detected only after creating a context.
2013-01-04 16:43:37 +00:00
.priv_defaults = &(const struct priv) {
options: remove --no-vsync Latest nvidia drivers ignore the application setting, so this switch makes even less sense than before. It's still possible to control this with VO specific suboptions.
2013-03-05 23:24:34 +00:00
.renderer_index = -1,
.vsync = 1,
vo_sdl: add a "sw" flag like in opengl Also, rework the renderer creation for the flag being generally effective even if the "SW renderer" is detected only after creating a context.
2013-01-04 16:43:37 +00:00
},
.options = (const struct m_option []){
cleanup: replace OPT_FLAG_ON and OPT_MAKE_FLAGS with OPT_FLAG OPT_MAKE_FLAGS() used to emit two options (one with "no" prefixed), but that has been long removed by special casing flag options in the option parser. OPT_FLAG_ON() used to imply that there's no "no-" prefixed option, but this hasn't been the case for a while either. (Conceptually, it has been replaced by OPT_FLAG_STORE().) Remove OPT_FLAG_OFF, which was unused.
2013-02-08 20:09:18 +00:00
OPT_FLAG("sw", allow_sw, 0),
video/out: remove video mode switching (--vm) This allowed making the player switch the monitor video mode when creating the video window. This was a questionable feature, and with today's LCD screens certainly not useful anymore. Switching to a random video mode (going by video width/height) doesn't sound too useful either. I'm not sure about the win32 implementation, but the X part had several bugs. Even in mplayer-svn (where x11_common.c hasn't been receiving any larger changes for a long time), this code is buggy and doesn't do the right thing anyway. (And what the hell _did_ it do when using multiple physical monitors?) If you really want this, write a shell script that calls xrandr before and after calling mpv. vo_sdl still can do mode switching, because SDL has native support for it, and using it is trivial. Add a new sub-option for this.
2013-02-24 22:36:40 +00:00
OPT_FLAG("switch-mode", switch_mode, 0),
options: remove --no-vsync Latest nvidia drivers ignore the application setting, so this switch makes even less sense than before. It's still possible to control this with VO specific suboptions.
2013-03-05 23:24:34 +00:00
OPT_FLAG("vsync", vsync, 0),
vo_sdl: add a "sw" flag like in opengl Also, rework the renderer creation for the flag being generally effective even if the "SW renderer" is detected only after creating a context.
2013-01-04 16:43:37 +00:00
{NULL}
},
vo/ao: SDL 1.2+ audio driver, SDL 2.0+ accelerated video driver This mainly serves as a fallback for platforms where nothing better is available; also as a debugging help. Both the audio and video driver are not first class - the audio driver lacks delay detection, and the video driver only supports a single YUV color space. Configure options: --disable-sdl2 to disable SDL 2.0+ detection, --disable-sdl to disable SDL 1.2+ detection. Both options need to be specified to turn off SDL support entirely.
2012-12-28 07:07:14 +00:00
.preinit = preinit,
video/out: replace VOCTRL_QUERY_FORMAT with vo_driver.query_format
2012-11-04 15:24:18 +00:00
.query_format = query_format,
video/out: do remaining config to reconfig replacements The main difference between the old and new callbacks is that the old callbacks required passing the window size, which is and always was very inconvenient and confusing, since the window size is already in vo->dwidth and vo->dheight.
2014-01-24 20:22:25 +00:00
.reconfig = reconfig,
vo/ao: SDL 1.2+ audio driver, SDL 2.0+ accelerated video driver This mainly serves as a fallback for platforms where nothing better is available; also as a debugging help. Both the audio and video driver are not first class - the audio driver lacks delay detection, and the video driver only supports a single YUV color space. Configure options: --disable-sdl2 to disable SDL 2.0+ detection, --disable-sdl to disable SDL 1.2+ detection. Both options need to be specified to turn off SDL support entirely.
2012-12-28 07:07:14 +00:00
.control = control,
video/out: make draw_image mandatory, remove VOCTRL_DRAW_IMAGE Remove VOCTRL_DRAW_IMAGE and always set vo_driver.draw_image in VOs. Make draw_image mandatory: change some VOs (like vo_x11) to support it, and remove the image-to-slices fallback in vf_vo. Remove vo_driver.is_new. This member indicated whether draw_image is supported unconditionally, which is now always the case. draw_image_pts is a hack until the video filter chain is changed to include the PTS as field in mp_image. Then vo_vdpau and vo_lavc will be changed to use draw_image.
2012-11-04 14:56:04 +00:00
.draw_image = draw_image,
vo/ao: SDL 1.2+ audio driver, SDL 2.0+ accelerated video driver This mainly serves as a fallback for platforms where nothing better is available; also as a debugging help. Both the audio and video driver are not first class - the audio driver lacks delay detection, and the video driver only supports a single YUV color space. Configure options: --disable-sdl2 to disable SDL 2.0+ detection, --disable-sdl to disable SDL 1.2+ detection. Both options need to be specified to turn off SDL support entirely.
2012-12-28 07:07:14 +00:00
.uninit = uninit,
.flip_page = flip_page,
video: move display and timing to a separate thread The VO is run inside its own thread. It also does most of video timing. The playloop hands the image data and a realtime timestamp to the VO, and the VO does the rest. In particular, this allows the playloop to do other things, instead of blocking for video redraw. But if anything accesses the VO during video timing, it will block. This also fixes vo_sdl.c event handling; but that is only a side-effect, since reimplementing the broken way would require more effort. Also drop --softsleep. In theory, this option helps if the kernel's sleeping mechanism is too inaccurate for video timing. In practice, I haven't ever encountered a situation where it helps, and it just burns CPU cycles. On the other hand it's probably actively harmful, because it prevents the libavcodec decoder threads from doing real work. Side note: Originally, I intended that multiple frames can be queued to the VO. But this is not done, due to problems with OSD and other certain features. OSD in particular is simply designed in a way that it can be neither timed nor copied, so you do have to render it into the video frame before you can draw the next frame. (Subtitles have no such restriction. sd_lavc was even updated to fix this.) It seems the right solution to queuing multiple VO frames is rendering on VO-backed framebuffers, like vo_vdpau.c does. This requires VO driver support, and is out of scope of this commit. As consequence, the VO has a queue size of 1. The existing video queue is just needed to compute frame duration, and will be moved out in the next commit.
2014-08-12 21:02:08 +00:00
.wait_events = wait_events,
.wakeup = wakeup,
vo/ao: SDL 1.2+ audio driver, SDL 2.0+ accelerated video driver This mainly serves as a fallback for platforms where nothing better is available; also as a debugging help. Both the audio and video driver are not first class - the audio driver lacks delay detection, and the video driver only supports a single YUV color space. Configure options: --disable-sdl2 to disable SDL 2.0+ detection, --disable-sdl to disable SDL 1.2+ detection. Both options need to be specified to turn off SDL support entirely.
2012-12-28 07:07:14 +00:00
};