d4cec15c75fd554764c9b7b969331943265fcc59 - platform/external/webrtc

commit	d4cec15c75fd554764c9b7b969331943265fcc59	[log] [tgz]
author	Qiang Chen <qiangchen@chromium.org>	Fri Jun 19 09:17:00 2015 -0700
committer	Qiang Chen <qiangchen@chromium.org>	Fri Jun 19 16:17:10 2015 +0000
tree	33da5729135f8b125cf23181c39493fed3495ef3
parent	76eea37ed02f653cc0ca786ece78c358e7544db2 [diff]

Resolved Rebase Conflicts
This is just https://webrtc-codereview.appspot.com/53629004/

Remove a constructor of VCMJitterBuffer.

Remove unnecessary factory use

Comment Fix

Move frame incoming simulation to the clock

DCHECK typo fix

Coding Style Fix

Rephrased some comments, and removed some virtual for override function.

Coding Style Fix

Coding Style Fix

Add a unittest for VCMReceiver::FrameForDecoding. Mainly test the time control algorithm.

BUG=

TBR=holmer@chromium.org

Review URL: https://codereview.webrtc.org/1173253008.

Cr-Commit-Position: refs/heads/master@{#9470}

webrtc/modules/video_coding/main/source/jitter_buffer.cc[diff]
webrtc/modules/video_coding/main/source/jitter_buffer.h[diff]
webrtc/modules/video_coding/main/source/jitter_buffer_unittest.cc[diff]
webrtc/modules/video_coding/main/source/receiver.cc[diff]
webrtc/modules/video_coding/main/source/receiver.h[diff]
webrtc/modules/video_coding/main/source/receiver_unittest.cc[diff]
webrtc/modules/video_coding/main/source/test/stream_generator.cc[diff]
webrtc/modules/video_coding/main/source/test/stream_generator.h[diff]

8 files changed

tree: 33da5729135f8b125cf23181c39493fed3495ef3