NetEq: Remove special case for Merge without Expand

NetEq: Remove special case for Merge without Expand

(This is a backport of revision 14627 (c9ec8758db79c6fe4de). Original
CL here: https://codereview.webrtc.org/2412883002)

This was an ill tested special case which turned out to be more problem
than benefit. The special case was only triggered when the decoder frame
size was smaller than 10 ms, which is more or less unsupported by NetEq.

Also fixed a bug in a test, a bug which was exposed by the code change.

BUG=chromium:654983, chromium:653656
R=ossu@webrtc.org

Committed: https://chromium.googlesource.com/external/webrtc/+/c64c620c83176c6766d3e150558bc866ebb7f7c5

[kwiberg-webrtc, 2016-10-25 11:29:55]

kwiberg@webrtc.org changed reviewers:
+ henrik.lundin@webrtc.org, ossu@webrtc.org

[kwiberg-webrtc, 2016-10-25 11:29:55]

I'm backporting one of Henrik's CLs to M55; see the second of the listed bugs
(the first listed bug is the one cited in the original CL).

[ossu, 2016-10-25 12:07:31]

lgtm

[kwiberg-webrtc, 2016-10-25 12:10:10]

Description was changed from

==========
NetEq: Remove special case for Merge without Expand

(This is a backport of revision 14627 (c9ec8758db79c6fe4de). Original
CL here: https://codereview.webrtc.org/2412883002)

This was an ill tested special case which turned out to be more problem
than benefit. The special case was only triggered when the decoder frame
size was smaller than 10 ms, which is more or less unsupported by NetEq.

Also fixed a bug in a test, a bug which was exposed by the code change.

BUG=chromium:654983, chromium:653656
==========

to

==========
NetEq: Remove special case for Merge without Expand

(This is a backport of revision 14627 (c9ec8758db79c6fe4de). Original
CL here: https://codereview.webrtc.org/2412883002)

This was an ill tested special case which turned out to be more problem
than benefit. The special case was only triggered when the decoder frame
size was smaller than 10 ms, which is more or less unsupported by NetEq.

Also fixed a bug in a test, a bug which was exposed by the code change.

BUG=chromium:654983, chromium:653656
R=ossu@webrtc.org

Committed:
https://chromium.googlesource.com/external/webrtc/+/c64c620c83176c6766d3e1505...
==========

[kwiberg-webrtc, 2016-10-25 12:10:12]

Committed patchset #1 (id:1) manually as
c64c620c83176c6766d3e150558bc866ebb7f7c5.

[hlundin-webrtc, 2016-10-27 10:52:02]

lgtm