[Encoder Refactor] Expand MVD table

and rename some macros