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

Simplify vdpau deinterlacing code and fix timing for deint=2. 

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29061 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
cehoyos 2009-03-25 23:32:27 +00:00
parent e1a3779c4e
commit 38116c1f73
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libvo/vo_vdpau.c
View File

@ -224,9 +224,12 @@ static void video_to_output_surface(void)
VdpTime dummy;
VdpStatus vdp_st;
int i;
if (vid_surface_num < 0 || deint_surfaces[0] == VDP_INVALID_HANDLE)
if (vid_surface_num < 0)
return;
if (deint < 2 || deint_surfaces[0] == VDP_INVALID_HANDLE)
push_deint_surface(surface_render[vid_surface_num].surface);
for (i = 0; i <= !!(deint > 1); i++) {
int field = VDP_VIDEO_MIXER_PICTURE_STRUCTURE_FRAME;
VdpOutputSurface output_surface;
@ -234,10 +237,9 @@ static void video_to_output_surface(void)
draw_eosd();
draw_osd();
flip_page();
push_deint_surface(surface_render[vid_surface_num].surface);
}
if (deint)
field = (top_field_first == i) ^ (deint > 2) ?
field = (top_field_first == i) ^ (deint > 1) ?
VDP_VIDEO_MIXER_PICTURE_STRUCTURE_BOTTOM_FIELD:
VDP_VIDEO_MIXER_PICTURE_STRUCTURE_TOP_FIELD;
output_surface = output_surfaces[surface_num];
@ -254,6 +256,7 @@ static void video_to_output_surface(void)
output_surface,
NULL, &out_rect_vid, 0, NULL);
CHECK_ST_WARNING("Error when calling vdp_video_mixer_render")
push_deint_surface(surface_render[vid_surface_num].surface);
}
}
@ -891,10 +894,7 @@ static uint32_t draw_image(mp_image_t *mpi)
}
top_field_first = !!(mpi->fields & MP_IMGFIELD_TOP_FIRST);
if (deint < 3)
deint_surfaces[0] = surface_render[vid_surface_num].surface;
video_to_output_surface();
push_deint_surface(surface_render[vid_surface_num].surface);
return VO_TRUE;
}
@ -1045,7 +1045,7 @@ static int preinit(const char *arg)
}
if (deint)
deint_type = deint;
if (deint > 2)
if (deint > 1)
deint_buffer_past_frames = 1;
vdpau_lib_handle = dlopen(vdpaulibrary, RTLD_LAZY);