mplayer.hg: libvo/vo_vdpau.c comparison

comparison libvo/vo_vdpau.c @ 29735:8adf928e517a

Try to recover from VDPAU display pre-emptions. Original patch by Uoti.

author	cehoyos
date	Sat, 17 Oct 2009 15:15:07 +0000
parents	42abcc270fb6
children	593354e0500d

comparison

equal deleted inserted replaced

-:54145563612e
+:8adf928e517a
 static VdpDecoderCreate                          *vdp_decoder_create;
 static VdpDecoderDestroy                         *vdp_decoder_destroy;
 static VdpDecoderRender                          *vdp_decoder_render;
 static VdpGenerateCSCMatrix                      *vdp_generate_csc_matrix;
+static VdpPreemptionCallbackRegister             *vdp_preemption_callback_register;
 static void                              *vdpau_lib_handle;
 /* output_surfaces[NUM_OUTPUT_SURFACES] is misused for OSD. */
 #define osd_surface output_surfaces[NUM_OUTPUT_SURFACES]
 static VdpOutputSurface                   output_surfaces[NUM_OUTPUT_SURFACES + 1];
 static int                                vid_surface_num;
 static uint32_t                           vid_width, vid_height;
 static uint32_t                           image_format;
 static VdpChromaType                      vdp_chroma_type;
 static VdpYCbCrFormat                     vdp_pixel_format;
+static volatile int                       is_preempted;
 /* draw_osd */
 static unsigned char                     *index_data;
 static int                                index_data_size;
 static uint32_t                           palette[PALETTE_SIZE];
 }
 }
 video_to_output_surface();
 if (visible_buf)
 flip_page();
+}
+static void preemption_callback(VdpDevice device, void *context)
+{
+mp_msg(MSGT_VO, MSGL_ERR, "[vdpau] Display preemption detected\n");
+is_preempted = 1;
 }
 /* Initialize vdp_get_proc_address, called from preinit() */
 static int win_x11_init_vdpau_procs(void)
 {
 {VDP_FUNC_ID_BITMAP_SURFACE_PUT_BITS_NATIVE,
 &vdp_bitmap_surface_putbits_native},
 {VDP_FUNC_ID_OUTPUT_SURFACE_RENDER_BITMAP_SURFACE,
 &vdp_output_surface_render_bitmap_surface},
 {VDP_FUNC_ID_GENERATE_CSC_MATRIX,       &vdp_generate_csc_matrix},
+{VDP_FUNC_ID_PREEMPTION_CALLBACK_REGISTER,
+&vdp_preemption_callback_register},
 {0, NULL}
 };
 vdp_st = vdp_device_create(mDisplay, mScreen,
 &vdp_device, &vdp_get_proc_address);
 mp_msg(MSGT_VO, MSGL_ERR, "[vdpau] Error when calling vdp_get_proc_address(function id %d): %s\n",
 dsc->id, vdp_get_error_string ? vdp_get_error_string(vdp_st) : "?");
 return -1;
 }
 }
+vdp_st = vdp_preemption_callback_register(vdp_device,
+preemption_callback, NULL);
+CHECK_ST_ERROR("Error when calling vdp_preemption_callback_register")
 return 0;
 }
 /* Initialize vdpau_flip_queue, called from config() */
 static int win_x11_init_vdpau_flip_queue(void)
 }
 decoder_max_refs = max_refs;
 return 1;
 }
