Add DesktopCapturer GetSourceList SelectSource FocusOnSelectedSource functions

Add DesktopCapturer GetSourceList SelectSource FocusOnSelectedSource functions

I have chosen part of 2435603010 changes to compose this change.
According to the discussion we have made in previous change, this CL contains,
1. Source structure to represent a source of a DesktopCapturer.
2. GetSourceList / SelectSource / FocusOnSelectedSource functions in
DesktopCapturer.
3. ScreenCapturer and WindowCapturer forward corresponding functions to the new
DesktopCapturer APIs.

After this change, We can remove WindowCapturer & ScreenCapturer references from
Chromium, and use the new APIs.

BUG=webrtc:6513
Committed: https://crrev.com/9cb0b3b4ac916cdf52d97a63d923dfbe73f0541e
Committed: https://crrev.com/b68d655f368e4f99295bad493db922cd25a5af57
Cr-Original-Commit-Position: refs/heads/master@{#14830}
Cr-Commit-Position: refs/heads/master@{#14832}

[Hzj_jie, 2016-10-27 23:14:56]

Patchset #1 (id:1) has been deleted

[Hzj_jie, 2016-10-27 23:15:07]

Patchset #1 (id:20001) has been deleted

[Hzj_jie, 2016-10-28 00:00:10]

Description was changed from

==========
Add DesktopCapturer GetSourceList SelectSource FocusOnSelectedSource functions

BUG=webrtc:6513
==========

to

==========
Add DesktopCapturer GetSourceList SelectSource FocusOnSelectedSource functions

I have chosen part of 2435603010 changes to compose this change.
According to the discussion we have made in previous change, this CL contains,
1. SourceType enumuarator and Source structure to represent a source of a
DesktopCapturer.
2. GetSourceList / SelectSource / FocusOnSelectedSource functions in
DesktopCapturer.
3. ScreenCapturer and WindowCapturer forward corresponding functions to the new
DesktopCapturer APIs.

After this change, We can remove WindowCapturer & ScreenCapturer references from
Chromium, and use the new APIs.

BUG=webrtc:6513
==========

[Hzj_jie, 2016-10-28 00:00:10]

zijiehe@chromium.org changed reviewers:
+ sergeyu@chromium.org

[Sergey Ulanov, 2016-10-28 15:53:22]

Looks good, but I don't think we need to distinguish between windows and screens
in the DesktopCapturer level.

https://codereview.webrtc.org/2452263003/diff/40001/webrtc/modules/desktop_ca...
File webrtc/modules/desktop_capture/desktop_capturer.cc (right):

https://codereview.webrtc.org/2452263003/diff/40001/webrtc/modules/desktop_ca...
webrtc/modules/desktop_capture/desktop_capturer.cc:54: // MSVC and android-g++
does not support C99 structure initialization.
This is a not a good reason to use ifdef. The first version of this code would
work on all platforms. Or you can also do Source{SourceType::WINDOW, id, title};

https://codereview.webrtc.org/2452263003/diff/40001/webrtc/modules/desktop_ca...
File webrtc/modules/desktop_capture/desktop_capturer.h (right):

https://codereview.webrtc.org/2452263003/diff/40001/webrtc/modules/desktop_ca...
webrtc/modules/desktop_capture/desktop_capturer.h:73: SourceType type;
I don't think we need this field here or SourceType enum. They would be easy to
add in the future if necessary.

https://codereview.webrtc.org/2452263003/diff/40001/webrtc/modules/desktop_ca...
webrtc/modules/desktop_capture/desktop_capturer.h:83: ScreenId screen_id()
const;
I don't see a case when these fields can be useful. Just id and title should be
enough.

https://codereview.webrtc.org/2452263003/diff/40001/webrtc/modules/desktop_ca...
webrtc/modules/desktop_capture/desktop_capturer.h:88: bool operator!=(const
Source& other) const;
Why do we need these operators? Their behavior is not what one might expect
(they ignore title), so I'd prefer not adding them at all.

https://codereview.webrtc.org/2452263003/diff/40001/webrtc/modules/desktop_ca...
File webrtc/modules/desktop_capture/screen_capturer.h (right):

https://codereview.webrtc.org/2452263003/diff/40001/webrtc/modules/desktop_ca...
webrtc/modules/desktop_capture/screen_capturer.h:59: // Deprecated, use
GetSourceList.
nit: s/GetSourceList/GetSourceList()/

https://codereview.webrtc.org/2452263003/diff/40001/webrtc/modules/desktop_ca...
webrtc/modules/desktop_capture/screen_capturer.h:64: // Deprecated, use
SelectSource.
SelectSource()

[Hzj_jie, 2016-10-28 21:45:31]

Patchset #2 (id:60001) has been deleted

[Hzj_jie, 2016-10-28 21:48:06]

Patchset #2 (id:80001) has been deleted

[Hzj_jie, 2016-10-28 21:49:01]

Description was changed from

==========
Add DesktopCapturer GetSourceList SelectSource FocusOnSelectedSource functions

I have chosen part of 2435603010 changes to compose this change.
According to the discussion we have made in previous change, this CL contains,
1. SourceType enumuarator and Source structure to represent a source of a
DesktopCapturer.
2. GetSourceList / SelectSource / FocusOnSelectedSource functions in
DesktopCapturer.
3. ScreenCapturer and WindowCapturer forward corresponding functions to the new
DesktopCapturer APIs.

After this change, We can remove WindowCapturer & ScreenCapturer references from
Chromium, and use the new APIs.

BUG=webrtc:6513
==========

to

==========
Add DesktopCapturer GetSourceList SelectSource FocusOnSelectedSource functions

I have chosen part of 2435603010 changes to compose this change.
According to the discussion we have made in previous change, this CL contains,
1. Source structure to represent a source of a DesktopCapturer.
2. GetSourceList / SelectSource / FocusOnSelectedSource functions in
DesktopCapturer.
3. ScreenCapturer and WindowCapturer forward corresponding functions to the new
DesktopCapturer APIs.

After this change, We can remove WindowCapturer & ScreenCapturer references from
Chromium, and use the new APIs.

BUG=webrtc:6513
==========

[Hzj_jie, 2016-10-28 22:03:53]

https://codereview.webrtc.org/2452263003/diff/40001/webrtc/modules/desktop_ca...
File webrtc/modules/desktop_capture/desktop_capturer.cc (right):

https://codereview.webrtc.org/2452263003/diff/40001/webrtc/modules/desktop_ca...
webrtc/modules/desktop_capture/desktop_capturer.cc:54: // MSVC and android-g++
does not support C99 structure initialization.
On 2016/10/28 15:53:21, Sergey Ulanov wrote:
> This is a not a good reason to use ifdef. The first version of this code would
> work on all platforms. Or you can also do Source{SourceType::WINDOW, id,
title};

Done.

https://codereview.webrtc.org/2452263003/diff/40001/webrtc/modules/desktop_ca...
File webrtc/modules/desktop_capture/desktop_capturer.h (right):

https://codereview.webrtc.org/2452263003/diff/40001/webrtc/modules/desktop_ca...
webrtc/modules/desktop_capture/desktop_capturer.h:73: SourceType type;
On 2016/10/28 15:53:21, Sergey Ulanov wrote:
> I don't think we need this field here or SourceType enum. They would be easy
to
> add in the future if necessary.

I reconsidered this design, and, yes, the SourceId is meaningful only to the
DesktopCapturer returns it. i.e. ScreenCapturerWinDirectx uses a 0-based index
to represent screens, while ScreenCapturerWinGdi uses an index managed by
Windows. i.e. Using a Source coming from one DesktopCapturer to another is
meaningless anyway.

https://codereview.webrtc.org/2452263003/diff/40001/webrtc/modules/desktop_ca...
webrtc/modules/desktop_capture/desktop_capturer.h:83: ScreenId screen_id()
const;
On 2016/10/28 15:53:22, Sergey Ulanov wrote:
> I don't see a case when these fields can be useful. Just id and title should
be
> enough.

Done.

https://codereview.webrtc.org/2452263003/diff/40001/webrtc/modules/desktop_ca...
webrtc/modules/desktop_capture/desktop_capturer.h:88: bool operator!=(const
Source& other) const;
On 2016/10/28 15:53:22, Sergey Ulanov wrote:
> Why do we need these operators? Their behavior is not what one might expect
> (they ignore title), so I'd prefer not adding them at all. 

These operators are for comparing one Source to another if we plan to use
SourceType. Since SourceType is removed, these operators should also be removed.

https://codereview.webrtc.org/2452263003/diff/40001/webrtc/modules/desktop_ca...
File webrtc/modules/desktop_capture/screen_capturer.h (right):

https://codereview.webrtc.org/2452263003/diff/40001/webrtc/modules/desktop_ca...
webrtc/modules/desktop_capture/screen_capturer.h:59: // Deprecated, use
GetSourceList.
On 2016/10/28 15:53:22, Sergey Ulanov wrote:
> nit: s/GetSourceList/GetSourceList()/

Done.

https://codereview.webrtc.org/2452263003/diff/40001/webrtc/modules/desktop_ca...
webrtc/modules/desktop_capture/screen_capturer.h:64: // Deprecated, use
SelectSource.
On 2016/10/28 15:53:22, Sergey Ulanov wrote:
> SelectSource()

Done.

[Sergey Ulanov, 2016-10-28 23:08:16]

lgtm

https://codereview.webrtc.org/2452263003/diff/100001/webrtc/modules/desktop_c...
File webrtc/modules/desktop_capture/desktop_capturer.h (right):

https://codereview.webrtc.org/2452263003/diff/100001/webrtc/modules/desktop_c...
webrtc/modules/desktop_capture/desktop_capturer.h:65: // Title of the window or
screen in UTF-8 encoding, maybe empty. This field
nit: empty line here

https://codereview.webrtc.org/2452263003/diff/100001/webrtc/modules/desktop_c...
File webrtc/modules/desktop_capture/screen_capturer.h (right):

https://codereview.webrtc.org/2452263003/diff/100001/webrtc/modules/desktop_c...
webrtc/modules/desktop_capture/screen_capturer.h:45: typedef webrtc::ScreenId
ScreenId;
I don't think we need this type

[Hzj_jie, 2016-10-29 00:04:57]

https://codereview.webrtc.org/2452263003/diff/100001/webrtc/modules/desktop_c...
File webrtc/modules/desktop_capture/desktop_capturer.h (right):

https://codereview.webrtc.org/2452263003/diff/100001/webrtc/modules/desktop_c...
webrtc/modules/desktop_capture/desktop_capturer.h:65: // Title of the window or
screen in UTF-8 encoding, maybe empty. This field
On 2016/10/28 23:08:15, Sergey Ulanov wrote:
> nit: empty line here

Done.

https://codereview.webrtc.org/2452263003/diff/100001/webrtc/modules/desktop_c...
File webrtc/modules/desktop_capture/screen_capturer.h (right):

https://codereview.webrtc.org/2452263003/diff/100001/webrtc/modules/desktop_c...
webrtc/modules/desktop_capture/screen_capturer.h:45: typedef webrtc::ScreenId
ScreenId;
On 2016/10/28 23:08:15, Sergey Ulanov wrote:
> I don't think we need this type

Done.

[Hzj_jie, 2016-10-29 00:05:06]

The CQ bit was checked by zijiehe@chromium.org

[Hzj_jie, 2016-10-29 00:05:07]

The patchset sent to the CQ was uploaded after l-g-t-m from sergeyu@chromium.org
Link to the patchset: https://codereview.webrtc.org/2452263003/#ps120001 (title:
"Resolve review comments")

[commit-bot: I haz the power, 2016-10-29 00:05:15]

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, 2016-10-29 00:06:54]

