Under very general conditions, the total quadratic variation of a jump-diffusion process can be decomposed into diffusive volatility and squared jump variation. We use this result to develop a new option valuation model in which the underlying asset price exhibits volatility and jump intensity dynamics. The volatility and jump intensity dynamics in the model are directly driven by model-free empirical measures of diffusive volatility and jump variation. Because the empirical measures are observed in discrete intervals, our option valuation model is cast in discrete time, allowing for straightforward filtering and estimation of the model. Our model belongs to the affine class enabling us to derive the conditional characteristic function so that option values can be computed rapidly without simulation. When estimated on S&P500 index options and returns the new model performs well compared with standard benchmarks.