2009-02-08 03:27:30 +00:00
|
|
|
/*
|
|
|
|
* X11 Xv interface
|
|
|
|
*
|
|
|
|
* This file is part of MPlayer.
|
|
|
|
*
|
|
|
|
* MPlayer is free software; you can redistribute it and/or modify
|
|
|
|
* it under the terms of the GNU General Public License as published by
|
|
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
|
|
* (at your option) any later version.
|
|
|
|
*
|
|
|
|
* MPlayer is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
* GNU General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU General Public License along
|
|
|
|
* with MPlayer; if not, write to the Free Software Foundation, Inc.,
|
|
|
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
|
|
|
*/
|
2001-02-24 20:28:24 +00:00
|
|
|
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <string.h>
|
2008-04-04 05:04:11 +00:00
|
|
|
#include <stdint.h>
|
2008-12-01 17:53:57 +00:00
|
|
|
#include <stdbool.h>
|
2012-03-19 23:02:13 +00:00
|
|
|
#include <errno.h>
|
|
|
|
#include <X11/Xlib.h>
|
|
|
|
#include <X11/Xutil.h>
|
|
|
|
|
|
|
|
#include <libavutil/common.h>
|
2001-02-24 20:28:24 +00:00
|
|
|
|
|
|
|
#include "config.h"
|
2012-03-19 23:02:13 +00:00
|
|
|
|
|
|
|
#ifdef HAVE_SHM
|
|
|
|
#include <sys/ipc.h>
|
|
|
|
#include <sys/shm.h>
|
|
|
|
#include <X11/extensions/XShm.h>
|
|
|
|
#endif
|
|
|
|
|
|
|
|
// Note: depends on the inclusion of X11/extensions/XShm.h
|
|
|
|
#include <X11/extensions/Xv.h>
|
|
|
|
#include <X11/extensions/Xvlib.h>
|
|
|
|
|
2013-08-06 20:41:30 +00:00
|
|
|
#include "mpvcore/options.h"
|
2008-04-20 03:04:10 +00:00
|
|
|
#include "talloc.h"
|
2013-08-06 20:41:30 +00:00
|
|
|
#include "mpvcore/mp_msg.h"
|
2012-11-09 00:06:43 +00:00
|
|
|
#include "vo.h"
|
|
|
|
#include "video/vfcap.h"
|
|
|
|
#include "video/mp_image.h"
|
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
|
|
|
#include "video/img_fourcc.h"
|
2001-03-03 21:46:39 +00:00
|
|
|
#include "x11_common.h"
|
2012-11-09 00:06:43 +00:00
|
|
|
#include "video/memcpy_pic.h"
|
2011-01-26 17:40:52 +00:00
|
|
|
#include "sub/sub.h"
|
2012-11-21 16:59:24 +00:00
|
|
|
#include "sub/draw_bmp.h"
|
2012-11-09 00:06:43 +00:00
|
|
|
#include "video/csputils.h"
|
2013-08-06 20:41:30 +00:00
|
|
|
#include "mpvcore/m_option.h"
|
2013-01-02 11:55:52 +00:00
|
|
|
#include "osdep/timer.h"
|
2005-02-20 22:43:25 +00:00
|
|
|
|
2007-12-02 14:06:03 +00:00
|
|
|
static const vo_info_t info = {
|
2004-06-14 04:53:03 +00:00
|
|
|
"X11/Xv",
|
|
|
|
"xv",
|
|
|
|
"Gerd Knorr <kraxel@goldbach.in-berlin.de> and others",
|
|
|
|
""
|
2001-02-24 20:28:24 +00:00
|
|
|
};
|
|
|
|
|
2013-01-26 21:37:47 +00:00
|
|
|
#define CK_METHOD_NONE 0 // no colorkey drawing
|
|
|
|
#define CK_METHOD_BACKGROUND 1 // set colorkey as window background
|
|
|
|
#define CK_METHOD_AUTOPAINT 2 // let xv draw the colorkey
|
|
|
|
#define CK_METHOD_MANUALFILL 3 // manually draw the colorkey
|
|
|
|
#define CK_SRC_USE 0 // use specified / default colorkey
|
|
|
|
#define CK_SRC_SET 1 // use and set specified / default colorkey
|
|
|
|
#define CK_SRC_CUR 2 // use current colorkey (get it from xv)
|
|
|
|
|
2008-04-04 05:04:11 +00:00
|
|
|
struct xvctx {
|
2013-01-26 21:37:47 +00:00
|
|
|
struct xv_ck_info_s {
|
|
|
|
int method; // CK_METHOD_* constants
|
|
|
|
int source; // CK_SRC_* constants
|
|
|
|
} xv_ck_info;
|
2013-07-21 23:03:22 +00:00
|
|
|
int colorkey;
|
2013-01-26 21:37:47 +00:00
|
|
|
unsigned long xv_colorkey;
|
2013-07-21 22:59:00 +00:00
|
|
|
int xv_port;
|
|
|
|
int cfg_xv_adaptor;
|
2008-04-04 05:04:11 +00:00
|
|
|
XvAdaptorInfo *ai;
|
|
|
|
XvImageFormatValues *fo;
|
|
|
|
unsigned int formats, adaptors, xv_format;
|
|
|
|
int current_buf;
|
|
|
|
int current_ip_buf;
|
|
|
|
int num_buffers;
|
2012-11-21 16:59:24 +00:00
|
|
|
XvImage *xvimage[2];
|
2012-12-22 16:50:15 +00:00
|
|
|
struct mp_image *original_image;
|
2008-04-04 05:04:11 +00:00
|
|
|
uint32_t image_width;
|
|
|
|
uint32_t image_height;
|
|
|
|
uint32_t image_format;
|
2012-11-11 17:40:43 +00:00
|
|
|
struct mp_csp_details cached_csp;
|
2012-10-27 20:10:32 +00:00
|
|
|
struct mp_rect src_rect;
|
|
|
|
struct mp_rect dst_rect;
|
2008-04-04 05:04:11 +00:00
|
|
|
uint32_t max_width, max_height; // zero means: not set
|
2013-01-02 11:55:52 +00:00
|
|
|
int Shmem_Flag;
|
2008-04-04 05:04:11 +00:00
|
|
|
#ifdef HAVE_SHM
|
2012-11-21 16:59:24 +00:00
|
|
|
XShmSegmentInfo Shminfo[2];
|
2013-01-02 11:55:52 +00:00
|
|
|
int Shm_Warned_Slow;
|
2008-04-04 05:04:11 +00:00
|
|
|
#endif
|
|
|
|
};
|
2001-02-24 20:28:24 +00:00
|
|
|
|
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
|
|
|
struct fmt_entry {
|
|
|
|
int imgfmt;
|
|
|
|
int fourcc;
|
|
|
|
};
|
|
|
|
static const struct fmt_entry fmt_table[] = {
|
|
|
|
{IMGFMT_420P, MP_FOURCC_YV12},
|
|
|
|
{IMGFMT_420P, MP_FOURCC_I420},
|
|
|
|
{IMGFMT_YUYV, MP_FOURCC_YUY2},
|
|
|
|
{IMGFMT_UYVY, MP_FOURCC_UYVY},
|
|
|
|
{0}
|
|
|
|
};
|
|
|
|
|
2008-04-04 05:04:11 +00:00
|
|
|
static void allocate_xvimage(struct vo *, int);
|
|
|
|
static void deallocate_xvimage(struct vo *vo, int foo);
|
2012-11-30 16:45:40 +00:00
|
|
|
static struct mp_image get_xv_buffer(struct vo *vo, int buf_index);
|
2002-10-16 19:31:07 +00:00
|
|
|
|
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
|
|
|
static int find_xv_format(int imgfmt)
|
|
|
|
{
|
|
|
|
for (int n = 0; fmt_table[n].imgfmt; n++) {
|
|
|
|
if (fmt_table[n].imgfmt == imgfmt)
|
|
|
|
return fmt_table[n].fourcc;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2013-01-26 21:37:47 +00:00
|
|
|
static int xv_find_atom(struct vo *vo, uint32_t xv_port, const char *name,
|
|
|
|
bool get, int *min, int *max)
|
|
|
|
{
|
|
|
|
Atom atom = None;
|
|
|
|
int howmany = 0;
|
|
|
|
XvAttribute *attributes = XvQueryPortAttributes(vo->x11->display, xv_port,
|
|
|
|
&howmany);
|
|
|
|
for (int i = 0; i < howmany && attributes; i++) {
|
|
|
|
int flag = get ? XvGettable : XvSettable;
|
|
|
|
if (attributes[i].flags & flag) {
|
|
|
|
atom = XInternAtom(vo->x11->display, attributes[i].name, True);
|
|
|
|
*min = attributes[i].min_value;
|
|
|
|
*max = attributes[i].max_value;
|
|
|
|
/* since we have SET_DEFAULTS first in our list, we can check if it's available
|
|
|
|
then trigger it if it's ok so that the other values are at default upon query */
|
|
|
|
if (atom != None) {
|
|
|
|
if (!strcmp(attributes[i].name, "XV_BRIGHTNESS") &&
|
|
|
|
(!strcasecmp(name, "brightness")))
|
|
|
|
break;
|
|
|
|
else if (!strcmp(attributes[i].name, "XV_CONTRAST") &&
|
|
|
|
(!strcasecmp(name, "contrast")))
|
|
|
|
break;
|
|
|
|
else if (!strcmp(attributes[i].name, "XV_SATURATION") &&
|
|
|
|
(!strcasecmp(name, "saturation")))
|
|
|
|
break;
|
|
|
|
else if (!strcmp(attributes[i].name, "XV_HUE") &&
|
|
|
|
(!strcasecmp(name, "hue")))
|
|
|
|
break;
|
|
|
|
if (!strcmp(attributes[i].name, "XV_RED_INTENSITY") &&
|
|
|
|
(!strcasecmp(name, "red_intensity")))
|
|
|
|
break;
|
|
|
|
else if (!strcmp(attributes[i].name, "XV_GREEN_INTENSITY")
|
|
|
|
&& (!strcasecmp(name, "green_intensity")))
|
|
|
|
break;
|
|
|
|
else if (!strcmp(attributes[i].name, "XV_BLUE_INTENSITY")
|
|
|
|
&& (!strcasecmp(name, "blue_intensity")))
|
|
|
|
break;
|
|
|
|
else if ((!strcmp(attributes[i].name, "XV_ITURBT_709") //NVIDIA
|
|
|
|
|| !strcmp(attributes[i].name, "XV_COLORSPACE")) //ATI
|
|
|
|
&& (!strcasecmp(name, "bt_709")))
|
|
|
|
break;
|
|
|
|
atom = None;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
XFree(attributes);
|
|
|
|
return atom;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int xv_set_eq(struct vo *vo, uint32_t xv_port, const char *name,
|
|
|
|
int value)
|
|
|
|
{
|
2013-08-23 21:30:09 +00:00
|
|
|
MP_VERBOSE(vo, "xv_set_eq called! (%s, %d)\n", name, value);
|
2013-01-26 21:37:47 +00:00
|
|
|
|
|
|
|
int min, max;
|
|
|
|
int atom = xv_find_atom(vo, xv_port, name, false, &min, &max);
|
|
|
|
if (atom != None) {
|
|
|
|
// -100 -> min
|
|
|
|
// 0 -> (max+min)/2
|
|
|
|
// +100 -> max
|
|
|
|
int port_value = (value + 100) * (max - min) / 200 + min;
|
|
|
|
XvSetPortAttribute(vo->x11->display, xv_port, atom, port_value);
|
|
|
|
return VO_TRUE;
|
|
|
|
}
|
|
|
|
return VO_FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int xv_get_eq(struct vo *vo, uint32_t xv_port, const char *name,
|
|
|
|
int *value)
|
|
|
|
{
|
|
|
|
int min, max;
|
|
|
|
int atom = xv_find_atom(vo, xv_port, name, true, &min, &max);
|
|
|
|
if (atom != None) {
|
|
|
|
int port_value = 0;
|
|
|
|
XvGetPortAttribute(vo->x11->display, xv_port, atom, &port_value);
|
|
|
|
|
|
|
|
*value = (port_value - min) * 200 / (max - min) - 100;
|
2013-08-23 21:30:09 +00:00
|
|
|
MP_VERBOSE(vo, "xv_get_eq called! (%s, %d)\n", name, *value);
|
2013-01-26 21:37:47 +00:00
|
|
|
return VO_TRUE;
|
|
|
|
}
|
|
|
|
return VO_FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
static Atom xv_intern_atom_if_exists(struct vo *vo, char const *atom_name)
|
|
|
|
{
|
|
|
|
struct xvctx *ctx = vo->priv;
|
|
|
|
XvAttribute *attributes;
|
|
|
|
int attrib_count, i;
|
|
|
|
Atom xv_atom = None;
|
|
|
|
|
|
|
|
attributes = XvQueryPortAttributes(vo->x11->display, ctx->xv_port,
|
|
|
|
&attrib_count);
|
|
|
|
if (attributes != NULL) {
|
|
|
|
for (i = 0; i < attrib_count; ++i) {
|
|
|
|
if (strcmp(attributes[i].name, atom_name) == 0) {
|
|
|
|
xv_atom = XInternAtom(vo->x11->display, atom_name, False);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
XFree(attributes);
|
|
|
|
}
|
|
|
|
|
|
|
|
return xv_atom;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Try to enable vsync for xv.
|
|
|
|
// Returns -1 if not available, 0 on failure and 1 on success.
|
|
|
|
static int xv_enable_vsync(struct vo *vo)
|
|
|
|
{
|
|
|
|
struct xvctx *ctx = vo->priv;
|
|
|
|
Atom xv_atom = xv_intern_atom_if_exists(vo, "XV_SYNC_TO_VBLANK");
|
|
|
|
if (xv_atom == None)
|
|
|
|
return -1;
|
|
|
|
return XvSetPortAttribute(vo->x11->display, ctx->xv_port, xv_atom, 1)
|
|
|
|
== Success;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Get maximum supported source image dimensions.
|
|
|
|
// If querying the dimensions fails, don't change *width and *height.
|
|
|
|
static void xv_get_max_img_dim(struct vo *vo, uint32_t *width, uint32_t *height)
|
|
|
|
{
|
|
|
|
struct xvctx *ctx = vo->priv;
|
|
|
|
XvEncodingInfo *encodings;
|
|
|
|
unsigned int num_encodings, idx;
|
|
|
|
|
|
|
|
XvQueryEncodings(vo->x11->display, ctx->xv_port, &num_encodings, &encodings);
|
|
|
|
|
|
|
|
if (encodings) {
|
|
|
|
for (idx = 0; idx < num_encodings; ++idx) {
|
|
|
|
if (strcmp(encodings[idx].name, "XV_IMAGE") == 0) {
|
|
|
|
*width = encodings[idx].width;
|
|
|
|
*height = encodings[idx].height;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-08-23 21:30:09 +00:00
|
|
|
MP_VERBOSE(vo, "Maximum source image dimensions: %ux%u\n", *width, *height);
|
2013-01-26 21:37:47 +00:00
|
|
|
|
|
|
|
XvFreeEncodingInfo(encodings);
|
|
|
|
}
|
|
|
|
|
2013-08-23 21:30:09 +00:00
|
|
|
static void xv_print_ck_info(struct vo *vo)
|
2013-01-26 21:37:47 +00:00
|
|
|
{
|
2013-08-23 21:30:09 +00:00
|
|
|
struct xvctx *xv = vo->priv;
|
2013-01-26 21:37:47 +00:00
|
|
|
|
|
|
|
switch (xv->xv_ck_info.method) {
|
|
|
|
case CK_METHOD_NONE:
|
2013-08-23 21:30:09 +00:00
|
|
|
MP_VERBOSE(vo, "Drawing no colorkey.\n");
|
2013-01-26 21:37:47 +00:00
|
|
|
return;
|
|
|
|
case CK_METHOD_AUTOPAINT:
|
2013-08-23 21:30:09 +00:00
|
|
|
MP_VERBOSE(vo, "Colorkey is drawn by Xv.\n");
|
2013-01-26 21:37:47 +00:00
|
|
|
break;
|
|
|
|
case CK_METHOD_MANUALFILL:
|
2013-08-23 21:30:09 +00:00
|
|
|
MP_VERBOSE(vo, "Drawing colorkey manually.\n");
|
2013-01-26 21:37:47 +00:00
|
|
|
break;
|
|
|
|
case CK_METHOD_BACKGROUND:
|
2013-08-23 21:30:09 +00:00
|
|
|
MP_VERBOSE(vo, "Colorkey is drawn as window background.\n");
|
2013-01-26 21:37:47 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
switch (xv->xv_ck_info.source) {
|
|
|
|
case CK_SRC_CUR:
|
2013-08-23 21:30:09 +00:00
|
|
|
MP_VERBOSE(vo, "Using colorkey from Xv (0x%06lx).\n", xv->xv_colorkey);
|
2013-01-26 21:37:47 +00:00
|
|
|
break;
|
|
|
|
case CK_SRC_USE:
|
|
|
|
if (xv->xv_ck_info.method == CK_METHOD_AUTOPAINT) {
|
2013-08-23 21:30:09 +00:00
|
|
|
MP_VERBOSE(vo, "Ignoring colorkey from mpv (0x%06lx).\n",
|
|
|
|
xv->xv_colorkey);
|
2013-01-26 21:37:47 +00:00
|
|
|
} else {
|
2013-08-23 21:30:09 +00:00
|
|
|
MP_VERBOSE(vo, "Using colorkey from mpv (0x%06lx). Use -colorkey to change.\n",
|
|
|
|
xv->xv_colorkey);
|
2013-01-26 21:37:47 +00:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
case CK_SRC_SET:
|
2013-08-23 21:30:09 +00:00
|
|
|
MP_VERBOSE(vo, "Setting and using colorkey from mpv (0x%06lx)."
|
|
|
|
" Use -colorkey to change.\n", xv->xv_colorkey);
|
2013-01-26 21:37:47 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-03-04 16:40:21 +00:00
|
|
|
/* NOTE: If vo.colorkey has bits set after the first 3 low order bytes
|
2013-01-26 21:37:47 +00:00
|
|
|
* we don't draw anything as this means it was forced to off. */
|
|
|
|
static int xv_init_colorkey(struct vo *vo)
|
|
|
|
{
|
|
|
|
struct xvctx *ctx = vo->priv;
|
|
|
|
Display *display = vo->x11->display;
|
|
|
|
Atom xv_atom;
|
|
|
|
int rez;
|
|
|
|
|
|
|
|
/* check if colorkeying is needed */
|
|
|
|
xv_atom = xv_intern_atom_if_exists(vo, "XV_COLORKEY");
|
2013-07-21 23:03:22 +00:00
|
|
|
if (xv_atom != None && !(ctx->colorkey & 0xFF000000)) {
|
2013-01-26 21:37:47 +00:00
|
|
|
if (ctx->xv_ck_info.source == CK_SRC_CUR) {
|
|
|
|
int colorkey_ret;
|
|
|
|
|
|
|
|
rez = XvGetPortAttribute(display, ctx->xv_port, xv_atom,
|
|
|
|
&colorkey_ret);
|
|
|
|
if (rez == Success)
|
|
|
|
ctx->xv_colorkey = colorkey_ret;
|
|
|
|
else {
|
2013-08-23 21:30:09 +00:00
|
|
|
MP_FATAL(vo, "Couldn't get colorkey! "
|
|
|
|
"Maybe the selected Xv port has no overlay.\n");
|
2013-01-26 21:37:47 +00:00
|
|
|
return 0; // error getting colorkey
|
|
|
|
}
|
|
|
|
} else {
|
2013-07-21 23:03:22 +00:00
|
|
|
ctx->xv_colorkey = ctx->colorkey;
|
2013-01-26 21:37:47 +00:00
|
|
|
|
|
|
|
/* check if we have to set the colorkey too */
|
|
|
|
if (ctx->xv_ck_info.source == CK_SRC_SET) {
|
|
|
|
xv_atom = XInternAtom(display, "XV_COLORKEY", False);
|
|
|
|
|
|
|
|
rez = XvSetPortAttribute(display, ctx->xv_port, xv_atom,
|
2013-07-21 23:03:22 +00:00
|
|
|
ctx->colorkey);
|
2013-01-26 21:37:47 +00:00
|
|
|
if (rez != Success) {
|
2013-08-23 21:30:09 +00:00
|
|
|
MP_FATAL(vo, "Couldn't set colorkey!\n");
|
2013-01-26 21:37:47 +00:00
|
|
|
return 0; // error setting colorkey
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
xv_atom = xv_intern_atom_if_exists(vo, "XV_AUTOPAINT_COLORKEY");
|
|
|
|
|
|
|
|
/* should we draw the colorkey ourselves or activate autopainting? */
|
|
|
|
if (ctx->xv_ck_info.method == CK_METHOD_AUTOPAINT) {
|
|
|
|
rez = !Success;
|
|
|
|
|
|
|
|
if (xv_atom != None) // autopaint is supported
|
|
|
|
rez = XvSetPortAttribute(display, ctx->xv_port, xv_atom, 1);
|
|
|
|
|
|
|
|
if (rez != Success)
|
|
|
|
ctx->xv_ck_info.method = CK_METHOD_MANUALFILL;
|
|
|
|
} else {
|
|
|
|
// disable colorkey autopainting if supported
|
|
|
|
if (xv_atom != None)
|
|
|
|
XvSetPortAttribute(display, ctx->xv_port, xv_atom, 0);
|
|
|
|
}
|
|
|
|
} else // do no colorkey drawing at all
|
|
|
|
ctx->xv_ck_info.method = CK_METHOD_NONE;
|
|
|
|
|
2013-08-23 21:30:09 +00:00
|
|
|
xv_print_ck_info(vo);
|
2013-01-26 21:37:47 +00:00
|
|
|
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Draw the colorkey on the video window.
|
|
|
|
*
|
|
|
|
* Draws the colorkey depending on the set method ( colorkey_handling ).
|
|
|
|
*
|
|
|
|
* Also draws the black bars ( when the video doesn't fit the display in
|
|
|
|
* fullscreen ) separately, so they don't overlap with the video area. */
|
2013-03-17 22:01:33 +00:00
|
|
|
static void xv_draw_colorkey(struct vo *vo, const struct mp_rect *rc)
|
2012-11-11 17:40:43 +00:00
|
|
|
{
|
|
|
|
struct xvctx *ctx = vo->priv;
|
|
|
|
struct vo_x11_state *x11 = vo->x11;
|
2013-01-26 21:37:47 +00:00
|
|
|
if (ctx->xv_ck_info.method == CK_METHOD_MANUALFILL ||
|
|
|
|
ctx->xv_ck_info.method == CK_METHOD_BACKGROUND)
|
|
|
|
{
|
|
|
|
//less tearing than XClearWindow()
|
|
|
|
XSetForeground(x11->display, x11->vo_gc, ctx->xv_colorkey);
|
2013-03-17 22:01:33 +00:00
|
|
|
XFillRectangle(x11->display, x11->window, x11->vo_gc, rc->x0, rc->y0,
|
|
|
|
rc->x1 - rc->x0, rc->y1 - rc->y0);
|
2013-01-26 21:37:47 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void read_xv_csp(struct vo *vo)
|
|
|
|
{
|
|
|
|
struct xvctx *ctx = vo->priv;
|
2012-11-11 17:40:43 +00:00
|
|
|
struct mp_csp_details *cspc = &ctx->cached_csp;
|
|
|
|
*cspc = (struct mp_csp_details) MP_CSP_DETAILS_DEFAULTS;
|
|
|
|
int bt709_enabled;
|
2013-01-26 21:37:47 +00:00
|
|
|
if (xv_get_eq(vo, ctx->xv_port, "bt_709", &bt709_enabled))
|
2012-11-11 17:40:43 +00:00
|
|
|
cspc->format = bt709_enabled == 100 ? MP_CSP_BT_709 : MP_CSP_BT_601;
|
|
|
|
}
|
|
|
|
|
2009-02-13 01:52:51 +00:00
|
|
|
static void resize(struct vo *vo)
|
2009-02-12 17:40:53 +00:00
|
|
|
{
|
2009-02-13 01:52:51 +00:00
|
|
|
struct xvctx *ctx = vo->priv;
|
|
|
|
|
2012-10-27 20:10:32 +00:00
|
|
|
// Can't be used, because the function calculates screen-space coordinates,
|
|
|
|
// while we need video-space.
|
|
|
|
struct mp_osd_res unused;
|
|
|
|
|
|
|
|
vo_get_src_dst_rects(vo, &ctx->src_rect, &ctx->dst_rect, &unused);
|
|
|
|
|
2013-03-17 22:01:33 +00:00
|
|
|
vo_x11_clear_background(vo, &ctx->dst_rect);
|
|
|
|
xv_draw_colorkey(vo, &ctx->dst_rect);
|
2012-11-11 17:40:43 +00:00
|
|
|
read_xv_csp(vo);
|
2013-06-15 15:14:14 +00:00
|
|
|
|
|
|
|
vo->want_redraw = true;
|
2009-02-12 17:40:53 +00:00
|
|
|
}
|
|
|
|
|
2001-03-21 19:10:55 +00:00
|
|
|
/*
|
|
|
|
* connect to server, create and map window,
|
2001-02-24 20:28:24 +00:00
|
|
|
* allocate colors and (shared) memory
|
|
|
|
*/
|
2008-04-04 05:04:11 +00:00
|
|
|
static int config(struct vo *vo, uint32_t width, uint32_t height,
|
|
|
|
uint32_t d_width, uint32_t d_height, uint32_t flags,
|
2011-12-06 19:23:54 +00:00
|
|
|
uint32_t format)
|
2001-02-24 20:28:24 +00:00
|
|
|
{
|
2008-04-20 06:34:27 +00:00
|
|
|
struct vo_x11_state *x11 = vo->x11;
|
2008-04-04 05:04:11 +00:00
|
|
|
struct xvctx *ctx = vo->priv;
|
|
|
|
int i;
|
2004-06-14 04:53:03 +00:00
|
|
|
|
2012-12-22 16:50:15 +00:00
|
|
|
mp_image_unrefp(&ctx->original_image);
|
|
|
|
|
2008-04-04 05:04:11 +00:00
|
|
|
ctx->image_height = height;
|
|
|
|
ctx->image_width = width;
|
|
|
|
ctx->image_format = format;
|
2001-10-18 02:42:20 +00:00
|
|
|
|
2008-12-01 14:15:17 +00:00
|
|
|
if ((ctx->max_width != 0 && ctx->max_height != 0)
|
|
|
|
&& (ctx->image_width > ctx->max_width
|
|
|
|
|| ctx->image_height > ctx->max_height)) {
|
2013-08-23 21:30:09 +00:00
|
|
|
MP_ERR(vo, "Source image dimensions are too high: %ux%u (maximum is %ux%u)\n",
|
2008-12-01 14:15:17 +00:00
|
|
|
ctx->image_width, ctx->image_height, ctx->max_width,
|
|
|
|
ctx->max_height);
|
2005-11-10 02:39:31 +00:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2004-06-14 04:53:03 +00:00
|
|
|
/* check image formats */
|
2008-04-04 05:42:51 +00:00
|
|
|
ctx->xv_format = 0;
|
|
|
|
for (i = 0; i < ctx->formats; i++) {
|
2013-08-23 21:30:09 +00:00
|
|
|
MP_VERBOSE(vo, "Xvideo image format: 0x%x (%4.4s) %s\n",
|
|
|
|
ctx->fo[i].id, (char *) &ctx->fo[i].id,
|
|
|
|
(ctx->fo[i].format == XvPacked) ? "packed" : "planar");
|
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
|
|
|
if (ctx->fo[i].id == find_xv_format(format))
|
2008-04-04 05:42:51 +00:00
|
|
|
ctx->xv_format = ctx->fo[i].id;
|
2004-06-14 04:53:03 +00:00
|
|
|
}
|
2008-04-04 05:42:51 +00:00
|
|
|
if (!ctx->xv_format)
|
|
|
|
return -1;
|
2001-10-18 02:42:20 +00:00
|
|
|
|
2013-02-24 22:32:51 +00:00
|
|
|
vo_x11_config_vo_window(vo, NULL, vo->dx, vo->dy, vo->dwidth,
|
2013-01-27 11:01:08 +00:00
|
|
|
vo->dheight, flags, "xv");
|
2004-06-14 04:53:03 +00:00
|
|
|
|
2013-01-27 11:01:08 +00:00
|
|
|
if (ctx->xv_ck_info.method == CK_METHOD_BACKGROUND)
|
|
|
|
XSetWindowBackground(x11->display, x11->window, ctx->xv_colorkey);
|
2004-06-14 04:53:03 +00:00
|
|
|
|
2013-08-23 21:30:09 +00:00
|
|
|
MP_VERBOSE(vo, "using Xvideo port %d for hw scaling\n", ctx->xv_port);
|
2004-06-14 04:53:03 +00:00
|
|
|
|
2008-04-04 06:09:14 +00:00
|
|
|
// In case config has been called before
|
2013-03-14 14:53:59 +00:00
|
|
|
for (i = 0; i < ctx->num_buffers; i++)
|
2008-04-04 06:09:14 +00:00
|
|
|
deallocate_xvimage(vo, i);
|
|
|
|
|
2012-03-19 23:02:13 +00:00
|
|
|
ctx->num_buffers = 2;
|
2004-06-14 04:53:03 +00:00
|
|
|
|
2013-03-14 14:53:59 +00:00
|
|
|
for (i = 0; i < ctx->num_buffers; i++)
|
2008-04-04 05:04:11 +00:00
|
|
|
allocate_xvimage(vo, i);
|
2004-06-14 04:53:03 +00:00
|
|
|
|
2008-04-04 05:04:11 +00:00
|
|
|
ctx->current_buf = 0;
|
|
|
|
ctx->current_ip_buf = 0;
|
2001-03-21 19:10:55 +00:00
|
|
|
|
2002-06-10 18:40:19 +00:00
|
|
|
|
2009-02-13 01:52:51 +00:00
|
|
|
resize(vo);
|
2003-11-30 16:36:10 +00:00
|
|
|
|
2004-06-14 04:53:03 +00:00
|
|
|
return 0;
|
2001-02-24 20:28:24 +00:00
|
|
|
}
|
|
|
|
|
2008-04-04 05:04:11 +00:00
|
|
|
static void allocate_xvimage(struct vo *vo, int foo)
|
2001-02-24 20:28:24 +00:00
|
|
|
{
|
2008-04-04 05:04:11 +00:00
|
|
|
struct xvctx *ctx = vo->priv;
|
2008-04-20 06:34:27 +00:00
|
|
|
struct vo_x11_state *x11 = vo->x11;
|
2013-01-06 20:44:15 +00:00
|
|
|
// align it for faster OSD rendering (draw_bmp.c swscale usage)
|
|
|
|
int aligned_w = FFALIGN(ctx->image_width, 32);
|
2002-06-13 14:23:03 +00:00
|
|
|
#ifdef HAVE_SHM
|
2013-01-02 11:55:52 +00:00
|
|
|
if (x11->display_is_local && XShmQueryExtension(x11->display)) {
|
2008-04-04 05:04:11 +00:00
|
|
|
ctx->Shmem_Flag = 1;
|
2013-01-02 11:55:52 +00:00
|
|
|
x11->ShmCompletionEvent = XShmGetEventBase(x11->display)
|
|
|
|
+ ShmCompletion;
|
|
|
|
} else {
|
2008-04-04 05:04:11 +00:00
|
|
|
ctx->Shmem_Flag = 0;
|
2013-08-23 21:30:09 +00:00
|
|
|
MP_INFO(vo, "Shared memory not supported\nReverting to normal Xv.\n");
|
2004-06-14 04:53:03 +00:00
|
|
|
}
|
2008-12-01 14:15:17 +00:00
|
|
|
if (ctx->Shmem_Flag) {
|
2008-04-04 05:04:11 +00:00
|
|
|
ctx->xvimage[foo] =
|
2013-01-26 21:37:47 +00:00
|
|
|
(XvImage *) XvShmCreateImage(x11->display, ctx->xv_port,
|
2008-12-01 14:15:17 +00:00
|
|
|
ctx->xv_format, NULL,
|
2012-11-22 18:37:20 +00:00
|
|
|
aligned_w, ctx->image_height,
|
2008-04-04 05:04:11 +00:00
|
|
|
&ctx->Shminfo[foo]);
|
|
|
|
|
2008-12-01 14:15:17 +00:00
|
|
|
ctx->Shminfo[foo].shmid = shmget(IPC_PRIVATE,
|
|
|
|
ctx->xvimage[foo]->data_size,
|
|
|
|
IPC_CREAT | 0777);
|
|
|
|
ctx->Shminfo[foo].shmaddr = (char *) shmat(ctx->Shminfo[foo].shmid, 0,
|
|
|
|
0);
|
2008-04-04 05:04:11 +00:00
|
|
|
ctx->Shminfo[foo].readOnly = False;
|
|
|
|
|
|
|
|
ctx->xvimage[foo]->data = ctx->Shminfo[foo].shmaddr;
|
2008-04-20 06:34:27 +00:00
|
|
|
XShmAttach(x11->display, &ctx->Shminfo[foo]);
|
|
|
|
XSync(x11->display, False);
|
2008-04-04 05:04:11 +00:00
|
|
|
shmctl(ctx->Shminfo[foo].shmid, IPC_RMID, 0);
|
2004-06-14 04:53:03 +00:00
|
|
|
} else
|
2002-06-13 14:23:03 +00:00
|
|
|
#endif
|
2004-06-14 04:53:03 +00:00
|
|
|
{
|
2008-04-04 05:04:11 +00:00
|
|
|
ctx->xvimage[foo] =
|
2013-01-26 21:37:47 +00:00
|
|
|
(XvImage *) XvCreateImage(x11->display, ctx->xv_port,
|
2012-11-22 18:37:20 +00:00
|
|
|
ctx->xv_format, NULL, aligned_w,
|
2008-12-01 14:15:17 +00:00
|
|
|
ctx->image_height);
|
2012-11-30 16:45:40 +00:00
|
|
|
ctx->xvimage[foo]->data = av_malloc(ctx->xvimage[foo]->data_size);
|
2008-04-20 06:34:27 +00:00
|
|
|
XSync(x11->display, False);
|
2004-06-14 04:53:03 +00:00
|
|
|
}
|
2012-11-30 16:45:40 +00:00
|
|
|
struct mp_image img = get_xv_buffer(vo, foo);
|
2013-02-14 19:41:09 +00:00
|
|
|
img.w = aligned_w;
|
2012-12-19 11:04:57 +00:00
|
|
|
mp_image_clear(&img, 0, 0, img.w, img.h);
|
2004-06-14 04:53:03 +00:00
|
|
|
return;
|
2001-02-24 20:28:24 +00:00
|
|
|
}
|
|
|
|
|
2008-04-04 05:04:11 +00:00
|
|
|
static void deallocate_xvimage(struct vo *vo, int foo)
|
2001-08-31 10:06:32 +00:00
|
|
|
{
|
2008-04-04 05:04:11 +00:00
|
|
|
struct xvctx *ctx = vo->priv;
|
2002-06-13 14:23:03 +00:00
|
|
|
#ifdef HAVE_SHM
|
2008-12-01 14:15:17 +00:00
|
|
|
if (ctx->Shmem_Flag) {
|
2008-04-20 06:34:27 +00:00
|
|
|
XShmDetach(vo->x11->display, &ctx->Shminfo[foo]);
|
2008-04-04 05:04:11 +00:00
|
|
|
shmdt(ctx->Shminfo[foo].shmaddr);
|
2004-06-14 04:53:03 +00:00
|
|
|
} else
|
2002-06-13 14:23:03 +00:00
|
|
|
#endif
|
2004-06-14 04:53:03 +00:00
|
|
|
{
|
2012-11-30 16:45:40 +00:00
|
|
|
av_free(ctx->xvimage[foo]->data);
|
2004-06-14 04:53:03 +00:00
|
|
|
}
|
2008-04-04 05:04:11 +00:00
|
|
|
XFree(ctx->xvimage[foo]);
|
2004-06-14 04:53:03 +00:00
|
|
|
|
2008-04-20 06:34:27 +00:00
|
|
|
XSync(vo->x11->display, False);
|
2004-06-14 04:53:03 +00:00
|
|
|
return;
|
2001-08-31 10:06:32 +00:00
|
|
|
}
|
|
|
|
|
2008-04-04 05:04:11 +00:00
|
|
|
static inline void put_xvimage(struct vo *vo, XvImage *xvi)
|
2005-02-23 12:23:44 +00:00
|
|
|
{
|
2008-04-04 05:04:11 +00:00
|
|
|
struct xvctx *ctx = vo->priv;
|
2008-04-20 06:34:27 +00:00
|
|
|
struct vo_x11_state *x11 = vo->x11;
|
2012-10-27 20:10:32 +00:00
|
|
|
struct mp_rect *src = &ctx->src_rect;
|
|
|
|
struct mp_rect *dst = &ctx->dst_rect;
|
|
|
|
int dw = dst->x1 - dst->x0, dh = dst->y1 - dst->y0;
|
|
|
|
int sw = src->x1 - src->x0, sh = src->y1 - src->y0;
|
2005-02-23 12:23:44 +00:00
|
|
|
#ifdef HAVE_SHM
|
2008-12-01 14:15:17 +00:00
|
|
|
if (ctx->Shmem_Flag) {
|
2013-01-26 21:37:47 +00:00
|
|
|
XvShmPutImage(x11->display, ctx->xv_port, x11->window, x11->vo_gc, xvi,
|
2012-10-27 20:10:32 +00:00
|
|
|
src->x0, src->y0, sw, sh,
|
|
|
|
dst->x0, dst->y0, dw, dh,
|
2013-01-02 11:55:52 +00:00
|
|
|
True);
|
|
|
|
x11->ShmCompletionWaitCount++;
|
2005-02-23 12:23:44 +00:00
|
|
|
} else
|
|
|
|
#endif
|
|
|
|
{
|
2013-01-26 21:37:47 +00:00
|
|
|
XvPutImage(x11->display, ctx->xv_port, x11->window, x11->vo_gc, xvi,
|
2012-10-27 20:10:32 +00:00
|
|
|
src->x0, src->y0, sw, sh,
|
|
|
|
dst->x0, dst->y0, dw, dh);
|
2005-02-23 12:23:44 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-10-07 01:28:40 +00:00
|
|
|
static struct mp_image get_xv_buffer(struct vo *vo, int buf_index)
|
2008-12-01 17:53:57 +00:00
|
|
|
{
|
|
|
|
struct xvctx *ctx = vo->priv;
|
2012-10-07 01:28:40 +00:00
|
|
|
XvImage *xv_image = ctx->xvimage[buf_index];
|
|
|
|
|
|
|
|
struct mp_image img = {0};
|
2012-11-10 01:02:24 +00:00
|
|
|
mp_image_set_size(&img, ctx->image_width, ctx->image_height);
|
2012-10-07 01:28:40 +00:00
|
|
|
mp_image_setfmt(&img, ctx->image_format);
|
|
|
|
|
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
|
|
|
bool swapuv = ctx->xv_format == MP_FOURCC_YV12;
|
2012-10-07 01:28:40 +00:00
|
|
|
for (int n = 0; n < img.num_planes; n++) {
|
|
|
|
int sn = n > 0 && swapuv ? (n == 1 ? 2 : 1) : n;
|
|
|
|
img.planes[n] = xv_image->data + xv_image->offsets[sn];
|
|
|
|
img.stride[n] = xv_image->pitches[sn];
|
|
|
|
}
|
2008-12-01 17:53:57 +00:00
|
|
|
|
2012-11-11 17:40:43 +00:00
|
|
|
mp_image_set_colorspace_details(&img, &ctx->cached_csp);
|
2012-10-27 16:06:09 +00:00
|
|
|
|
2012-10-07 01:28:40 +00:00
|
|
|
return img;
|
|
|
|
}
|
|
|
|
|
2008-06-23 22:53:58 +00:00
|
|
|
static void draw_osd(struct vo *vo, struct osd_state *osd)
|
2004-06-14 04:53:03 +00:00
|
|
|
{
|
2008-04-04 05:04:11 +00:00
|
|
|
struct xvctx *ctx = vo->priv;
|
|
|
|
|
2012-10-07 01:28:40 +00:00
|
|
|
struct mp_image img = get_xv_buffer(vo, ctx->current_buf);
|
|
|
|
|
VO, sub: refactor
Remove VFCTRL_DRAW_OSD, VFCAP_EOSD_FILTER, VFCAP_EOSD_RGBA, VFCAP_EOSD,
VOCTRL_DRAW_EOSD, VOCTRL_GET_EOSD_RES, VOCTRL_QUERY_EOSD_FORMAT.
Remove draw_osd_with_eosd(), which rendered the OSD by calling
VOCTRL_DRAW_EOSD. Change VOs to call osd_draw() directly, which takes
a callback as argument. (This basically works like the old OSD API,
except multiple OSD bitmap formats are supported and caching is
possible.)
Remove all mentions of "eosd". It's simply "osd" now.
Make OSD size per-OSD-object, as they can be different when using
vf_sub. Include display_par/video_par in resolution change detection.
Fix the issue with margin borders in vo_corevideo.
2012-10-19 17:25:18 +00:00
|
|
|
struct mp_osd_res res = {
|
|
|
|
.w = ctx->image_width,
|
|
|
|
.h = ctx->image_height,
|
2013-03-14 14:53:59 +00:00
|
|
|
.display_par = 1.0 / vo->aspdat.par,
|
VO, sub: refactor
Remove VFCTRL_DRAW_OSD, VFCAP_EOSD_FILTER, VFCAP_EOSD_RGBA, VFCAP_EOSD,
VOCTRL_DRAW_EOSD, VOCTRL_GET_EOSD_RES, VOCTRL_QUERY_EOSD_FORMAT.
Remove draw_osd_with_eosd(), which rendered the OSD by calling
VOCTRL_DRAW_EOSD. Change VOs to call osd_draw() directly, which takes
a callback as argument. (This basically works like the old OSD API,
except multiple OSD bitmap formats are supported and caching is
possible.)
Remove all mentions of "eosd". It's simply "osd" now.
Make OSD size per-OSD-object, as they can be different when using
vf_sub. Include display_par/video_par in resolution change detection.
Fix the issue with margin borders in vo_corevideo.
2012-10-19 17:25:18 +00:00
|
|
|
.video_par = vo->aspdat.par,
|
2012-10-07 01:28:40 +00:00
|
|
|
};
|
|
|
|
|
2012-12-22 16:50:15 +00:00
|
|
|
osd_draw_on_image(osd, res, osd->vo_pts, 0, &img);
|
2004-06-14 04:53:03 +00:00
|
|
|
}
|
2001-08-13 11:08:18 +00:00
|
|
|
|
2013-01-02 11:55:52 +00:00
|
|
|
static void wait_for_completion(struct vo *vo, int max_outstanding)
|
|
|
|
{
|
|
|
|
#ifdef HAVE_SHM
|
|
|
|
struct xvctx *ctx = vo->priv;
|
|
|
|
struct vo_x11_state *x11 = vo->x11;
|
|
|
|
if (ctx->Shmem_Flag) {
|
|
|
|
while (x11->ShmCompletionWaitCount > max_outstanding) {
|
|
|
|
if (!ctx->Shm_Warned_Slow) {
|
2013-08-23 21:30:09 +00:00
|
|
|
MP_WARN(vo, "X11 can't keep up! Waiting"
|
|
|
|
" for XShm completion events...\n");
|
2013-01-02 11:55:52 +00:00
|
|
|
ctx->Shm_Warned_Slow = 1;
|
|
|
|
}
|
2013-05-25 17:56:52 +00:00
|
|
|
mp_sleep_us(1000);
|
2013-05-16 12:02:28 +00:00
|
|
|
vo_x11_check_events(vo);
|
2013-01-02 11:55:52 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
2008-04-04 05:04:11 +00:00
|
|
|
static void flip_page(struct vo *vo)
|
2001-02-24 20:28:24 +00:00
|
|
|
{
|
2008-04-04 05:04:11 +00:00
|
|
|
struct xvctx *ctx = vo->priv;
|
|
|
|
put_xvimage(vo, ctx->xvimage[ctx->current_buf]);
|
2005-02-23 12:23:44 +00:00
|
|
|
|
|
|
|
/* remember the currently visible buffer */
|
2012-03-19 23:02:13 +00:00
|
|
|
ctx->current_buf = (ctx->current_buf + 1) % ctx->num_buffers;
|
2013-01-02 11:55:52 +00:00
|
|
|
|
|
|
|
if (!ctx->Shmem_Flag)
|
|
|
|
XSync(vo->x11->display, False);
|
2001-02-24 20:28:24 +00:00
|
|
|
}
|
|
|
|
|
2011-12-05 03:24:18 +00:00
|
|
|
static mp_image_t *get_screenshot(struct vo *vo)
|
|
|
|
{
|
2011-10-06 18:46:01 +00:00
|
|
|
struct xvctx *ctx = vo->priv;
|
2012-12-22 16:50:15 +00:00
|
|
|
if (!ctx->original_image)
|
|
|
|
return NULL;
|
2011-10-06 18:46:01 +00:00
|
|
|
|
2013-08-24 14:33:13 +00:00
|
|
|
return mp_image_new_ref(ctx->original_image);
|
2011-10-06 18:46:01 +00:00
|
|
|
}
|
|
|
|
|
2013-10-06 21:03:30 +00:00
|
|
|
// Note: redraw_frame() can call this with NULL.
|
2012-11-04 14:56:04 +00:00
|
|
|
static void draw_image(struct vo *vo, mp_image_t *mpi)
|
2004-06-14 04:53:03 +00:00
|
|
|
{
|
2008-04-04 05:04:11 +00:00
|
|
|
struct xvctx *ctx = vo->priv;
|
2008-12-01 17:53:57 +00:00
|
|
|
|
2013-01-02 11:55:52 +00:00
|
|
|
wait_for_completion(vo, ctx->num_buffers - 1);
|
|
|
|
|
2012-12-22 16:25:28 +00:00
|
|
|
struct mp_image xv_buffer = get_xv_buffer(vo, ctx->current_buf);
|
2013-10-06 21:03:30 +00:00
|
|
|
if (mpi) {
|
|
|
|
mp_image_copy(&xv_buffer, mpi);
|
|
|
|
} else {
|
|
|
|
mp_image_clear(&xv_buffer, 0, 0, xv_buffer.w, xv_buffer.h);
|
|
|
|
}
|
2008-12-01 17:53:57 +00:00
|
|
|
|
2012-12-22 16:50:15 +00:00
|
|
|
mp_image_setrefp(&ctx->original_image, mpi);
|
2002-07-20 16:27:17 +00:00
|
|
|
}
|
|
|
|
|
2012-12-22 17:07:54 +00:00
|
|
|
static int redraw_frame(struct vo *vo)
|
|
|
|
{
|
|
|
|
struct xvctx *ctx = vo->priv;
|
|
|
|
|
|
|
|
draw_image(vo, ctx->original_image);
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2012-11-04 15:24:18 +00:00
|
|
|
static int query_format(struct vo *vo, uint32_t format)
|
2001-02-24 20:28:24 +00:00
|
|
|
{
|
2012-11-04 15:24:18 +00:00
|
|
|
struct xvctx *ctx = vo->priv;
|
2003-09-12 15:50:35 +00:00
|
|
|
uint32_t i;
|
2013-03-01 10:16:01 +00:00
|
|
|
int flag = VFCAP_CSP_SUPPORTED | VFCAP_CSP_SUPPORTED_BY_HW;
|
2004-06-14 04:53:03 +00:00
|
|
|
|
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 fourcc = find_xv_format(format);
|
|
|
|
if (fourcc) {
|
|
|
|
for (i = 0; i < ctx->formats; i++) {
|
|
|
|
if (ctx->fo[i].id == fourcc)
|
|
|
|
return flag;
|
|
|
|
}
|
2004-06-14 04:53:03 +00:00
|
|
|
}
|
|
|
|
return 0;
|
2001-02-24 20:28:24 +00:00
|
|
|
}
|
|
|
|
|
2008-04-04 05:04:11 +00:00
|
|
|
static void uninit(struct vo *vo)
|
2001-09-04 15:21:00 +00:00
|
|
|
{
|
2008-04-04 05:04:11 +00:00
|
|
|
struct xvctx *ctx = vo->priv;
|
2004-06-14 04:53:03 +00:00
|
|
|
int i;
|
|
|
|
|
2012-12-22 16:50:15 +00:00
|
|
|
talloc_free(ctx->original_image);
|
|
|
|
|
2008-04-04 06:57:58 +00:00
|
|
|
if (ctx->ai)
|
|
|
|
XvFreeAdaptorInfo(ctx->ai);
|
2008-04-04 05:04:11 +00:00
|
|
|
ctx->ai = NULL;
|
|
|
|
if (ctx->fo) {
|
|
|
|
XFree(ctx->fo);
|
|
|
|
ctx->fo = NULL;
|
2004-11-15 14:56:18 +00:00
|
|
|
}
|
2013-03-14 14:53:59 +00:00
|
|
|
for (i = 0; i < ctx->num_buffers; i++)
|
2008-04-04 05:04:11 +00:00
|
|
|
deallocate_xvimage(vo, i);
|
2008-04-04 06:57:58 +00:00
|
|
|
// uninit() shouldn't get called unless initialization went past vo_init()
|
2008-04-20 06:34:27 +00:00
|
|
|
vo_x11_uninit(vo);
|
2001-04-09 22:27:27 +00:00
|
|
|
}
|
2001-03-21 19:10:55 +00:00
|
|
|
|
2013-07-22 20:52:42 +00:00
|
|
|
static int preinit(struct vo *vo)
|
2002-01-26 16:01:26 +00:00
|
|
|
{
|
2002-04-07 02:10:39 +00:00
|
|
|
XvPortID xv_p;
|
2004-06-14 04:53:03 +00:00
|
|
|
int busy_ports = 0;
|
2003-09-12 15:50:35 +00:00
|
|
|
unsigned int i;
|
2013-07-21 22:59:00 +00:00
|
|
|
struct xvctx *ctx = vo->priv;
|
|
|
|
int xv_adaptor = ctx->cfg_xv_adaptor;
|
2005-02-20 22:43:25 +00:00
|
|
|
|
2013-01-26 21:37:47 +00:00
|
|
|
if (!vo_x11_init(vo))
|
2012-08-03 03:55:02 +00:00
|
|
|
return -1;
|
|
|
|
|
|
|
|
struct vo_x11_state *x11 = vo->x11;
|
|
|
|
|
2004-06-14 04:53:03 +00:00
|
|
|
/* check for Xvideo extension */
|
2008-04-04 05:04:11 +00:00
|
|
|
unsigned int ver, rel, req, ev, err;
|
2008-12-01 14:15:17 +00:00
|
|
|
if (Success != XvQueryExtension(x11->display, &ver, &rel, &req, &ev, &err)) {
|
2013-08-23 21:30:09 +00:00
|
|
|
MP_ERR(vo, "Xv not supported by this X11 version/driver\n");
|
2008-04-04 06:57:58 +00:00
|
|
|
goto error;
|
2002-04-07 02:10:39 +00:00
|
|
|
}
|
2004-06-14 04:53:03 +00:00
|
|
|
|
|
|
|
/* check for Xvideo support */
|
|
|
|
if (Success !=
|
2008-12-01 14:15:17 +00:00
|
|
|
XvQueryAdaptors(x11->display, DefaultRootWindow(x11->display),
|
|
|
|
&ctx->adaptors, &ctx->ai)) {
|
2013-08-23 21:30:09 +00:00
|
|
|
MP_ERR(vo, "XvQueryAdaptors failed.\n");
|
2008-04-04 06:57:58 +00:00
|
|
|
goto error;
|
2002-04-07 02:10:39 +00:00
|
|
|
}
|
|
|
|
|
2004-06-14 04:53:03 +00:00
|
|
|
/* check adaptors */
|
2013-01-26 21:37:47 +00:00
|
|
|
if (ctx->xv_port) {
|
2003-09-07 18:58:56 +00:00
|
|
|
int port_found;
|
2004-06-14 04:53:03 +00:00
|
|
|
|
2008-12-01 14:15:17 +00:00
|
|
|
for (port_found = 0, i = 0; !port_found && i < ctx->adaptors; i++) {
|
|
|
|
if ((ctx->ai[i].type & XvInputMask)
|
|
|
|
&& (ctx->ai[i].type & XvImageMask)) {
|
2008-04-04 05:04:11 +00:00
|
|
|
for (xv_p = ctx->ai[i].base_id;
|
2008-12-01 14:15:17 +00:00
|
|
|
xv_p < ctx->ai[i].base_id + ctx->ai[i].num_ports;
|
|
|
|
++xv_p) {
|
2013-01-26 21:37:47 +00:00
|
|
|
if (xv_p == ctx->xv_port) {
|
2003-09-07 18:58:56 +00:00
|
|
|
port_found = 1;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2008-12-01 14:15:17 +00:00
|
|
|
if (port_found) {
|
2013-01-26 21:37:47 +00:00
|
|
|
if (XvGrabPort(x11->display, ctx->xv_port, CurrentTime))
|
|
|
|
ctx->xv_port = 0;
|
2008-12-01 14:15:17 +00:00
|
|
|
} else {
|
2013-08-23 21:30:09 +00:00
|
|
|
MP_WARN(vo, "Invalid port parameter, overriding with port 0.\n");
|
2013-01-26 21:37:47 +00:00
|
|
|
ctx->xv_port = 0;
|
2003-09-07 18:58:56 +00:00
|
|
|
}
|
2003-09-06 13:40:00 +00:00
|
|
|
}
|
2004-06-14 04:53:03 +00:00
|
|
|
|
2013-01-26 21:37:47 +00:00
|
|
|
for (i = 0; i < ctx->adaptors && ctx->xv_port == 0; i++) {
|
2008-05-13 17:52:25 +00:00
|
|
|
/* check if adaptor number has been specified */
|
|
|
|
if (xv_adaptor != -1 && xv_adaptor != i)
|
2008-12-01 14:15:17 +00:00
|
|
|
continue;
|
2008-05-15 18:19:35 +00:00
|
|
|
|
2008-12-01 14:15:17 +00:00
|
|
|
if ((ctx->ai[i].type & XvInputMask) && (ctx->ai[i].type & XvImageMask)) {
|
2008-04-04 05:04:11 +00:00
|
|
|
for (xv_p = ctx->ai[i].base_id;
|
|
|
|
xv_p < ctx->ai[i].base_id + ctx->ai[i].num_ports; ++xv_p)
|
2008-12-01 14:15:17 +00:00
|
|
|
if (!XvGrabPort(x11->display, xv_p, CurrentTime)) {
|
2013-01-26 21:37:47 +00:00
|
|
|
ctx->xv_port = xv_p;
|
2013-08-23 21:30:09 +00:00
|
|
|
MP_VERBOSE(vo, "Using Xv Adapter #%d (%s)\n",
|
|
|
|
i, ctx->ai[i].name);
|
2004-06-14 04:53:03 +00:00
|
|
|
break;
|
2008-12-01 14:15:17 +00:00
|
|
|
} else {
|
2013-08-23 21:30:09 +00:00
|
|
|
MP_WARN(vo, "Could not grab port %i.\n", (int) xv_p);
|
2004-06-14 04:53:03 +00:00
|
|
|
++busy_ports;
|
|
|
|
}
|
|
|
|
}
|
2002-04-07 02:10:39 +00:00
|
|
|
}
|
2013-01-26 21:37:47 +00:00
|
|
|
if (!ctx->xv_port) {
|
2004-06-14 04:53:03 +00:00
|
|
|
if (busy_ports)
|
2013-08-23 21:30:09 +00:00
|
|
|
MP_ERR(vo,
|
|
|
|
"Could not find free Xvideo port - maybe another process is already\n"\
|
|
|
|
"using it. Close all video applications, and try again. If that does\n"\
|
|
|
|
"not help, see 'mpv -vo help' for other (non-xv) video out drivers.\n");
|
2004-06-14 04:53:03 +00:00
|
|
|
else
|
2013-08-23 21:30:09 +00:00
|
|
|
MP_ERR(vo,
|
|
|
|
"It seems there is no Xvideo support for your video card available.\n"\
|
|
|
|
"Run 'xvinfo' to verify its Xv support and read\n"\
|
|
|
|
"DOCS/HTML/en/video.html#xv!\n"\
|
|
|
|
"See 'mpv -vo help' for other (non-xv) video out drivers.\n"\
|
|
|
|
"Try -vo x11.\n");
|
2008-04-04 06:57:58 +00:00
|
|
|
goto error;
|
2002-04-07 02:10:39 +00:00
|
|
|
}
|
|
|
|
|
2013-01-26 21:37:47 +00:00
|
|
|
if (!xv_init_colorkey(vo)) {
|
2008-12-01 14:15:17 +00:00
|
|
|
goto error; // bail out, colorkey setup failed
|
2002-10-23 00:36:55 +00:00
|
|
|
}
|
2013-01-26 21:37:47 +00:00
|
|
|
xv_enable_vsync(vo);
|
|
|
|
xv_get_max_img_dim(vo, &ctx->max_width, &ctx->max_height);
|
2002-10-23 00:36:55 +00:00
|
|
|
|
2013-01-26 21:37:47 +00:00
|
|
|
ctx->fo = XvListImageFormats(x11->display, ctx->xv_port,
|
2008-12-01 14:15:17 +00:00
|
|
|
(int *) &ctx->formats);
|
2002-04-11 21:07:00 +00:00
|
|
|
|
2002-02-17 08:24:43 +00:00
|
|
|
return 0;
|
2008-04-04 06:57:58 +00:00
|
|
|
|
2008-12-01 14:15:17 +00:00
|
|
|
error:
|
|
|
|
uninit(vo); // free resources
|
2008-04-04 06:57:58 +00:00
|
|
|
return -1;
|
2002-01-26 16:01:26 +00:00
|
|
|
}
|
2001-02-24 20:28:24 +00:00
|
|
|
|
2008-04-04 05:04:11 +00:00
|
|
|
static int control(struct vo *vo, uint32_t request, void *data)
|
2002-02-09 00:47:26 +00:00
|
|
|
{
|
2008-04-04 05:04:11 +00:00
|
|
|
struct xvctx *ctx = vo->priv;
|
2008-12-01 14:15:17 +00:00
|
|
|
switch (request) {
|
|
|
|
case VOCTRL_GET_PANSCAN:
|
|
|
|
return VO_TRUE;
|
|
|
|
case VOCTRL_SET_PANSCAN:
|
2009-09-04 16:49:35 +00:00
|
|
|
resize(vo);
|
2008-12-01 14:15:17 +00:00
|
|
|
return VO_TRUE;
|
2011-12-05 04:36:20 +00:00
|
|
|
case VOCTRL_SET_EQUALIZER: {
|
|
|
|
vo->want_redraw = true;
|
|
|
|
struct voctrl_set_equalizer_args *args = data;
|
2013-01-26 21:37:47 +00:00
|
|
|
return xv_set_eq(vo, ctx->xv_port, args->name, args->value);
|
2011-12-05 04:36:20 +00:00
|
|
|
}
|
|
|
|
case VOCTRL_GET_EQUALIZER: {
|
|
|
|
struct voctrl_get_equalizer_args *args = data;
|
2013-01-26 21:37:47 +00:00
|
|
|
return xv_get_eq(vo, ctx->xv_port, args->name, args->valueptr);
|
2011-12-05 04:36:20 +00:00
|
|
|
}
|
2009-11-15 13:21:40 +00:00
|
|
|
case VOCTRL_SET_YUV_COLORSPACE:;
|
video, options: implement better YUV->RGB conversion control
Rewrite control of the colorspace and input/output level parameters
used in YUV-RGB conversions, replacing VO-specific suboptions with new
common options and adding configuration support to more cases.
Add new option --colormatrix which selects the colorspace the original
video is assumed to have in YUV->RGB conversions. The default
behavior changes from assuming BT.601 to colorspace autoselection
between BT.601 and BT.709 using a simple heuristic based on video
size. Add new options --colormatrix-input-range and
--colormatrix-output-range which select input YUV and output RGB range.
Disable the previously existing VO-specific colorspace and level
conversion suboptions in vo_gl and vo_vdpau. Remove the
"yuv_colorspace" property and replace it with one named "colormatrix"
and semantics matching the new option. Add new properties matching the
options for level conversion.
Colorspace selection is currently supported by vo_gl, vo_vdpau, vo_xv
and vf_scale, and all can change it at runtime (previously only
vo_vdpau and vo_xv could). vo_vdpau now uses the same conversion
matrix generation as vo_gl instead of libvdpau functionality; the main
functional difference is that the "contrast" equalizer control behaves
somewhat differently (it scales the Y component around 1/2 instead of
around 0, so that contrast 0 makes the image gray rather than black).
vo_xv does not support level conversion. vf_scale supports range
setting for input, but always outputs full-range RGB.
The value of the slave properties is the policy setting used for
conversions. This means they can be set to any value regardless of
whether the current VO supports that value or whether there currently
even is any video. Possibly separate properties could be added to
query the conversion actually used at the moment, if any.
Because the colorspace and level settings are now set with a single
VF/VO control call, the return value of that is no longer used to
signal whether all the settings are actually supported. Instead code
should set all the details it can support, and ignore the rest. The
core will use GET_YUV_COLORSPACE to check which colorspace details
have been set and which not. In other words, the return value for
SET_YUV_COLORSPACE only signals whether any kind of YUV colorspace
conversion handling exists at all, and VOs have to take care to return
the actual state with GET_YUV_COLORSPACE instead.
To be changed in later commits: add missing option documentation.
2011-10-15 21:50:21 +00:00
|
|
|
struct mp_csp_details* given_cspc = data;
|
|
|
|
int is_709 = given_cspc->format == MP_CSP_BT_709;
|
2013-01-26 21:37:47 +00:00
|
|
|
xv_set_eq(vo, ctx->xv_port, "bt_709", is_709 * 200 - 100);
|
2012-11-11 17:40:43 +00:00
|
|
|
read_xv_csp(vo);
|
2011-12-05 04:36:20 +00:00
|
|
|
vo->want_redraw = true;
|
video, options: implement better YUV->RGB conversion control
Rewrite control of the colorspace and input/output level parameters
used in YUV-RGB conversions, replacing VO-specific suboptions with new
common options and adding configuration support to more cases.
Add new option --colormatrix which selects the colorspace the original
video is assumed to have in YUV->RGB conversions. The default
behavior changes from assuming BT.601 to colorspace autoselection
between BT.601 and BT.709 using a simple heuristic based on video
size. Add new options --colormatrix-input-range and
--colormatrix-output-range which select input YUV and output RGB range.
Disable the previously existing VO-specific colorspace and level
conversion suboptions in vo_gl and vo_vdpau. Remove the
"yuv_colorspace" property and replace it with one named "colormatrix"
and semantics matching the new option. Add new properties matching the
options for level conversion.
Colorspace selection is currently supported by vo_gl, vo_vdpau, vo_xv
and vf_scale, and all can change it at runtime (previously only
vo_vdpau and vo_xv could). vo_vdpau now uses the same conversion
matrix generation as vo_gl instead of libvdpau functionality; the main
functional difference is that the "contrast" equalizer control behaves
somewhat differently (it scales the Y component around 1/2 instead of
around 0, so that contrast 0 makes the image gray rather than black).
vo_xv does not support level conversion. vf_scale supports range
setting for input, but always outputs full-range RGB.
The value of the slave properties is the policy setting used for
conversions. This means they can be set to any value regardless of
whether the current VO supports that value or whether there currently
even is any video. Possibly separate properties could be added to
query the conversion actually used at the moment, if any.
Because the colorspace and level settings are now set with a single
VF/VO control call, the return value of that is no longer used to
signal whether all the settings are actually supported. Instead code
should set all the details it can support, and ignore the rest. The
core will use GET_YUV_COLORSPACE to check which colorspace details
have been set and which not. In other words, the return value for
SET_YUV_COLORSPACE only signals whether any kind of YUV colorspace
conversion handling exists at all, and VOs have to take care to return
the actual state with GET_YUV_COLORSPACE instead.
To be changed in later commits: add missing option documentation.
2011-10-15 21:50:21 +00:00
|
|
|
return true;
|
2009-11-15 13:21:40 +00:00
|
|
|
case VOCTRL_GET_YUV_COLORSPACE:;
|
video, options: implement better YUV->RGB conversion control
Rewrite control of the colorspace and input/output level parameters
used in YUV-RGB conversions, replacing VO-specific suboptions with new
common options and adding configuration support to more cases.
Add new option --colormatrix which selects the colorspace the original
video is assumed to have in YUV->RGB conversions. The default
behavior changes from assuming BT.601 to colorspace autoselection
between BT.601 and BT.709 using a simple heuristic based on video
size. Add new options --colormatrix-input-range and
--colormatrix-output-range which select input YUV and output RGB range.
Disable the previously existing VO-specific colorspace and level
conversion suboptions in vo_gl and vo_vdpau. Remove the
"yuv_colorspace" property and replace it with one named "colormatrix"
and semantics matching the new option. Add new properties matching the
options for level conversion.
Colorspace selection is currently supported by vo_gl, vo_vdpau, vo_xv
and vf_scale, and all can change it at runtime (previously only
vo_vdpau and vo_xv could). vo_vdpau now uses the same conversion
matrix generation as vo_gl instead of libvdpau functionality; the main
functional difference is that the "contrast" equalizer control behaves
somewhat differently (it scales the Y component around 1/2 instead of
around 0, so that contrast 0 makes the image gray rather than black).
vo_xv does not support level conversion. vf_scale supports range
setting for input, but always outputs full-range RGB.
The value of the slave properties is the policy setting used for
conversions. This means they can be set to any value regardless of
whether the current VO supports that value or whether there currently
even is any video. Possibly separate properties could be added to
query the conversion actually used at the moment, if any.
Because the colorspace and level settings are now set with a single
VF/VO control call, the return value of that is no longer used to
signal whether all the settings are actually supported. Instead code
should set all the details it can support, and ignore the rest. The
core will use GET_YUV_COLORSPACE to check which colorspace details
have been set and which not. In other words, the return value for
SET_YUV_COLORSPACE only signals whether any kind of YUV colorspace
conversion handling exists at all, and VOs have to take care to return
the actual state with GET_YUV_COLORSPACE instead.
To be changed in later commits: add missing option documentation.
2011-10-15 21:50:21 +00:00
|
|
|
struct mp_csp_details* cspc = data;
|
2012-11-11 17:40:43 +00:00
|
|
|
read_xv_csp(vo);
|
|
|
|
*cspc = ctx->cached_csp;
|
2009-11-15 13:21:40 +00:00
|
|
|
return true;
|
2011-12-05 03:24:18 +00:00
|
|
|
case VOCTRL_REDRAW_FRAME:
|
video/out: always support redrawing VO window at any point
Before, a VO could easily refuse to respond to VOCTRL_REDRAW_FRAME,
which means the VO wouldn't redraw OSD and window contents, and the
player would appear frozen to the user. This was a bit stupid, and makes
dealing with some corner cases much harder (think of --keep-open, which
was hard to implement, because the VO gets into this state if there are
no new video frames after a seek reset).
Change this, and require VOs to always react to VOCTRL_REDRAW_FRAME.
There are two aspects of this: First, behavior after a (successful)
vo_reconfig() call, but before any video frame has been displayed.
Second, behavior after a vo_seek_reset().
For the first issue, we define that sending VOCTRL_REDRAW_FRAME after
vo_reconfig() should clear the window with black. This requires minor
changes to some VOs. In particular vaapi makes this horribly
complicated, because OSD rendering is bound to a video surface. We
create a black dummy surface for this purpose.
The second issue is much simpler and works already with most VOs: they
simply redraw whatever has been uploaded previously. The exception is
vdpau, which has a complicated mechanism to track and filter video
frames. The state associated with this mechanism is completely cleared
with vo_seek_reset(), so implementing this to work as expected is not
trivial. For now, we just clear the window with black.
2013-10-01 21:35:51 +00:00
|
|
|
redraw_frame(vo);
|
|
|
|
return true;
|
2011-10-06 18:46:01 +00:00
|
|
|
case VOCTRL_SCREENSHOT: {
|
|
|
|
struct voctrl_screenshot_args *args = data;
|
|
|
|
args->out_image = get_screenshot(vo);
|
|
|
|
return true;
|
|
|
|
}
|
input: handle mouse movement differently
Before this commit, mouse movement events emitted a special command
("set_mouse_pos"), which was specially handled in command.c. This was
once special-cased to the dvdnav and menu code, and did nothing after
libmenu and dvdnav were removed.
Change it so that mouse movement triggers a pseudo-key ("MOUSE_MOVE"),
which then can be bound to an arbitrary command. The mouse position is
now managed in input.c. A command which actually needs the mouse
position can use either mp_input_get_mouse_pos() or mp_get_osd_mouse_pos()
to query it. The former returns raw window-space coordinates, while the
latter returns coordinates transformed to OSD- space. (Both are the same
for most VOs, except vo_xv and vo_x11, which can't render OSD in
window-space. These require extra code for mapping mouse position.)
As of this commit, there is still nothing that uses mouse movement, so
MOUSE_MOVE is mapped to "ignore" to silence warnings when moving the
mouse (much like MOUSE_BTN0).
Extend the concept of input sections. Allow multiple sections to be
active at once, and organize them as stack. Bindings from the top of
the stack are preferred to lower ones.
Each section has a mouse input section associated, inside which mouse
events are associated with the bindings. If the mouse pointer is
outside of a section's mouse area, mouse events will be dispatched to
an input section lower on the stack of active sections. This is intended
for scripting, which is to be added later. Two scripts could occupy
different areas of the screen without conflicting with each other. (If
it turns out that this mechanism is useless, we'll just remove it
again.)
2013-04-26 00:13:30 +00:00
|
|
|
case VOCTRL_WINDOW_TO_OSD_COORDS: {
|
|
|
|
float *c = data;
|
|
|
|
struct mp_rect *src = &ctx->src_rect;
|
|
|
|
struct mp_rect *dst = &ctx->dst_rect;
|
|
|
|
c[0] = av_clipf(c[0], dst->x0, dst->x1) - dst->x0;
|
|
|
|
c[1] = av_clipf(c[1], dst->y0, dst->y1) - dst->y0;
|
|
|
|
c[0] = c[0] / (dst->x1 - dst->x0) * (src->x1 - src->x0) + src->x0;
|
|
|
|
c[1] = c[1] / (dst->y1 - dst->y0) * (src->y1 - src->y0) + src->y0;
|
|
|
|
return VO_TRUE;
|
|
|
|
}
|
2004-06-14 04:53:03 +00:00
|
|
|
}
|
2013-05-16 12:02:28 +00:00
|
|
|
int events = 0;
|
|
|
|
int r = vo_x11_control(vo, &events, request, data);
|
2013-06-15 15:14:14 +00:00
|
|
|
if (events & (VO_EVENT_EXPOSE | VO_EVENT_RESIZE))
|
2013-05-16 12:02:28 +00:00
|
|
|
resize(vo);
|
|
|
|
return r;
|
2002-02-09 00:47:26 +00:00
|
|
|
}
|
2008-04-04 05:04:11 +00:00
|
|
|
|
2013-07-21 22:59:00 +00:00
|
|
|
#define OPT_BASE_STRUCT struct xvctx
|
|
|
|
|
2008-04-04 05:04:11 +00:00
|
|
|
const struct vo_driver video_out_xv = {
|
|
|
|
.info = &info,
|
|
|
|
.preinit = preinit,
|
2012-11-04 15:24:18 +00:00
|
|
|
.query_format = query_format,
|
2008-04-04 05:04:11 +00:00
|
|
|
.config = config,
|
|
|
|
.control = control,
|
2012-11-04 14:56:04 +00:00
|
|
|
.draw_image = draw_image,
|
2008-04-04 05:04:11 +00:00
|
|
|
.draw_osd = draw_osd,
|
|
|
|
.flip_page = flip_page,
|
2013-07-21 22:59:00 +00:00
|
|
|
.uninit = uninit,
|
|
|
|
.priv_size = sizeof(struct xvctx),
|
|
|
|
.priv_defaults = &(const struct xvctx) {
|
|
|
|
.cfg_xv_adaptor = -1,
|
|
|
|
.xv_ck_info = {CK_METHOD_MANUALFILL, CK_SRC_CUR},
|
2013-07-21 23:03:22 +00:00
|
|
|
.colorkey = 0x0000ff00, // default colorkey is green
|
|
|
|
// (0xff000000 means that colorkey has been disabled)
|
2013-07-21 22:59:00 +00:00
|
|
|
},
|
|
|
|
.options = (const struct m_option[]) {
|
|
|
|
OPT_INT("port", xv_port, M_OPT_MIN, .min = 0),
|
|
|
|
OPT_INT("adaptor", cfg_xv_adaptor, M_OPT_MIN, .min = -1),
|
|
|
|
OPT_CHOICE("ck", xv_ck_info.source, 0,
|
|
|
|
({"use", CK_SRC_USE},
|
|
|
|
{"set", CK_SRC_SET},
|
|
|
|
{"cur", CK_SRC_CUR})),
|
|
|
|
OPT_CHOICE("ck-method", xv_ck_info.method, 0,
|
|
|
|
({"bg", CK_METHOD_BACKGROUND},
|
|
|
|
{"man", CK_METHOD_MANUALFILL},
|
|
|
|
{"auto", CK_METHOD_AUTOPAINT})),
|
2013-07-21 23:03:22 +00:00
|
|
|
OPT_INT("colorkey", colorkey, 0),
|
|
|
|
OPT_FLAG_STORE("no-colorkey", colorkey, 0, 0x1000000),
|
2013-07-21 22:59:00 +00:00
|
|
|
{0}
|
|
|
|
},
|
2008-04-04 05:04:11 +00:00
|
|
|
};
|