media/srtp refactoring pass