WebRtcMediaStreamAdapter using WebRtcMediaStreamTrackMap.

WebRtcMediaStreamAdapter using WebRtcMediaStreamTrackMap.

Make the WebRtcMediaStreamAdapter, which represent local streams,
use the WebRtcMediaStreamTrackMap and AdapterRef classes for the
handling of initializing, getting and uninitializing local tracks.

WebRtcMediaStreamTrackAdapter is updated to allow local tracks from
non-local sources (removed DCHECKs) which happens when redirecting
remote sources as local streams.

This is one step closer to decoupling streams and tracks.

The same thing will be done in a follow-up CL for the remote streams
case, RemoteMediaStreamImpl.

BUG=705901, 700916
Review-Url: https://codereview.chromium.org/2897603004
Cr-Commit-Position: refs/heads/master@{#478592}
Committed: https://chromium.googlesource.com/chromium/src/+/49effc1da26d29e677a79f49cf20ca85be501ee4

[hbos_chromium, 2017-05-19 14:27:44]

The CQ bit was checked by hbos@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2017-05-19 14:28:12]

Dry run: CQ is trying da patch.

Follow status at:
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[hbos_chromium, 2017-05-19 14:48:08]

hbos@chromium.org changed reviewers:
+ guidou@chromium.org

[hbos_chromium, 2017-05-19 14:48:08]

PTAL guidou

[commit-bot: I haz the power, 2017-05-19 15:04:49]

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

[commit-bot: I haz the power, 2017-05-19 15:04:50]

Dry run: Try jobs failed on following builders:
  linux_chromium_tsan_rel_ng on master.tryserver.chromium.linux (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium_...)

[hbos_chromium, 2017-05-22 08:20:34]

On 2017/05/19 14:48:08, hbos_chromium wrote:
> PTAL guidou

Ah this one is not ready yet, need to pass failing tests.

[hbos_chromium, 2017-05-22 09:41:51]

The CQ bit was checked by hbos@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2017-05-22 09:42:06]

Dry run: CQ is trying da patch.

Follow status at:
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2017-05-22 11:23:12]

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

[commit-bot: I haz the power, 2017-05-22 11:23:12]

Dry run: This issue passed the CQ dry run.

[hbos_chromium, 2017-05-22 12:18:29]

Now they're all green. PTAL guidou.

[hbos_chromium, 2017-05-29 13:54:14]

The CQ bit was checked by hbos@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2017-05-29 13:54:30]

Dry run: CQ is trying da patch.

Follow status at:
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[hbos_chromium, 2017-05-29 13:56:15]

Patchset #4 (id:60001) has been deleted

[hbos_chromium, 2017-05-29 13:57:44]

The CQ bit was checked by hbos@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2017-05-29 13:57:52]

Dry run: CQ is trying da patch.

Follow status at:
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2017-05-29 14:26:11]

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

[commit-bot: I haz the power, 2017-05-29 14:26:12]

Dry run: Try jobs failed on following builders:
  mac_chromium_rel_ng on master.tryserver.chromium.mac (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.mac/builders/mac_chromium_rel_...)

[Guido Urdaneta, 2017-05-30 09:20:12]

On 2017/05/22 12:18:29, hbos_chromium wrote:
> Now they're all green. PTAL guidou.

I'll take a look, but I see some of the bots are red.

[hbos_chromium, 2017-06-02 10:15:13]

Patchset #5 (id:100001) has been deleted

[hbos_chromium, 2017-06-02 10:18:25]

The CQ bit was checked by hbos@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2017-06-02 10:18:41]

Dry run: CQ is trying da patch.

Follow status at:
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[hbos_chromium, 2017-06-02 10:20:18]

Description was changed from

==========
WebRtcMediaStreamAdapter using WebRtcMediaStreamTrackCollection.

Make the WebRtcMediaStreamAdapter, which represent local streams,
use the WebRtcMediaStreamTrackCollection and
WebRtcMediaStreamTrackAdapter classes for the handling of
initializing, getting and uninitializing local tracks.

This is one step closer to decoupling streams and tracks.

The same thing will be done in a follow-up CL for the remote streams
case, RemoteMediaStreamImpl.

BUG=705901, 700916
==========

to

==========
WebRtcMediaStreamAdapter using WebRtcMediaStreamTrackMap.

Make the WebRtcMediaStreamAdapter, which represent local streams,
use the WebRtcMediaStreamTrackMap and AdapterRef classes for the
handling of initializing, getting and uninitializing local tracks.

WebRtcMediaStreamTrackAdapter is updated to allow local tracks from
non-local sources (removed DCHECKs) which happens when redirecting
remote sources as local streams.

This is one step closer to decoupling streams and tracks.

The same thing will be done in a follow-up CL for the remote streams
case, RemoteMediaStreamImpl.

BUG=705901, 700916
==========

[hbos_chromium, 2017-06-02 10:43:08]

The CQ bit was checked by hbos@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2017-06-02 10:43:45]

