If MSID is encoded in both ways, make the SSRC-level one take priority.

If MSID is encoded in both ways, make the SSRC-level one take priority.

BUG=webrtc:5264
R=pthatcher@webrtc.org

Committed: https://crrev.com/5de6b753bdbdb572807cf2ec9d3923f471b8f950
Cr-Commit-Position: refs/heads/master@{#11933}

[Taylor Brandstetter, 2016-03-03 21:05:10]

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

[pthatcher1, 2016-03-05 01:30:15]

Should we have unit tests?

https://codereview.webrtc.org/1762003003/diff/1/webrtc/api/webrtcsdp.cc
File webrtc/api/webrtcsdp.cc (right):

https://codereview.webrtc.org/1762003003/diff/1/webrtc/api/webrtcsdp.cc#newco...
webrtc/api/webrtcsdp.cc:576: const std::string &msid_track_id,
Put the & on char before, please.

[Taylor Brandstetter, 2016-03-08 02:23:21]

Unit test added.

https://codereview.webrtc.org/1762003003/diff/1/webrtc/api/webrtcsdp.cc
File webrtc/api/webrtcsdp.cc (right):

https://codereview.webrtc.org/1762003003/diff/1/webrtc/api/webrtcsdp.cc#newco...
webrtc/api/webrtcsdp.cc:576: const std::string &msid_track_id,
On 2016/03/05 01:30:15, pthatcher1 wrote:
> Put the & on char before, please.

Done. Some old habits die hard. :)

[pthatcher1, 2016-03-08 17:51:35]

lgtm

[Taylor Brandstetter, 2016-03-09 22:12:09]

The CQ bit was checked by deadbeef@webrtc.org

[commit-bot: I haz the power, 2016-03-09 22:12:15]

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

[commit-bot: I haz the power, 2016-03-09 23:10:04]

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

[commit-bot: I haz the power, 2016-03-09 23:10:04]

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

[Taylor Brandstetter, 2016-03-10 01:02:43]

Description was changed from

==========
If MSID is encoded in both ways, make the SSRC-level one take priority.

BUG=webrtc:5264
==========

to

==========
If MSID is encoded in both ways, make the SSRC-level one take priority.

BUG=webrtc:5264
R=pthatcher@webrtc.org

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

[Taylor Brandstetter, 2016-03-10 01:02:45]

Committed patchset #2 (id:20001) manually as
5de6b753bdbdb572807cf2ec9d3923f471b8f950 (presubmit successful).

[commit-bot: I haz the power, 2016-03-10 01:02:48]

Description was changed from

==========
If MSID is encoded in both ways, make the SSRC-level one take priority.

BUG=webrtc:5264
R=pthatcher@webrtc.org

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

to

==========
If MSID is encoded in both ways, make the SSRC-level one take priority.

BUG=webrtc:5264
R=pthatcher@webrtc.org

Committed: https://crrev.com/5de6b753bdbdb572807cf2ec9d3923f471b8f950
Cr-Commit-Position: refs/heads/master@{#11933}
==========

[commit-bot: I haz the power, 2016-03-10 01:02:48]

Patchset 2 (id:??) landed as
https://crrev.com/5de6b753bdbdb572807cf2ec9d3923f471b8f950
Cr-Commit-Position: refs/heads/master@{#11933}

[perkj_webrtc, 2016-03-10 14:29:43]

On 2016/03/10 01:02:48, commit-bot: I haz the power wrote:
> Patchset 2 (id:??) landed as
> https://crrev.com/5de6b753bdbdb572807cf2ec9d3923f471b8f950
> Cr-Commit-Position: refs/heads/master@{#11933}

wrong bug number?

[Taylor Brandstetter, 2016-03-10 17:23:25]

On 2016/03/10 14:29:43, perkj_webrtc wrote:
> On 2016/03/10 01:02:48, commit-bot: I haz the power wrote:
> > Patchset 2 (id:??) landed as
> > https://crrev.com/5de6b753bdbdb572807cf2ec9d3923f471b8f950
> > Cr-Commit-Position: refs/heads/master@{#11933}
> 
> wrong bug number?

Yep, sorry. Should have been 5624.