This CL removes some indirection and moves some constants. This is done to simplify understanding and debugging of the code. Bug: webrtc:9718 Change-Id: Ibe2b1da0163b4c97ffd1a5bc157f6aa59582d697 Reviewed-on: https://webrtc-review.googlesource.com/98240 Commit-Queue: Sebastian Jansson <srte@webrtc.org> Reviewed-by: Christoffer Rodbro <crodbro@webrtc.org> Cr-Commit-Position: refs/heads/master@{#24732}