Fixed a couple of build-flag dependent tests of webrtcvoiceengine.

Fixed a couple of build-flag dependent tests of webrtcvoiceengine.

The codecs expected by HasCorrectCodecs now depends which codecs were
enabled by build flags.

SendSideBweWithOverheadTest.MinAndMaxBitrate now expects different
values for min bitrate depending on if we support 120 ms frames for
Opus.

BUG=b/35415435

Review-Url: https://codereview.webrtc.org/2691343008
Cr-Commit-Position: refs/heads/master@{#16643}
Committed: https://chromium.googlesource.com/external/webrtc/+/11bfc53cd9a82f73ecbee2232b87acbb1e83fa4c

[ossu, 2017-02-16 11:15:01]

The CQ bit was checked by ossu@webrtc.org to run a CQ dry run

[commit-bot: I haz the power, 2017-02-16 11:15:07]

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

[ossu, 2017-02-16 11:18:58]

ossu@webrtc.org changed reviewers:
+ kwiberg@webrtc.org, minyue@webrtc.org

[ossu, 2017-02-16 11:18:59]

Hi,

minyue@ PTAL at the change to the BWE with overhead test. It used to fail if
Opus was compiled with 120 ms frame support.

kwiberg@ the rest of the changes are essentially trivial.

[commit-bot: I haz the power, 2017-02-16 11:19:36]

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

[commit-bot: I haz the power, 2017-02-16 11:19:37]

Dry run: Try jobs failed on following builders:
  presubmit on master.tryserver.webrtc (JOB_FAILED,
http://build.chromium.org/p/tryserver.webrtc/builders/presubmit/builds/13548)

[minyue-webrtc, 2017-02-16 11:56:34]

lgtm

good catch!

[kwiberg-webrtc, 2017-02-16 12:07:03]

lgtm, but see comment

https://codereview.webrtc.org/2691343008/diff/1/webrtc/media/engine/webrtcvoi...
File webrtc/media/engine/webrtcvoiceengine_unittest.cc (right):

https://codereview.webrtc.org/2691343008/diff/1/webrtc/media/engine/webrtcvoi...
webrtc/media/engine/webrtcvoiceengine_unittest.cc:2575: #endif
Or

  constexpr int kMinOverheadBps = kOverheadPerPacket * 8 * 1000 /
      (WEBRTC_OPUS_SUPPORT_120MS_PTIME ? 120 : 60);

In fact, given that you use that subexpression once more below, why not

  constexpr int opus_max_ptime_ms = WEBRTC_OPUS_SUPPORT_120MS_PTIME ? 120 : 60;
  constexpr int kMinOverheadBps = kOverheadPerPacket * 8 * 1000 /
opus_max_ptime_ms;

[ossu, 2017-02-16 12:19:32]

https://codereview.webrtc.org/2691343008/diff/1/webrtc/media/engine/webrtcvoi...
File webrtc/media/engine/webrtcvoiceengine_unittest.cc (right):

https://codereview.webrtc.org/2691343008/diff/1/webrtc/media/engine/webrtcvoi...
webrtc/media/engine/webrtcvoiceengine_unittest.cc:2575: #endif
On 2017/02/16 12:07:03, kwiberg-webrtc wrote:
> Or
> 
>   constexpr int kMinOverheadBps = kOverheadPerPacket * 8 * 1000 /
>       (WEBRTC_OPUS_SUPPORT_120MS_PTIME ? 120 : 60);
> 
> In fact, given that you use that subexpression once more below, why not
> 
>   constexpr int opus_max_ptime_ms = WEBRTC_OPUS_SUPPORT_120MS_PTIME ? 120 :
60;
>   constexpr int kMinOverheadBps = kOverheadPerPacket * 8 * 1000 /
> opus_max_ptime_ms;

Alright, that also matches the implementation. Will fix.

[ossu, 2017-02-16 12:29:51]

The CQ bit was checked by ossu@webrtc.org

[ossu, 2017-02-16 12:29:51]

The patchset sent to the CQ was uploaded after l-g-t-m from kwiberg@webrtc.org,
minyue@webrtc.org
Link to the patchset: https://codereview.webrtc.org/2691343008/#ps20001 (title:
"Cleaned up Opus min overhead calculations.")

[commit-bot: I haz the power, 2017-02-16 12:29:53]

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, 2017-02-16 12:33:51]

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

[commit-bot: I haz the power, 2017-02-16 12:33:53]

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

[ossu, 2017-02-16 12:41:08]

Description was changed from

==========
Fixed a couple of build-flag dependent tests of webrtcvoiceengine.

The codecs expected by HasCorrectCodecs now depends which codecs were
enabled by build flags.

SendSideBweWithOverheadTest.MinAndMaxBitrate now expects different
values for min bitrate depending on if we support 120 ms frames for
Opus.

BUG=
==========

to

==========
Fixed a couple of build-flag dependent tests of webrtcvoiceengine.

The codecs expected by HasCorrectCodecs now depends which codecs were
enabled by build flags.

SendSideBweWithOverheadTest.MinAndMaxBitrate now expects different
values for min bitrate depending on if we support 120 ms frames for
Opus.

BUG=b/35415435
==========

[ossu, 2017-02-16 12:41:32]

The CQ bit was checked by ossu@webrtc.org

[commit-bot: I haz the power, 2017-02-16 12:41:43]

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, 2017-02-16 13:37:07]

CQ is committing da patch.

Bot data: {"patchset_id": 20001, "attempt_start_ts": 1487248892455290,
"parent_rev": "a51d4f34d950b4f31bb0db19cbbb936620e334ab", "commit_rev":
"11bfc53cd9a82f73ecbee2232b87acbb1e83fa4c"}

[commit-bot: I haz the power, 2017-02-16 13:37:10]

Description was changed from

==========
Fixed a couple of build-flag dependent tests of webrtcvoiceengine.

The codecs expected by HasCorrectCodecs now depends which codecs were
enabled by build flags.

SendSideBweWithOverheadTest.MinAndMaxBitrate now expects different
values for min bitrate depending on if we support 120 ms frames for
Opus.

BUG=b/35415435
==========

to

==========
Fixed a couple of build-flag dependent tests of webrtcvoiceengine.

The codecs expected by HasCorrectCodecs now depends which codecs were
enabled by build flags.

SendSideBweWithOverheadTest.MinAndMaxBitrate now expects different
values for min bitrate depending on if we support 120 ms frames for
Opus.

BUG=b/35415435

Review-Url: https://codereview.webrtc.org/2691343008
Cr-Commit-Position: refs/heads/master@{#16643}
Committed:
https://chromium.googlesource.com/external/webrtc/+/11bfc53cd9a82f73ecbee2232...
==========

[commit-bot: I haz the power, 2017-02-16 13:37:11]

Committed patchset #2 (id:20001) as
https://chromium.googlesource.com/external/webrtc/+/11bfc53cd9a82f73ecbee2232...