A process for upgrading unconventional or heavy oils such as, tar sands, shale oil, or bitumen. This process may include a coking scheme in which oil-containing solids, of suitable size, are fed directly into the riser of an FCC unit. Contacting a hot stream of solids causes vaporization and produces a gaseous product stream. The gaseous product may be separated out in a separating vessel and coked or unconverted oil-containing solids may be transferred to a gasifier for combustion at high temperatures to remove the coke and residual oil. Syngas from the gasifier may be converted to hydrogen using a water gas shift reaction. The hydrogen may be used for hydroprocessing.