mirror of
https://github.com/mpv-player/mpv
synced 2024-12-11 09:25:56 +00:00
As for vo_gl, do not rely on draw_osd to render EOSD.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28840 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
658bcd5e35
commit
d4748622fa
@ -205,6 +205,8 @@ static VdpProcamp procamp;
|
|||||||
static int visible_buf;
|
static int visible_buf;
|
||||||
static int int_pause;
|
static int int_pause;
|
||||||
|
|
||||||
|
static void draw_eosd(void);
|
||||||
|
|
||||||
static void video_to_output_surface(void)
|
static void video_to_output_surface(void)
|
||||||
{
|
{
|
||||||
VdpTime dummy;
|
VdpTime dummy;
|
||||||
@ -219,6 +221,7 @@ static void video_to_output_surface(void)
|
|||||||
int field = VDP_VIDEO_MIXER_PICTURE_STRUCTURE_FRAME;
|
int field = VDP_VIDEO_MIXER_PICTURE_STRUCTURE_FRAME;
|
||||||
VdpOutputSurface output_surface;
|
VdpOutputSurface output_surface;
|
||||||
if (i) {
|
if (i) {
|
||||||
|
draw_eosd();
|
||||||
draw_osd();
|
draw_osd();
|
||||||
flip_page();
|
flip_page();
|
||||||
}
|
}
|
||||||
@ -657,7 +660,7 @@ static void generate_eosd(mp_eosd_images_t *imgs) {
|
|||||||
|
|
||||||
// Nothing changed, no need to redraw
|
// Nothing changed, no need to redraw
|
||||||
if (imgs->changed == 0)
|
if (imgs->changed == 0)
|
||||||
return;
|
goto eosd_draw_only;
|
||||||
eosd_render_count = 0;
|
eosd_render_count = 0;
|
||||||
// There's nothing to render!
|
// There's nothing to render!
|
||||||
if (!img)
|
if (!img)
|
||||||
@ -736,6 +739,8 @@ eosd_skip_upload:
|
|||||||
eosd_targets[eosd_render_count].source.y1 = i->h;
|
eosd_targets[eosd_render_count].source.y1 = i->h;
|
||||||
eosd_render_count++;
|
eosd_render_count++;
|
||||||
}
|
}
|
||||||
|
eosd_draw_only:
|
||||||
|
draw_eosd();
|
||||||
}
|
}
|
||||||
|
|
||||||
static void draw_osd(void)
|
static void draw_osd(void)
|
||||||
|
Loading…
Reference in New Issue
Block a user