Description was changed from

==========
Add DesktopCapturer GetSourceList SelectSource FocusOnSelectedSource functions

I have chosen part of 2435603010 changes to compose this change.
According to the discussion we have made in previous change, this CL contains,
1. Source structure to represent a source of a DesktopCapturer.
2. GetSourceList / SelectSource / FocusOnSelectedSource functions in
DesktopCapturer.
3. ScreenCapturer and WindowCapturer forward corresponding functions to the new
DesktopCapturer APIs.

After this change, We can remove WindowCapturer & ScreenCapturer references from
Chromium, and use the new APIs.

BUG=webrtc:6513
==========

to

==========
Add DesktopCapturer GetSourceList SelectSource FocusOnSelectedSource functions

I have chosen part of 2435603010 changes to compose this change.
According to the discussion we have made in previous change, this CL contains,
1. Source structure to represent a source of a DesktopCapturer.
2. GetSourceList / SelectSource / FocusOnSelectedSource functions in
DesktopCapturer.
3. ScreenCapturer and WindowCapturer forward corresponding functions to the new
DesktopCapturer APIs.

After this change, We can remove WindowCapturer & ScreenCapturer references from
Chromium, and use the new APIs.

BUG=webrtc:6513
==========

[commit-bot: I haz the power, 2016-10-29 00:06:55]