Dry run: CQ is trying da patch.

Follow status at:
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[hbos_chromium, 2017-06-02 11:04:36]

Patchset #5 (id:120001) has been deleted

[hbos_chromium, 2017-06-02 11:08:45]

PTAL guidou, rebased and using AdapterRef in local streams.

[commit-bot: I haz the power, 2017-06-02 12:41:51]

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

[commit-bot: I haz the power, 2017-06-02 12:41:52]

Dry run: Try jobs failed on following builders:
  linux_android_rel_ng on master.tryserver.chromium.android (JOB_FAILED,
https://build.chromium.org/p/tryserver.chromium.android/builders/linux_androi...)

[hbos_chromium, 2017-06-05 11:59:09]

The CQ bit was checked by hbos@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2017-06-05 11:59:21]

Dry run: CQ is trying da patch.

Follow status at:
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2017-06-05 12:29:40]

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

[commit-bot: I haz the power, 2017-06-05 12:29:41]

Dry run: Try jobs failed on following builders:
  cast_shell_android on master.tryserver.chromium.android (JOB_FAILED,
https://build.chromium.org/p/tryserver.chromium.android/builders/cast_shell_a...)

[hbos_chromium, 2017-06-08 09:53:25]

The CQ bit was checked by hbos@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2017-06-08 09:53:46]

Dry run: CQ is trying da patch.

Follow status at:
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2017-06-08 11:02:33]

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

[commit-bot: I haz the power, 2017-06-08 11:02:33]

Dry run: This issue passed the CQ dry run.

[Guido Urdaneta, 2017-06-08 13:54:35]

https://codereview.chromium.org/2897603004/diff/180001/content/renderer/media...
File content/renderer/media/rtc_peer_connection_handler.h (right):

https://codereview.chromium.org/2897603004/diff/180001/content/renderer/media...
content/renderer/media/rtc_peer_connection_handler.h:264:
scoped_refptr<WebRtcMediaStreamTrackAdapterMap> track_adapter_map_;
document the field.

https://codereview.chromium.org/2897603004/diff/180001/content/renderer/media...
content/renderer/media/rtc_peer_connection_handler.h:265:
std::vector<std::unique_ptr<WebRtcMediaStreamAdapter>> local_streams_;
It would be good to document this field as well since it's the main subject of
this CL.

https://codereview.chromium.org/2897603004/diff/180001/content/renderer/media...
File content/renderer/media/webrtc/webrtc_media_stream_adapter.cc (right):

