comparison libvo/vo_vdpau.c @ 36444:45e6b96cb2e1

Make handling of query_format more robust.

36443:0d52d44ad7b6

#ifdef CONFIG_XF86VM
    int vm = flags & VOFLAG_MODESWITCHING;
#endif
    flip = flags & VOFLAG_FLIPPING;

    if (image_format == format &&
        vid_width    == width  &&
        vid_height   == height) {
        // at most aspect change, avoid reinit
        vo_x11_create_vo_window(&vinfo, vo_dx, vo_dy, d_width, d_height,

    case IMGFMT_VDPAU_MPEG2:
    case IMGFMT_VDPAU_H264:
    case IMGFMT_VDPAU_WMV3:
    case IMGFMT_VDPAU_VC1:
    case IMGFMT_VDPAU_MPEG4:
        if (create_vdp_decoder(format, 48, 48, 2))
            return default_flags;
    }
    return 0;
}

static void DestroyVdpauObjects(void)

36444:45e6b96cb2e1

#ifdef CONFIG_XF86VM
    int vm = flags & VOFLAG_MODESWITCHING;
#endif
    flip = flags & VOFLAG_FLIPPING;

    if (IMGFMT_IS_VDPAU(image_format) && decoder == VDP_INVALID_HANDLE) {
        mp_msg(MSGT_VO, MSGL_WARN, "[vdpau] Unexpected reinit, query_format called too often?\n");
        // force a full reinit, otherwise we might run into issues with
        // some implementations
        image_format = 0;
    }
    if (image_format == format &&
        vid_width    == width  &&
        vid_height   == height) {
        // at most aspect change, avoid reinit
        vo_x11_create_vo_window(&vinfo, vo_dx, vo_dy, d_width, d_height,

    case IMGFMT_VDPAU_MPEG2:
    case IMGFMT_VDPAU_H264:
    case IMGFMT_VDPAU_WMV3:
    case IMGFMT_VDPAU_VC1:
    case IMGFMT_VDPAU_MPEG4:
        // Note: this will break the current decoder
        // Not all implementations support safely instantiating
        // a second decoder, so this is the "lesser evil"
        if (create_vdp_decoder(format, 48, 48, 2)) {
            vdp_decoder_destroy(decoder);
            decoder = VDP_INVALID_HANDLE;
            decoder_max_refs = -1;
            return default_flags;
        }
    }
    return 0;
}

static void DestroyVdpauObjects(void)