Refactor the macro JVET_Z0084_IBC_TM to decouple it from TM_AMVP and TM_MRG, so that either one of IBC-TM based AMVP and MRG modes can be switched without the need of re-configuring TM_AMVP and TM_MRG macros.
In ECM5, IBC-TM based AMVP and MRG rely respectively on the macros TM_AMVP and TM_MRG to switch, which may have reduced the configuration-wise flexibility of ECM to switch these TM tools. For example, the only way to disable IBC-TM based AMVP mode is to set TM_AMVP=0, but this also turns off regular inter TM AMVP mode. It is impossible to just disable one of them through macro configurations.
In this MR, two macros (IBC_TM_AMVP and IBC_TM_MRG) are implemented to solve aforementioned SW issue.