One macro JVET_X0141_CIIP_TIMD_TM is added to ECM, wherein CIIP-TM part is controlled by TM_MRG, and CIIP-TIMD part is controlled by JVET_W0123_TIMD_FUSION.
One macro JVET_X0141_CIIP_TIMD_TM is added to ECM, wherein CIIP-TM part is controlled by TM_MRG, and CIIP-TIMD part is controlled by JVET_W0123_TIMD_FUSION.