Committed patchset #3 (id:120001)

[commit-bot: I haz the power, 2016-10-29 00:07:06]

Description was changed from

==========
Add DesktopCapturer GetSourceList SelectSource FocusOnSelectedSource functions

I have chosen part of 2435603010 changes to compose this change.
According to the discussion we have made in previous change, this CL contains,
1. Source structure to represent a source of a DesktopCapturer.
2. GetSourceList / SelectSource / FocusOnSelectedSource functions in
DesktopCapturer.
3. ScreenCapturer and WindowCapturer forward corresponding functions to the new
DesktopCapturer APIs.

After this change, We can remove WindowCapturer & ScreenCapturer references from
Chromium, and use the new APIs.

BUG=webrtc:6513
==========

to

==========
Add DesktopCapturer GetSourceList SelectSource FocusOnSelectedSource functions

I have chosen part of 2435603010 changes to compose this change.
According to the discussion we have made in previous change, this CL contains,
1. Source structure to represent a source of a DesktopCapturer.
2. GetSourceList / SelectSource / FocusOnSelectedSource functions in
DesktopCapturer.
3. ScreenCapturer and WindowCapturer forward corresponding functions to the new
DesktopCapturer APIs.

After this change, We can remove WindowCapturer & ScreenCapturer references from
Chromium, and use the new APIs.

