Is the acorn cap spiny, the acorn 3/4-1" long? 

It is a tanoak.

Is the acorn cap scaly, the acorn 1/2-2" long? 

It is a canyon live oak.