Move suspend_below_min_bitrate from VideoOptions to MediaConfig.

Move suspend_below_min_bitrate from VideoOptions to MediaConfig.

Rename SetCodecAndOptions to SetCodec, it no longer sets or uses the
VideoOptions. In MediaConfig, collect the video-related flags into a
struct.

As a followup, it should be possible to delete VideoOptions from
VideoSendParameters and VideoSendStreamParameters.

TBR=pthatcher@webrtc.org
BUG=webrtc:5426
Committed: https://crrev.com/0db023a70bd419e4a43317b6c9b0ecfa5184489e
Cr-Commit-Position: refs/heads/master@{#11828}

[nisse-webrtc, 2016-02-29 11:05:20]

nisse@webrtc.org changed reviewers:
+ pbos@webrtc.org, pthatcher@webrtc.org

[nisse-webrtc, 2016-02-29 11:05:21]

Please have a look. This makes it easier to do the pending is_screencast change
(https://codereview.webrtc.org/1711763003/).

[pbos-webrtc, 2016-02-29 13:20:31]

lgtm

https://codereview.webrtc.org/1745003002/diff/1/webrtc/api/peerconnectioninte...
File webrtc/api/peerconnectioninterface_unittest.cc (right):

https://codereview.webrtc.org/1745003002/diff/1/webrtc/api/peerconnectioninte...
webrtc/api/peerconnectioninterface_unittest.cc:2431: // This test verifies the
suspend below min bitrate constraint is
Verify false/default values as well.

https://codereview.webrtc.org/1745003002/diff/1/webrtc/media/engine/webrtcvid...
File webrtc/media/engine/webrtcvideoengine2.cc (right):

https://codereview.webrtc.org/1745003002/diff/1/webrtc/media/engine/webrtcvid...
webrtc/media/engine/webrtcvideoengine2.cc:1652: parameters_.options = options;
SetAll?

https://codereview.webrtc.org/1745003002/diff/1/webrtc/media/engine/webrtcvid...
webrtc/media/engine/webrtcvideoengine2.cc:1782:
parameters_.options.SetAll(*params.options);
Should this run SetOptions instead?

https://codereview.webrtc.org/1745003002/diff/1/webrtc/media/engine/webrtcvid...
webrtc/media/engine/webrtcvideoengine2.cc:1789: // TODO(nisse): Not needed?
Looks like it, setting options should not cause a configure.

https://codereview.webrtc.org/1745003002/diff/1/webrtc/media/engine/webrtcvid...
File webrtc/media/engine/webrtcvideoengine2_unittest.cc (right):

https://codereview.webrtc.org/1745003002/diff/1/webrtc/media/engine/webrtcvid...
webrtc/media/engine/webrtcvideoengine2_unittest.cc:1557:
TEST_F(WebRtcVideoChannel2Test, SetOptionsWithSuspendBelowMinBitrate) {
Rename test to ConfigureSuspendBelowMinBitrate, maybe.

[nisse-webrtc, 2016-02-29 15:01:07]

Please review the new (simpler) SetSendParameters logic.

Had to update some tests, since now new options don't take any effect until the
next frame.

https://codereview.webrtc.org/1745003002/diff/1/webrtc/api/peerconnectioninte...
File webrtc/api/peerconnectioninterface_unittest.cc (right):

https://codereview.webrtc.org/1745003002/diff/1/webrtc/api/peerconnectioninte...
webrtc/api/peerconnectioninterface_unittest.cc:2431: // This test verifies the
suspend below min bitrate constraint is
On 2016/02/29 13:20:31, pbos-webrtc wrote:
> Verify false/default values as well.

There's a TestDefaults testcase above.

https://codereview.webrtc.org/1745003002/diff/1/webrtc/media/engine/webrtcvid...
File webrtc/media/engine/webrtcvideoengine2.cc (right):

https://codereview.webrtc.org/1745003002/diff/1/webrtc/media/engine/webrtcvid...
webrtc/media/engine/webrtcvideoengine2.cc:1652: parameters_.options = options;
On 2016/02/29 13:20:31, pbos-webrtc wrote:
> SetAll?

Done.

https://codereview.webrtc.org/1745003002/diff/1/webrtc/media/engine/webrtcvid...
webrtc/media/engine/webrtcvideoengine2.cc:1782:
parameters_.options.SetAll(*params.options);
On 2016/02/29 13:20:31, pbos-webrtc wrote:
> Should this run SetOptions instead?

Done. Critical sections correspond to PTHREAD_MUTEX_RECURSIVE, right?

https://codereview.webrtc.org/1745003002/diff/1/webrtc/media/engine/webrtcvid...
webrtc/media/engine/webrtcvideoengine2.cc:1789: // TODO(nisse): Not needed?
On 2016/02/29 13:20:31, pbos-webrtc wrote:
> Looks like it, setting options should not cause a configure.

Then this if branch goes away, the SetOptions call above suffices. And it should
be deleted too once we drop VideoOptinos from VideoSendParameters.

https://codereview.webrtc.org/1745003002/diff/1/webrtc/media/engine/webrtcvid...
File webrtc/media/engine/webrtcvideoengine2_unittest.cc (right):

https://codereview.webrtc.org/1745003002/diff/1/webrtc/media/engine/webrtcvid...
webrtc/media/engine/webrtcvideoengine2_unittest.cc:1557:
TEST_F(WebRtcVideoChannel2Test, SetOptionsWithSuspendBelowMinBitrate) {
On 2016/02/29 13:20:31, pbos-webrtc wrote:
> Rename test to ConfigureSuspendBelowMinBitrate, maybe.

Renamed to SetMediaConfigSuspendBelowMinBitrate.

[pbos-webrtc, 2016-02-29 15:13:14]

lgtm

https://codereview.webrtc.org/1745003002/diff/20001/webrtc/media/engine/webrt...
File webrtc/media/engine/webrtcvideoengine2_unittest.cc (right):

https://codereview.webrtc.org/1745003002/diff/20001/webrtc/media/engine/webrt...
webrtc/media/engine/webrtcvideoengine2_unittest.cc:1019: FakeVideoSendStream*
SetDenoisingOption(
TriggerDenoisingOption imo.

[nisse-webrtc, 2016-03-01 09:23:57]

Description was changed from

==========
Move suspend_below_min_bitrate from VideoOptions to MediaConfig.

Rename SetCodecAndOptions to SetCodec, it no longer sets or uses the
VideoOptions. In MediaConfig, collect the video-related flags into a
struct.

As a followup, it should be possible to delete VideoOptions from
VideoSendParameters and VideoSendStreamParameters.

BUG=webrtc:5426
==========

to

==========
Move suspend_below_min_bitrate from VideoOptions to MediaConfig.

Rename SetCodecAndOptions to SetCodec, it no longer sets or uses the
VideoOptions. In MediaConfig, collect the video-related flags into a
struct.

As a followup, it should be possible to delete VideoOptions from
VideoSendParameters and VideoSendStreamParameters.

TBR=pthatcher@webrtc.org
BUG=webrtc:5426
==========

[nisse-webrtc, 2016-03-01 09:24:09]

The CQ bit was checked by nisse@webrtc.org

[nisse-webrtc, 2016-03-01 09:24:10]

The patchset sent to the CQ was uploaded after l-g-t-m from pbos@webrtc.org
Link to the patchset: https://codereview.webrtc.org/1745003002/#ps40001 (title:
"Rebase.")

[commit-bot: I haz the power, 2016-03-01 09:24:16]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1745003002/40001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1745003002/40001

[commit-bot: I haz the power, 2016-03-01 11:24:47]

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

[commit-bot: I haz the power, 2016-03-01 11:24:48]

Try jobs failed on following builders:
  android_arm64_rel on tryserver.webrtc (JOB_TIMED_OUT, no build URL)
  linux_baremetal on tryserver.webrtc (JOB_TIMED_OUT, no build URL)
  win_baremetal on tryserver.webrtc (JOB_TIMED_OUT, no build URL)

[nisse-webrtc, 2016-03-01 11:26:19]

The CQ bit was checked by nisse@webrtc.org

[commit-bot: I haz the power, 2016-03-01 11:26:27]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1745003002/40001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1745003002/40001

[commit-bot: I haz the power, 2016-03-01 12:30:05]

Description was changed from

==========
Move suspend_below_min_bitrate from VideoOptions to MediaConfig.

Rename SetCodecAndOptions to SetCodec, it no longer sets or uses the
VideoOptions. In MediaConfig, collect the video-related flags into a
struct.

As a followup, it should be possible to delete VideoOptions from
VideoSendParameters and VideoSendStreamParameters.

TBR=pthatcher@webrtc.org
BUG=webrtc:5426
==========

to

==========
Move suspend_below_min_bitrate from VideoOptions to MediaConfig.

Rename SetCodecAndOptions to SetCodec, it no longer sets or uses the
VideoOptions. In MediaConfig, collect the video-related flags into a
struct.

As a followup, it should be possible to delete VideoOptions from
VideoSendParameters and VideoSendStreamParameters.

TBR=pthatcher@webrtc.org
BUG=webrtc:5426
==========

[commit-bot: I haz the power, 2016-03-01 12:30:06]

Committed patchset #3 (id:40001)

[commit-bot: I haz the power, 2016-03-01 12:30:17]

Description was changed from

==========
Move suspend_below_min_bitrate from VideoOptions to MediaConfig.

Rename SetCodecAndOptions to SetCodec, it no longer sets or uses the
VideoOptions. In MediaConfig, collect the video-related flags into a
struct.

As a followup, it should be possible to delete VideoOptions from
VideoSendParameters and VideoSendStreamParameters.

TBR=pthatcher@webrtc.org
BUG=webrtc:5426
==========

to

==========
Move suspend_below_min_bitrate from VideoOptions to MediaConfig.

Rename SetCodecAndOptions to SetCodec, it no longer sets or uses the
VideoOptions. In MediaConfig, collect the video-related flags into a
struct.

As a followup, it should be possible to delete VideoOptions from
VideoSendParameters and VideoSendStreamParameters.

TBR=pthatcher@webrtc.org
BUG=webrtc:5426

Committed: https://crrev.com/0db023a70bd419e4a43317b6c9b0ecfa5184489e
Cr-Commit-Position: refs/heads/master@{#11828}
==========

[commit-bot: I haz the power, 2016-03-01 12:30:18]

Patchset 3 (id:??) landed as
https://crrev.com/0db023a70bd419e4a43317b6c9b0ecfa5184489e
Cr-Commit-Position: refs/heads/master@{#11828}