BUG=webrtc:6513

Committed: https://crrev.com/9cb0b3b4ac916cdf52d97a63d923dfbe73f0541e
Cr-Commit-Position: refs/heads/master@{#14830}
==========

[commit-bot: I haz the power, 2016-10-29 00:07:07]

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

[Hzj_jie, 2016-10-29 00:14:01]

A revert of this CL (patchset #3 id:120001) has been created in
https://codereview.chromium.org/2464553002/ by zijiehe@chromium.org.

The reason for reverting is: Build break in Chromium.

[Hzj_jie, 2016-10-29 00:15:36]

Description was changed from

==========
Add DesktopCapturer GetSourceList SelectSource FocusOnSelectedSource functions

I have chosen part of 2435603010 changes to compose this change.
According to the discussion we have made in previous change, this CL contains,
1. Source structure to represent a source of a DesktopCapturer.
2. GetSourceList / SelectSource / FocusOnSelectedSource functions in
DesktopCapturer.
3. ScreenCapturer and WindowCapturer forward corresponding functions to the new
DesktopCapturer APIs.

After this change, We can remove WindowCapturer & ScreenCapturer references from
Chromium, and use the new APIs.

BUG=webrtc:6513

Committed: https://crrev.com/9cb0b3b4ac916cdf52d97a63d923dfbe73f0541e
Cr-Commit-Position: refs/heads/master@{#14830}
==========

to

==========
Add DesktopCapturer GetSourceList SelectSource FocusOnSelectedSource functions

I have chosen part of 2435603010 changes to compose this change.
According to the discussion we have made in previous change, this CL contains,
1. Source structure to represent a source of a DesktopCapturer.
2. GetSourceList / SelectSource / FocusOnSelectedSource functions in
DesktopCapturer.
3. ScreenCapturer and WindowCapturer forward corresponding functions to the new
DesktopCapturer APIs.

After this change, We can remove WindowCapturer & ScreenCapturer references from
Chromium, and use the new APIs.

BUG=webrtc:6513

Committed: https://crrev.com/9cb0b3b4ac916cdf52d97a63d923dfbe73f0541e
Cr-Commit-Position: refs/heads/master@{#14830}
==========

[Hzj_jie, 2016-10-29 00:32:47]

The CQ bit was checked by zijiehe@chromium.org

[Hzj_jie, 2016-10-29 00:32:48]

The patchset sent to the CQ was uploaded after l-g-t-m from sergeyu@chromium.org
Link to the patchset: https://codereview.webrtc.org/2452263003/#ps140001 (title:
"Fix build break on Chromium")

[commit-bot: I haz the power, 2016-10-29 00:32:56]

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, 2016-10-29 00:35:13]

Description was changed from

==========
Add DesktopCapturer GetSourceList SelectSource FocusOnSelectedSource functions

I have chosen part of 2435603010 changes to compose this change.
According to the discussion we have made in previous change, this CL contains,
1. Source structure to represent a source of a DesktopCapturer.
2. GetSourceList / SelectSource / FocusOnSelectedSource functions in
DesktopCapturer.
3. ScreenCapturer and WindowCapturer forward corresponding functions to the new
DesktopCapturer APIs.

After this change, We can remove WindowCapturer & ScreenCapturer references from
Chromium, and use the new APIs.

BUG=webrtc:6513

Committed: https://crrev.com/9cb0b3b4ac916cdf52d97a63d923dfbe73f0541e
Cr-Commit-Position: refs/heads/master@{#14830}
==========

to

==========
Add DesktopCapturer GetSourceList SelectSource FocusOnSelectedSource functions

I have chosen part of 2435603010 changes to compose this change.
According to the discussion we have made in previous change, this CL contains,
1. Source structure to represent a source of a DesktopCapturer.
2. GetSourceList / SelectSource / FocusOnSelectedSource functions in
DesktopCapturer.
3. ScreenCapturer and WindowCapturer forward corresponding functions to the new
DesktopCapturer APIs.

After this change, We can remove WindowCapturer & ScreenCapturer references from
Chromium, and use the new APIs.

BUG=webrtc:6513

Committed: https://crrev.com/9cb0b3b4ac916cdf52d97a63d923dfbe73f0541e
Cr-Commit-Position: refs/heads/master@{#14830}
==========

[commit-bot: I haz the power, 2016-10-29 00:35:14]

Committed patchset #4 (id:140001)

[commit-bot: I haz the power, 2016-10-29 00:35:20]

Description was changed from

==========
Add DesktopCapturer GetSourceList SelectSource FocusOnSelectedSource functions

I have chosen part of 2435603010 changes to compose this change.
According to the discussion we have made in previous change, this CL contains,
1. Source structure to represent a source of a DesktopCapturer.
2. GetSourceList / SelectSource / FocusOnSelectedSource functions in
DesktopCapturer.
3. ScreenCapturer and WindowCapturer forward corresponding functions to the new
DesktopCapturer APIs.

After this change, We can remove WindowCapturer & ScreenCapturer references from
Chromium, and use the new APIs.

BUG=webrtc:6513

Committed: https://crrev.com/9cb0b3b4ac916cdf52d97a63d923dfbe73f0541e
Cr-Commit-Position: refs/heads/master@{#14830}
==========

to

==========
Add DesktopCapturer GetSourceList SelectSource FocusOnSelectedSource functions

I have chosen part of 2435603010 changes to compose this change.
According to the discussion we have made in previous change, this CL contains,
1. Source structure to represent a source of a DesktopCapturer.
2. GetSourceList / SelectSource / FocusOnSelectedSource functions in
DesktopCapturer.
3. ScreenCapturer and WindowCapturer forward corresponding functions to the new
DesktopCapturer APIs.

After this change, We can remove WindowCapturer & ScreenCapturer references from
Chromium, and use the new APIs.

BUG=webrtc:6513

Committed: https://crrev.com/9cb0b3b4ac916cdf52d97a63d923dfbe73f0541e
Committed: https://crrev.com/b68d655f368e4f99295bad493db922cd25a5af57
Cr-Original-Commit-Position: refs/heads/master@{#14830}
Cr-Commit-Position: refs/heads/master@{#14832}
==========

[commit-bot: I haz the power, 2016-10-29 00:35:21]

Patchset 4 (id:??) landed as
https://crrev.com/b68d655f368e4f99295bad493db922cd25a5af57
Cr-Commit-Position: refs/heads/master@{#14832}