Avoid toggling default receive streams in WebRtcVideoChannel2.

Avoid toggling default receive streams in WebRtcVideoChannel2.

This CL removes |default_recv_ssrc_| from DefaultUnsignalledSsrcHandler
and replaces it with calls to a new member function
WebRtcVideoChannel2::GetDefaultReceiveStreamSsrc. The latter checks
the |default_stream_| member on the
WebRtcVideoChannel2::WebRtcVideoReceiveStreams to know which stream
is the current default stream.

This change removes duplicate state and fixes an issue where
incoming unsignaled SSRCs would compete for being the default
receive stream.

BUG=webrtc:7725
Review-Url: https://codereview.webrtc.org/2906893002
Cr-Commit-Position: refs/heads/master@{#18314}
Committed: https://chromium.googlesource.com/external/webrtc/+/0dc57eabf6471084df5b9123eb1271636d8f99f3

[brandtr, 2017-05-26 14:31:43]

Description was changed from

==========
Avoid toggling default receive streams in WebRtcVideoChannel2.

This CL removes |default_recv_ssrc_| from DefaultUnsignalledSsrcHandler,
and replaces it with calls to a new member function
WebRtcVideoChannel2::GetDefaultReceiveStreamSsrc. The latter checks
the |default_stream_| member on the
WebRtcVideoChannel2::WebRtcVideoReceiveStreams to know which stream
is the current default stream.

This change removes duplicate state, and fixes an issue where
incoming unsignaled SSRCs would compete for being the default
receive stream.

BUG=b/38136441
==========

to

==========
Avoid toggling default receive streams in WebRtcVideoChannel2.

This CL removes |default_recv_ssrc_| from DefaultUnsignalledSsrcHandler
and replaces it with calls to a new member function
WebRtcVideoChannel2::GetDefaultReceiveStreamSsrc. The latter checks
the |default_stream_| member on the
WebRtcVideoChannel2::WebRtcVideoReceiveStreams to know which stream
is the current default stream.

This change removes duplicate state and fixes an issue where
incoming unsignaled SSRCs would compete for being the default
receive stream.

BUG=b/38136441
==========

[brandtr, 2017-05-26 14:36:23]

brandtr@webrtc.org changed reviewers:
+ deadbeef@webrtc.org

[brandtr, 2017-05-26 14:36:23]

Taylor, please have a look.

This CL fixes a toggling issue that was introduced in
https://codereview.webrtc.org/2692993009.

[sprang_webrtc, 2017-05-26 15:00:19]

sprang@webrtc.org changed reviewers:
+ sprang@webrtc.org

[sprang_webrtc, 2017-05-26 15:00:19]

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

https://codereview.webrtc.org/2906893002/diff/20001/webrtc/media/engine/webrt...
webrtc/media/engine/webrtcvideoengine2.cc:1546: ssrc =
rtc::Optional<uint32_t>(it->first);
nit: ssrc.emplace(it->first);

...any maybe break; ? Or do we feel it is important to iterate through them all
and verify we have only one default?

[Taylor Brandstetter, 2017-05-26 22:23:53]

lgtm; thanks for figuring this out. Can you create an open-source bug report
describing the problem, though?

[brandtr, 2017-05-29 13:56:26]

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

https://codereview.webrtc.org/2906893002/diff/20001/webrtc/media/engine/webrt...
webrtc/media/engine/webrtcvideoengine2.cc:1546: ssrc =
rtc::Optional<uint32_t>(it->first);
On 2017/05/26 15:00:19, sprang_webrtc wrote:
> nit: ssrc.emplace(it->first);
> 
> ...any maybe break; ? Or do we feel it is important to iterate through them
all
> and verify we have only one default?

Nah, it's probably fine. It's nicer to check this in a test, and that is
partially done by WebRtcVideoChannel2Test.ReceiveDifferentUnsignaledSsrc
already.

[sprang_webrtc, 2017-05-29 14:32:09]

lgtm

[brandtr, 2017-05-29 14:54:54]

Description was changed from

==========
Avoid toggling default receive streams in WebRtcVideoChannel2.

This CL removes |default_recv_ssrc_| from DefaultUnsignalledSsrcHandler
and replaces it with calls to a new member function
WebRtcVideoChannel2::GetDefaultReceiveStreamSsrc. The latter checks
the |default_stream_| member on the
WebRtcVideoChannel2::WebRtcVideoReceiveStreams to know which stream
is the current default stream.

This change removes duplicate state and fixes an issue where
incoming unsignaled SSRCs would compete for being the default
receive stream.

BUG=b/38136441
==========

to

==========
Avoid toggling default receive streams in WebRtcVideoChannel2.

This CL removes |default_recv_ssrc_| from DefaultUnsignalledSsrcHandler
and replaces it with calls to a new member function
WebRtcVideoChannel2::GetDefaultReceiveStreamSsrc. The latter checks
the |default_stream_| member on the
WebRtcVideoChannel2::WebRtcVideoReceiveStreams to know which stream
is the current default stream.

This change removes duplicate state and fixes an issue where
incoming unsignaled SSRCs would compete for being the default
receive stream.

BUG=webrtc:7725
==========

[brandtr, 2017-05-29 14:55:08]

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

[commit-bot: I haz the power, 2017-05-29 14:55:17]

Dry run: 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-05-29 15:35:37]

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

