1) Simplify macro branch
2) Improve the naming of interp_filter read/write functions

Change-Id: I0ae290b08a8b058359874d91da468062706ab2d5