+static void mark_vdpau_objects_uninitialized(void)
+{
+int i;
+decoder = VDP_INVALID_HANDLE;
+for (i = 0; i < MAX_VIDEO_SURFACES; i++)
+surface_render[i].surface = VDP_INVALID_HANDLE;
+for (i = 0; i < 3; i++) {
+deint_surfaces[i] = VDP_INVALID_HANDLE;
+if (i < 2 && deint_mpi[i])
+deint_mpi[i]->usage_count--;
+deint_mpi[i] = NULL;
+}
+video_mixer     = VDP_INVALID_HANDLE;
+vdp_flip_queue  = VDP_INVALID_HANDLE;
+vdp_flip_target = VDP_INVALID_HANDLE;
+for (i = 0; i <= NUM_OUTPUT_SURFACES; i++)
+output_surfaces[i] = VDP_INVALID_HANDLE;
+vdp_device = VDP_INVALID_HANDLE;
+for (i = 0; i < eosd_surface_count; i++)
+eosd_surfaces[i].surface = VDP_INVALID_HANDLE;
+output_surface_width = output_surface_height = -1;
+eosd_render_count = 0;
+visible_buf = 0;
+}
+static int handle_preemption(void)
+{
+if (!is_preempted)
+return 0;
+is_preempted = 0;
+mp_msg(MSGT_VO, MSGL_INFO, "[vdpau] Attempting to recover from preemption.\n");
+mark_vdpau_objects_uninitialized();
+if (win_x11_init_vdpau_procs() < 0 ||
+win_x11_init_vdpau_flip_queue() < 0 ||
+create_vdp_mixer(vdp_chroma_type) < 0) {
+mp_msg(MSGT_VO, MSGL_ERR, "[vdpau] Recovering from preemption failed\n");
+is_preempted = 1;
+return -1;
+}
+resize();
+mp_msg(MSGT_VO, MSGL_INFO, "[vdpau] Recovered from display preemption.\n");
+return 1;
+}
 /*
 * connect to X server, create and map window, initialize all
 * VDPAU objects, create different surfaces etc.
 */
 static int config(uint32_t width, uint32_t height, uint32_t d_width,
 }
 static void check_events(void)
 {
 int e = vo_x11_check_events(mDisplay);
+if (handle_preemption() < 0)
+return;
 if (e & VO_EVENT_RESIZE)
 resize();
 if ((e & VO_EVENT_EXPOSE || e & VO_EVENT_RESIZE) && int_pause) {
 static void draw_osd(void)
 {
 mp_msg(MSGT_VO, MSGL_DBG2, "DRAW_OSD\n");
+if (handle_preemption() < 0)
+return;
 vo_draw_text_ext(vo_dwidth, vo_dheight, border_x, border_y, border_x, border_y,
 vid_width, vid_height, draw_osd_I8A8);
 }
 static void flip_page(void)
 {
 VdpStatus vdp_st;
 mp_msg(MSGT_VO, MSGL_DBG2, "\nFLIP_PAGE VID:%u -> OUT:%u\n",
 surface_render[vid_surface_num].surface, output_surfaces[surface_num]);
+if (handle_preemption() < 0)
+return;
 vdp_st = vdp_presentation_queue_display(vdp_flip_queue, output_surfaces[surface_num],
 vo_dwidth, vo_dheight,
 0);
 CHECK_ST_WARNING("Error when calling vdp_presentation_queue_display")
 int x, int y)
 {
 VdpStatus vdp_st;
 struct vdpau_render_state *rndr = (struct vdpau_render_state *)image[0];
 int max_refs = image_format == IMGFMT_VDPAU_H264 ? rndr->info.h264.num_ref_frames : 2;
+if (handle_preemption() < 0)
+return VO_TRUE;
 if (!IMGFMT_IS_VDPAU(image_format))
 return VO_FALSE;
 if ((decoder == VDP_INVALID_HANDLE || decoder_max_refs < max_refs)
 && !create_vdp_decoder(max_refs))
 return VO_FALSE;
 return update_csc_matrix();
 }
 static int control(uint32_t request, void *data, ...)
 {
+if (handle_preemption() < 0)
+return VO_FALSE;
 switch (request) {
 case VOCTRL_GET_DEINTERLACE:
 *(int*)data = deint;
 return VO_TRUE;
 case VOCTRL_SET_DEINTERLACE:

Mercurial > mplayer.hg

comparison libvo/vo_vdpau.c @ 29735:8adf928e517a