[commit-bot: I haz the power, 2017-05-29 15:35:38]

Dry run: This issue passed the CQ dry run.

[brandtr, 2017-05-30 06:31:24]

The CQ bit was checked by brandtr@webrtc.org

[brandtr, 2017-05-30 06:31:24]

The patchset sent to the CQ was uploaded after l-g-t-m from deadbeef@webrtc.org
Link to the patchset: https://codereview.webrtc.org/2906893002/#ps40001 (title:
"sprang comments 1.")

[commit-bot: I haz the power, 2017-05-30 06:31: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-05-30 06:33:31]

CQ is committing da patch.

Bot data: {"patchset_id": 40001, "attempt_start_ts": 1496125884006180,
"parent_rev": "3d055b92c32f2fa89093932a6297da2fc685a04b", "commit_rev":
"0dc57eabf6471084df5b9123eb1271636d8f99f3"}

[commit-bot: I haz the power, 2017-05-30 06:33:39]

Description was changed from

==========
Avoid toggling default receive streams in WebRtcVideoChannel2.

This CL removes |default_recv_ssrc_| from DefaultUnsignalledSsrcHandler
and replaces it with calls to a new member function
WebRtcVideoChannel2::GetDefaultReceiveStreamSsrc. The latter checks
the |default_stream_| member on the
WebRtcVideoChannel2::WebRtcVideoReceiveStreams to know which stream
is the current default stream.

This change removes duplicate state and fixes an issue where
incoming unsignaled SSRCs would compete for being the default
receive stream.

BUG=webrtc:7725
==========

to

==========
Avoid toggling default receive streams in WebRtcVideoChannel2.

This CL removes |default_recv_ssrc_| from DefaultUnsignalledSsrcHandler
and replaces it with calls to a new member function
WebRtcVideoChannel2::GetDefaultReceiveStreamSsrc. The latter checks
the |default_stream_| member on the
WebRtcVideoChannel2::WebRtcVideoReceiveStreams to know which stream
is the current default stream.

This change removes duplicate state and fixes an issue where
incoming unsignaled SSRCs would compete for being the default
receive stream.

BUG=webrtc:7725

Review-Url: https://codereview.webrtc.org/2906893002
Cr-Commit-Position: refs/heads/master@{#18314}
Committed:
https://chromium.googlesource.com/external/webrtc/+/0dc57eabf6471084df5b9123e...
==========

[commit-bot: I haz the power, 2017-05-30 06:33:39]

Committed patchset #3 (id:40001) as
https://chromium.googlesource.com/external/webrtc/+/0dc57eabf6471084df5b9123e...