Merge changes I4aef89be,Ibaae6b5f

* changes:
  Add contants for audio format codes
  Cleanup formating of Constants