https://codereview.chromium.org/2897603004/diff/180001/content/renderer/media...
content/renderer/media/webrtc/webrtc_media_stream_adapter.cc:24:
web_stream_(web_stream) {
initialization in order different from field declaration order. actual
initialization will be in field declaration order. Please make them match.

https://codereview.chromium.org/2897603004/diff/180001/content/renderer/media...
File content/renderer/media/webrtc/webrtc_media_stream_adapter.h (right):

https://codereview.chromium.org/2897603004/diff/180001/content/renderer/media...
content/renderer/media/webrtc/webrtc_media_stream_adapter.h:61:
scoped_refptr<WebRtcMediaStreamTrackAdapterMap> track_adapter_map_;
document this field

https://codereview.chromium.org/2897603004/diff/180001/content/renderer/media...
content/renderer/media/webrtc/webrtc_media_stream_adapter.h:67:
std::map<std::string,
document what this map is. In particular, document what the first string is and
make sure that, after documenting everything, it is clear why this map is
different from |track_adapter_map_|

https://codereview.chromium.org/2897603004/diff/180001/content/renderer/media...
File content/renderer/media/webrtc/webrtc_media_stream_track_adapter.cc (left):

https://codereview.chromium.org/2897603004/diff/180001/content/renderer/media...
content/renderer/media/webrtc/webrtc_media_stream_track_adapter.cc:21:
DCHECK(!web_track.Source().Remote());
Are the changes to this file a drive-by improvement?

[hbos_chromium, 2017-06-08 14:34:44]

PTAL guidou.

https://codereview.chromium.org/2897603004/diff/180001/content/renderer/media...
File content/renderer/media/rtc_peer_connection_handler.h (right):

https://codereview.chromium.org/2897603004/diff/180001/content/renderer/media...
content/renderer/media/rtc_peer_connection_handler.h:264:
scoped_refptr<WebRtcMediaStreamTrackAdapterMap> track_adapter_map_;
On 2017/06/08 13:54:35, Guido Urdaneta wrote:
> document the field.

Done.

https://codereview.chromium.org/2897603004/diff/180001/content/renderer/media...
content/renderer/media/rtc_peer_connection_handler.h:265:
std::vector<std::unique_ptr<WebRtcMediaStreamAdapter>> local_streams_;
On 2017/06/08 13:54:35, Guido Urdaneta wrote:
> It would be good to document this field as well since it's the main subject of
> this CL.

Done.

https://codereview.chromium.org/2897603004/diff/180001/content/renderer/media...
File content/renderer/media/webrtc/webrtc_media_stream_adapter.cc (right):

https://codereview.chromium.org/2897603004/diff/180001/content/renderer/media...
content/renderer/media/webrtc/webrtc_media_stream_adapter.cc:24:
web_stream_(web_stream) {
On 2017/06/08 13:54:35, Guido Urdaneta wrote:
> initialization in order different from field declaration order. actual
> initialization will be in field declaration order. Please make them match.

It's in the same order.

https://codereview.chromium.org/2897603004/diff/180001/content/renderer/media...
File content/renderer/media/webrtc/webrtc_media_stream_adapter.h (right):

https://codereview.chromium.org/2897603004/diff/180001/content/renderer/media...
content/renderer/media/webrtc/webrtc_media_stream_adapter.h:61:
scoped_refptr<WebRtcMediaStreamTrackAdapterMap> track_adapter_map_;
On 2017/06/08 13:54:35, Guido Urdaneta wrote:
> document this field

Done.

https://codereview.chromium.org/2897603004/diff/180001/content/renderer/media...
content/renderer/media/webrtc/webrtc_media_stream_adapter.h:67:
std::map<std::string,
On 2017/06/08 13:54:35, Guido Urdaneta wrote:
> document what this map is. In particular, document what the first string is
and
> make sure that, after documenting everything, it is clear why this map is
> different from |track_adapter_map_|

Done.

https://codereview.chromium.org/2897603004/diff/180001/content/renderer/media...
File content/renderer/media/webrtc/webrtc_media_stream_track_adapter.cc (left):

https://codereview.chromium.org/2897603004/diff/180001/content/renderer/media...
content/renderer/media/webrtc/webrtc_media_stream_track_adapter.cc:21:
DCHECK(!web_track.Source().Remote());
On 2017/06/08 13:54:35, Guido Urdaneta wrote:
> Are the changes to this file a drive-by improvement?

No, a local track may in fact have a remote source. What makes a track "local"
is that it belongs to a local stream and may be sent, not whether or not its
source is "local".

I updated the code in this file to get rid of that assumption or else a
forwarding track test would hit one of the DCHECKs.

[Guido Urdaneta, 2017-06-08 14:46:04]

lgtm

[hbos_chromium, 2017-06-12 10:38:41]

Patchset #9 (id:220001) has been deleted

[hbos_chromium, 2017-06-12 10:39:07]

The CQ bit was checked by hbos@chromium.org

[hbos_chromium, 2017-06-12 10:39:08]

The patchset sent to the CQ was uploaded after l-g-t-m from guidou@chromium.org
Link to the patchset: https://codereview.chromium.org/2897603004/#ps240001
(title: "Rebase after dep CL landed")

[commit-bot: I haz the power, 2017-06-12 10:39:20]

CQ is trying da patch.

Follow status at:
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2017-06-12 11:44:49]

CQ is committing da patch.

Bot data: {"patchset_id": 240001, "attempt_start_ts": 1497263947941240,
"parent_rev": "da4edbb50e534e92fe8c6f5df9554fe03104a4c0", "commit_rev":
"49effc1da26d29e677a79f49cf20ca85be501ee4"}

[commit-bot: I haz the power, 2017-06-12 11:45:00]

Description was changed from

==========
WebRtcMediaStreamAdapter using WebRtcMediaStreamTrackMap.

Make the WebRtcMediaStreamAdapter, which represent local streams,
use the WebRtcMediaStreamTrackMap and AdapterRef classes for the
handling of initializing, getting and uninitializing local tracks.

WebRtcMediaStreamTrackAdapter is updated to allow local tracks from
non-local sources (removed DCHECKs) which happens when redirecting
remote sources as local streams.

This is one step closer to decoupling streams and tracks.

The same thing will be done in a follow-up CL for the remote streams
case, RemoteMediaStreamImpl.

BUG=705901, 700916
==========

to

==========
WebRtcMediaStreamAdapter using WebRtcMediaStreamTrackMap.

Make the WebRtcMediaStreamAdapter, which represent local streams,
use the WebRtcMediaStreamTrackMap and AdapterRef classes for the
handling of initializing, getting and uninitializing local tracks.

WebRtcMediaStreamTrackAdapter is updated to allow local tracks from
non-local sources (removed DCHECKs) which happens when redirecting
remote sources as local streams.

This is one step closer to decoupling streams and tracks.

The same thing will be done in a follow-up CL for the remote streams
case, RemoteMediaStreamImpl.

BUG=705901, 700916

Review-Url: https://codereview.chromium.org/2897603004
Cr-Commit-Position: refs/heads/master@{#478592}
Committed:
https://chromium.googlesource.com/chromium/src/+/49effc1da26d29e677a79f49cf20...
==========

[commit-bot: I haz the power, 2017-06-12 11:45:02]

Committed patchset #9 (id:240001) as
https://chromium.googlesource.com/chromium/src/+/49effc1da26d29e677a79f49cf20...