This allows inter and intra modes to use different mask functions.
The mask functions checked in are still place holders to allow for
easy experimentation.

Change-Id: Ic20d88200676df81dffee8c43555d0ff0c7bfc28