mplayer.hg: libvo/vo_vdpau.c comparison

comparison libvo/vo_vdpau.c @ 36205:c922d2550d20

VDPAU: fix RGBA output to use a surface of correct size and to redraw on resize.

author	reimar
date	Thu, 06 Jun 2013 13:03:50 +0000
parents	a3aaf74a68a1
children	7227ed885f0c

comparison

equal deleted inserted replaced

-:88c5a06d1db9
+:c922d2550d20
 static VdpPreemptionCallbackRegister             *vdp_preemption_callback_register;
 /* 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 VdpOutputSurface                   rgba_surface;
 static VdpVideoSurface                    deint_surfaces[3];
 static mp_image_t                        *deint_mpi[2];
 static int                                output_surface_width, output_surface_height;
 static VdpVideoMixer                      video_mixer;
 deint_surfaces[2] = deint_surfaces[1];
 deint_surfaces[1] = deint_surfaces[0];
 deint_surfaces[0] = surface;
 }
+static const uint32_t rotate_flags[4] = {
+VDP_OUTPUT_SURFACE_RENDER_ROTATE_0,
+VDP_OUTPUT_SURFACE_RENDER_ROTATE_90,
+VDP_OUTPUT_SURFACE_RENDER_ROTATE_180,
+VDP_OUTPUT_SURFACE_RENDER_ROTATE_270
+};
 static void video_to_output_surface(void)
 {
 VdpTime dummy;
 VdpStatus vdp_st;
 int i;
+if (image_format == IMGFMT_BGRA) {
+vdp_st = vdp_output_surface_render_output_surface(output_surfaces[surface_num],
+&out_rect_vid,
+rgba_surface,
+&src_rect_vid, NULL, NULL,
+rotate_flags[vo_rotate & 3]);
+CHECK_ST_WARNING("Error when calling vdp_output_surface_render_output_surface")
+return;
+}
 if (vid_surface_num < 0)
 return;
 if (deint < 2 || deint_surfaces[0] == VDP_INVALID_HANDLE)
 push_deint_surface(surface_render[vid_surface_num].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);
 }
 }
-static const uint32_t rotate_flags[4] = {
-VDP_OUTPUT_SURFACE_RENDER_ROTATE_0,
-VDP_OUTPUT_SURFACE_RENDER_ROTATE_90,
-VDP_OUTPUT_SURFACE_RENDER_ROTATE_180,
-VDP_OUTPUT_SURFACE_RENDER_ROTATE_270
-};
 static void resize(void)
 {
 VdpStatus vdp_st;
 int i;
 &output_surfaces[i]);
 CHECK_ST_WARNING("Error when calling vdp_output_surface_create")
 mp_msg(MSGT_VO, MSGL_DBG2, "OUT CREATE: %u\n", output_surfaces[i]);
 }
 }
-if (image_format == IMGFMT_BGRA) {
+video_to_output_surface();
-vdp_st = vdp_output_surface_render_output_surface(output_surfaces[surface_num],
-NULL, VDP_INVALID_HANDLE,
-NULL, NULL, NULL,
-rotate_flags[vo_rotate & 3]);
-CHECK_ST_WARNING("Error when calling vdp_output_surface_render_output_surface")
-vdp_st = vdp_output_surface_render_output_surface(output_surfaces[1 - surface_num],
-NULL, VDP_INVALID_HANDLE,
-NULL, NULL, NULL,
-rotate_flags[vo_rotate & 3]);
-CHECK_ST_WARNING("Error when calling vdp_output_surface_render_output_surface")
-} else
-video_to_output_surface();
 if (visible_buf)
 flip_page();
 }
 static void preemption_callback(VdpDevice device, void *context)
 int i;
 decoder = VDP_INVALID_HANDLE;
 video_mixer = VDP_INVALID_HANDLE;
+rgba_surface = VDP_INVALID_HANDLE;
 for (i = 0; i < 3; i++)
 deint_surfaces[i] = VDP_INVALID_HANDLE;
 for (i = 0; i < 2; i++)
 if (deint_mpi[i]) {
 VdpStatus vdp_st;
 if (decoder != VDP_INVALID_HANDLE)
 vdp_decoder_destroy(decoder);
 decoder_max_refs = -1;
+if (rgba_surface != VDP_INVALID_HANDLE) {
+vdp_st = vdp_output_surface_destroy(rgba_surface);
+CHECK_ST_WARNING("Error destroying RGBA surface")
+}
 for (i = 0; i < MAX_VIDEO_SURFACES; i++) {
 if (surface_render[i].surface != VDP_INVALID_HANDLE) {
 vdp_st = vdp_video_surface_destroy(surface_render[i].surface);
 CHECK_ST_WARNING("Error when calling vdp_video_surface_destroy")
 */
 static int config(uint32_t width, uint32_t height, uint32_t d_width,
 uint32_t d_height, uint32_t flags, char *title,
 uint32_t format)
 {
+VdpStatus vdp_st;
 XVisualInfo vinfo;
 XSetWindowAttributes xswa;
 XWindowAttributes attribs;
 unsigned long xswamask;
 int depth;
 vdp_chroma_type  = VDP_CHROMA_TYPE_422;
 break;
 case IMGFMT_UYVY:
 vdp_pixel_format = VDP_YCBCR_FORMAT_UYVY;
 vdp_chroma_type  = VDP_CHROMA_TYPE_422;
+break;
+case IMGFMT_BGRA:
+vdp_st = vdp_output_surface_create(vdp_device, VDP_RGBA_FORMAT_B8G8R8A8,
+vid_width, vid_height,
+&rgba_surface);
+CHECK_ST_ERROR("Error creating RGBA surface")
+break;
 }
 if (create_vdp_mixer(vdp_chroma_type))
 return -1;
 surface_num     =  0;
 deint_mpi[1] = deint_mpi[0];
 deint_mpi[0] = mpi;
 } else if (image_format == IMGFMT_BGRA) {
 VdpStatus vdp_st;
 VdpRect r = {0, 0, vid_width, vid_height};
-vdp_st = vdp_output_surface_put_bits_native(output_surfaces[2],
+vdp_st = vdp_output_surface_put_bits_native(rgba_surface,
 (void const*const*)mpi->planes,
 mpi->stride, &r);
 CHECK_ST_ERROR("Error when calling vdp_output_surface_put_bits_native")
-vdp_st = vdp_output_surface_render_output_surface(output_surfaces[surface_num],
-&out_rect_vid,
-output_surfaces[2],
-&src_rect_vid, NULL, NULL,
-rotate_flags[vo_rotate & 3]);
-CHECK_ST_ERROR("Error when calling vdp_output_surface_render_output_surface")
 } else if (!(mpi->flags & MP_IMGFLAG_DRAW_CALLBACK)) {
 VdpStatus vdp_st;
 void *destdata[3] = {mpi->planes[0], mpi->planes[2], mpi->planes[1]};
 struct vdpau_render_state *rndr = get_surface(deint_counter);
 deint_counter = (deint_counter + 1) % 3;
 video_mixer = VDP_INVALID_HANDLE;
 for (i = 0; i <= NUM_OUTPUT_SURFACES; i++)
 output_surfaces[i] = VDP_INVALID_HANDLE;
 vdp_flip_queue = VDP_INVALID_HANDLE;
 output_surface_width = output_surface_height = -1;
+rgba_surface = VDP_INVALID_HANDLE;
 // full grayscale palette.
 for (i = 0; i < PALETTE_SIZE; ++i)
 palette[i] = (i << 16) | (i << 8) | i;
 index_data = NULL;

Mercurial > mplayer.hg

comparison libvo/vo_vdpau.c @ 36205:c922d2550d20