NetEq: Remove special case for Merge without Expand

NetEq: Remove special case for Merge without Expand

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
Committed: https://crrev.com/c9ec8758db79c6fe4dee42d785f681931ddd7911
Cr-Commit-Position: refs/heads/master@{#14627}

[hlundin-webrtc, 2016-10-12 13:46:37]

Description was changed from

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

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=chrome:654983
==========

to

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

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
==========

[hlundin-webrtc, 2016-10-12 13:49:38]

henrik.lundin@webrtc.org changed reviewers:
+ minyue@webrtc.org

[hlundin-webrtc, 2016-10-12 13:49:38]

PTAL

[minyue-webrtc, 2016-10-13 08:13:19]

lgtm

[hlundin-webrtc, 2016-10-13 08:40:54]

The CQ bit was checked by henrik.lundin@webrtc.org

[commit-bot: I haz the power, 2016-10-13 08:41:00]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.webrtc.org/...

[commit-bot: I haz the power, 2016-10-13 08:49:49]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-10-13 08:49:50]

Try jobs failed on following builders:
  win_x64_clang_dbg on master.tryserver.webrtc (JOB_FAILED,
http://build.chromium.org/p/tryserver.webrtc/builders/win_x64_clang_dbg/build...)

[hlundin-webrtc, 2016-10-13 09:35:13]

The CQ bit was checked by henrik.lundin@webrtc.org

[commit-bot: I haz the power, 2016-10-13 09:35:19]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.webrtc.org/...

[commit-bot: I haz the power, 2016-10-13 09:43:36]

Description was changed from

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

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
==========

to

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

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
==========

[commit-bot: I haz the power, 2016-10-13 09:43:37]

Committed patchset #1 (id:1)

[commit-bot: I haz the power, 2016-10-13 09:43:46]

Description was changed from

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

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
==========

to

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

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

Committed: https://crrev.com/c9ec8758db79c6fe4dee42d785f681931ddd7911
Cr-Commit-Position: refs/heads/master@{#14627}
==========

[commit-bot: I haz the power, 2016-10-13 09:43:47]

Patchset 1 (id:??) landed as
https://crrev.com/c9ec8758db79c6fe4dee42d785f681931ddd7911
Cr-Commit-Position: refs/heads/master@{#14627}