Add DesktopCapturerId and attach it to DesktopFrame

Add DesktopCapturerId and attach it to DesktopFrame

This change adds a DesktopCapturerId namespace, and attaches an int to each
DesktopFrame. ScreenCapturerWinGdi and ScreenCapturerWinDirectx now actively set
this field to differentiate themselves.

BUG=679523, 650926
Review-Url: https://codereview.webrtc.org/2759493002
Cr-Original-Commit-Position: refs/heads/master@{#17329}
Committed: https://chromium.googlesource.com/external/webrtc/+/41e3d9ff3bf7a7364b643f851f14062fd43fcc11
Review-Url: https://codereview.webrtc.org/2759493002
Cr-Commit-Position: refs/heads/master@{#17347}
Committed: https://chromium.googlesource.com/external/webrtc/+/88ac827877767eb07cbde067529467ace0a690f1

[Hzj_jie, 2017-03-16 19:50:29]

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

[commit-bot: I haz the power, 2017-03-16 19:50:37]

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-03-16 19:55:07]

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

[commit-bot: I haz the power, 2017-03-16 19:55:08]

Dry run: Try jobs failed on following builders:
  win_clang_rel on master.tryserver.webrtc (JOB_FAILED,
http://build.chromium.org/p/tryserver.webrtc/builders/win_clang_rel/builds/11965)
  win_x64_clang_rel on master.tryserver.webrtc (JOB_FAILED,
http://build.chromium.org/p/tryserver.webrtc/builders/win_x64_clang_rel/build...)

[Hzj_jie, 2017-03-16 20:40:41]

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

[commit-bot: I haz the power, 2017-03-16 20:40:42]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.webrtc.org/...

[Hzj_jie, 2017-03-16 20:40:57]

Patchset #1 (id:1) has been deleted

[Hzj_jie, 2017-03-16 20:57:05]

Description was changed from

==========
Add DesktopCapturerId and attach it to DesktopFrame

This change adds a DesktopCapturerId enumeration, and attaches it to each
DesktopFrame. ScreenCapturerWinGdi and ScreenCapturerWinDirectx now actively set
this field to differentiate themselves.

BUG=679523, 650926
==========

to

==========
Add DesktopCapturerId and attach it to DesktopFrame

This change adds a DesktopCapturerId enumeration, and attaches it to each
DesktopFrame. ScreenCapturerWinGdi and ScreenCapturerWinDirectx now actively set
this field to differentiate themselves.

BUG=679523, 650926
==========

[Hzj_jie, 2017-03-16 20:57:05]

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

[commit-bot: I haz the power, 2017-03-16 21:02:58]

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

[commit-bot: I haz the power, 2017-03-16 21:02:59]

Dry run: This issue passed the CQ dry run.

[Sergey Ulanov, 2017-03-17 19:14:13]

https://codereview.webrtc.org/2759493002/diff/20001/webrtc/modules/desktop_ca...
File webrtc/modules/desktop_capture/desktop_capture_types.h (right):

https://codereview.webrtc.org/2759493002/diff/20001/webrtc/modules/desktop_ca...
webrtc/modules/desktop_capture/desktop_capture_types.h:41: enum class
DesktopCapturerId {
The problem with enum is that it's harder to extend for other screen capturers,
particularly those outside of WebRTC repo (e.g. we have capturer for Aura on
Chrome OS). Also sending it over the wire makes it harder to maintain
compatibility. I suggest using something like FourCC code to identify capturers.
It's essentially 32-bit integer that maps to 4-character ASCII string. That
would make it easy to map these IDs to a human-readable string in logs, while it
will still be only 4 bytes. There are already some FourCC helpers in
webrtc/media/base/videocommon.h.
WDYT?

[Sergey Ulanov, 2017-03-17 19:18:27]

https://codereview.webrtc.org/2759493002/diff/20001/webrtc/modules/desktop_ca...
File webrtc/modules/desktop_capture/desktop_capture_types.h (right):

https://codereview.webrtc.org/2759493002/diff/20001/webrtc/modules/desktop_ca...
webrtc/modules/desktop_capture/desktop_capture_types.h:41: enum class
DesktopCapturerId {
On 2017/03/17 19:14:13, Sergey Ulanov wrote:
> The problem with enum is that it's harder to extend for other screen
capturers,
> particularly those outside of WebRTC repo (e.g. we have capturer for Aura on
> Chrome OS). Also sending it over the wire makes it harder to maintain
> compatibility. I suggest using something like FourCC code to identify
capturers.
> It's essentially 32-bit integer that maps to 4-character ASCII string. That
> would make it easy to map these IDs to a human-readable string in logs, while
it
> will still be only 4 bytes. There are already some FourCC helpers in
> webrtc/media/base/videocommon.h.
> WDYT?

FWIW, this would increase size of that field in protobuf from 2 to 6 bytes,
which I think is acceptable.

[Hzj_jie, 2017-03-18 00:51:05]

On 2017/03/17 19:18:27, Sergey Ulanov wrote:
>
https://codereview.webrtc.org/2759493002/diff/20001/webrtc/modules/desktop_ca...
> File webrtc/modules/desktop_capture/desktop_capture_types.h (right):
> 
>
https://codereview.webrtc.org/2759493002/diff/20001/webrtc/modules/desktop_ca...
> webrtc/modules/desktop_capture/desktop_capture_types.h:41: enum class
> DesktopCapturerId {
> On 2017/03/17 19:14:13, Sergey Ulanov wrote:
> > The problem with enum is that it's harder to extend for other screen
> capturers,
> > particularly those outside of WebRTC repo (e.g. we have capturer for Aura on
> > Chrome OS). Also sending it over the wire makes it harder to maintain
> > compatibility. I suggest using something like FourCC code to identify
> capturers.
> > It's essentially 32-bit integer that maps to 4-character ASCII string. That
> > would make it easy to map these IDs to a human-readable string in logs,
while
> it
> > will still be only 4 bytes. There are already some FourCC helpers in
> > webrtc/media/base/videocommon.h.
> > WDYT?
> 
> FWIW, this would increase size of that field in protobuf from 2 to 6 bytes,
> which I think is acceptable.

Sorry, I did not have a chance today to update this change. I totally agree to
use 4-character ASCII string, which is easy to understand. I will update this
change as soon as possible.

[Hzj_jie, 2017-03-19 22:37:39]

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

[commit-bot: I haz the power, 2017-03-19 22:37:50]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.webrtc.org/...

[Hzj_jie, 2017-03-19 22:39:20]

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

[commit-bot: I haz the power, 2017-03-19 22:39:30]

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-03-19 22:42:00]

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

[commit-bot: I haz the power, 2017-03-19 22:42:00]

Dry run: Try jobs failed on following builders:
  linux_asan on master.tryserver.webrtc (JOB_FAILED,
http://build.chromium.org/p/tryserver.webrtc/builders/linux_asan/builds/23220)
  linux_tsan2 on master.tryserver.webrtc (JOB_FAILED,
http://build.chromium.org/p/tryserver.webrtc/builders/linux_tsan2/builds/20985)
  linux_ubsan_vptr on master.tryserver.webrtc (JOB_FAILED,
http://build.chromium.org/p/tryserver.webrtc/builders/linux_ubsan_vptr/builds...)

[Hzj_jie, 2017-03-19 23:23:48]

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

[commit-bot: I haz the power, 2017-03-19 23:23:51]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.webrtc.org/...

[Hzj_jie, 2017-03-19 23:24:07]

Patchset #2 (id:40001) has been deleted

[commit-bot: I haz the power, 2017-03-19 23:45:58]

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

[commit-bot: I haz the power, 2017-03-19 23:45:59]

Dry run: This issue passed the CQ dry run.

[Hzj_jie, 2017-03-20 00:25:08]

Updated.

[Sergey Ulanov, 2017-03-21 00:35:43]

lgtm

https://codereview.webrtc.org/2759493002/diff/60001/webrtc/modules/desktop_ca...
File webrtc/modules/desktop_capture/desktop_capture_types.h (right):

https://codereview.webrtc.org/2759493002/diff/60001/webrtc/modules/desktop_ca...
webrtc/modules/desktop_capture/desktop_capture_types.h:43: UNKNOWN = FOURCC(0,
0, 0, 0),
UNKNOWN = 0

https://codereview.webrtc.org/2759493002/diff/60001/webrtc/modules/desktop_ca...
webrtc/modules/desktop_capture/desktop_capture_types.h:45:
SCREEN_CAPTURER_WIN_DIRECTX = FOURCC('W', 'S', 'D', 0),
' ' instead of 0 please.
Also would be easier to understand these names if they were "GDI " and "DXGI"?

[Sergey Ulanov, 2017-03-21 00:39:36]

not lgtm, sorry, noticed couple more issues

https://codereview.webrtc.org/2759493002/diff/60001/webrtc/modules/desktop_ca...
File webrtc/modules/desktop_capture/desktop_capture_types.h (right):

https://codereview.webrtc.org/2759493002/diff/60001/webrtc/modules/desktop_ca...
webrtc/modules/desktop_capture/desktop_capture_types.h:42: enum class
DesktopCapturerId {
I think this shouldn't be a class enum as we want the set of capturers to be
extensible, so the capturer ID should be 32-bit integer, without restricting to
an enum value.

https://codereview.webrtc.org/2759493002/diff/60001/webrtc/modules/desktop_ca...
File webrtc/modules/desktop_capture/desktop_frame.h (right):

https://codereview.webrtc.org/2759493002/diff/60001/webrtc/modules/desktop_ca...
webrtc/modules/desktop_capture/desktop_frame.h:74: DesktopCapturerId
capturer_id() const { return capturer_id_; }
I think this should be uint32_t if we want it to be extensible for capturers
outside of WebRTC

[Hzj_jie, 2017-03-21 02:23:14]

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

[commit-bot: I haz the power, 2017-03-21 02:23:24]

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-03-21 02:46:02]

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

[commit-bot: I haz the power, 2017-03-21 02:46:03]

Dry run: This issue passed the CQ dry run.

[Hzj_jie, 2017-03-21 17:38:30]

Patchset #3 (id:80001) has been deleted

[Hzj_jie, 2017-03-21 17:56:56]

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

[commit-bot: I haz the power, 2017-03-21 17:57:03]

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-03-21 18:01:32]

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

[commit-bot: I haz the power, 2017-03-21 18:01:33]

Dry run: Try jobs failed on following builders:
  linux_tsan2 on master.tryserver.webrtc (JOB_FAILED,
http://build.chromium.org/p/tryserver.webrtc/builders/linux_tsan2/builds/21060)
  win_x64_rel on master.tryserver.webrtc (JOB_FAILED,
http://build.chromium.org/p/tryserver.webrtc/builders/win_x64_rel/builds/23957)

[Hzj_jie, 2017-03-21 18:02:53]

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

[commit-bot: I haz the power, 2017-03-21 18:03:02]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.webrtc.org/...

[Hzj_jie, 2017-03-21 18:03:18]

Patchset #3 (id:100001) has been deleted

[commit-bot: I haz the power, 2017-03-21 18:07:04]

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

[commit-bot: I haz the power, 2017-03-21 18:07:06]

Dry run: Try jobs failed on following builders:
  ios64_sim_ios10_dbg on master.tryserver.webrtc (JOB_FAILED,
http://build.chromium.org/p/tryserver.webrtc/builders/ios64_sim_ios10_dbg/bui...)
  ios_arm64_rel on master.tryserver.webrtc (JOB_FAILED,
http://build.chromium.org/p/tryserver.webrtc/builders/ios_arm64_rel/builds/18599)

[Hzj_jie, 2017-03-21 18:08:01]

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

[commit-bot: I haz the power, 2017-03-21 18:08:05]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.webrtc.org/...

[Hzj_jie, 2017-03-21 18:08:14]

Patchset #3 (id:120001) has been deleted

[Hzj_jie, 2017-03-21 18:40:14]

Description was changed from

==========
Add DesktopCapturerId and attach it to DesktopFrame

This change adds a DesktopCapturerId enumeration, and attaches it to each
DesktopFrame. ScreenCapturerWinGdi and ScreenCapturerWinDirectx now actively set
this field to differentiate themselves.

BUG=679523, 650926
==========

to

==========
Add DesktopCapturerId and attach it to DesktopFrame

This change adds a DesktopCapturerId namespace, and attaches it to each
DesktopFrame. ScreenCapturerWinGdi and ScreenCapturerWinDirectx now actively set
this field to differentiate themselves.

BUG=679523, 650926
==========

[Hzj_jie, 2017-03-21 18:40:28]

Description was changed from

==========
Add DesktopCapturerId and attach it to DesktopFrame

This change adds a DesktopCapturerId namespace, and attaches it to each
DesktopFrame. ScreenCapturerWinGdi and ScreenCapturerWinDirectx now actively set
this field to differentiate themselves.

BUG=679523, 650926
==========

to

==========
Add DesktopCapturerId and attach it to DesktopFrame

This change adds a DesktopCapturerId namespace, and attaches an int to each
DesktopFrame. ScreenCapturerWinGdi and ScreenCapturerWinDirectx now actively set
this field to differentiate themselves.

BUG=679523, 650926
==========

[Hzj_jie, 2017-03-21 18:40:40]

https://codereview.webrtc.org/2759493002/diff/60001/webrtc/modules/desktop_ca...
File webrtc/modules/desktop_capture/desktop_capture_types.h (right):

https://codereview.webrtc.org/2759493002/diff/60001/webrtc/modules/desktop_ca...
webrtc/modules/desktop_capture/desktop_capture_types.h:42: enum class
DesktopCapturerId {
On 2017/03/21 00:39:36, Sergey Ulanov wrote:
> I think this shouldn't be a class enum as we want the set of capturers to be
> extensible, so the capturer ID should be 32-bit integer, without restricting
to
> an enum value.

Done.

https://codereview.webrtc.org/2759493002/diff/60001/webrtc/modules/desktop_ca...
webrtc/modules/desktop_capture/desktop_capture_types.h:43: UNKNOWN = FOURCC(0,
0, 0, 0),
On 2017/03/21 00:35:43, Sergey Ulanov wrote:
> UNKNOWN = 0

Done.

https://codereview.webrtc.org/2759493002/diff/60001/webrtc/modules/desktop_ca...
webrtc/modules/desktop_capture/desktop_capture_types.h:45:
SCREEN_CAPTURER_WIN_DIRECTX = FOURCC('W', 'S', 'D', 0),
On 2017/03/21 00:35:43, Sergey Ulanov wrote:
> ' ' instead of 0 please.
> Also would be easier to understand these names if they were "GDI " and "DXGI"?

I am trying to make each bit useful, here WSG means Windows Screencapturer Gdi,
and the forth bit is preserved (changed to ' ').

https://codereview.webrtc.org/2759493002/diff/60001/webrtc/modules/desktop_ca...
File webrtc/modules/desktop_capture/desktop_frame.h (right):

https://codereview.webrtc.org/2759493002/diff/60001/webrtc/modules/desktop_ca...
webrtc/modules/desktop_capture/desktop_frame.h:74: DesktopCapturerId
capturer_id() const { return capturer_id_; }
On 2017/03/21 00:39:36, Sergey Ulanov wrote:
> I think this should be uint32_t if we want it to be extensible for capturers
> outside of WebRTC

Done.

[Sergey Ulanov, 2017-03-21 18:54:37]

lgtm

https://codereview.webrtc.org/2759493002/diff/60001/webrtc/modules/desktop_ca...
File webrtc/modules/desktop_capture/desktop_capture_types.h (right):

https://codereview.webrtc.org/2759493002/diff/60001/webrtc/modules/desktop_ca...
webrtc/modules/desktop_capture/desktop_capture_types.h:45:
SCREEN_CAPTURER_WIN_DIRECTX = FOURCC('W', 'S', 'D', 0),
On 2017/03/21 18:40:39, Hzj_jie wrote:
> On 2017/03/21 00:35:43, Sergey Ulanov wrote:
> > ' ' instead of 0 please.
> > Also would be easier to understand these names if they were "GDI " and
"DXGI"?
> 
> I am trying to make each bit useful, here WSG means Windows Screencapturer
Gdi,
> and the forth bit is preserved (changed to ' ').

I got that, but "GDI" would be much clearer if one sees it logs and it's just as
unambiguous (we don't have GDI capturer on Linux or Mac). For window capturer on
windows we could use GDIW.

https://codereview.webrtc.org/2759493002/diff/140001/webrtc/modules/desktop_c...
File webrtc/modules/desktop_capture/desktop_frame.h (right):

https://codereview.webrtc.org/2759493002/diff/140001/webrtc/modules/desktop_c...
webrtc/modules/desktop_capture/desktop_frame.h:72: // The generator of current
DesktopFrame. Not all DesktopCapturer
nit: It's not clear from the comment that this identifies capturer
implementation, not a capturer instance. Also mention that it's set to UNKNOWN
by default.

[commit-bot: I haz the power, 2017-03-21 18:56:12]

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

[commit-bot: I haz the power, 2017-03-21 18:56:13]

Dry run: This issue passed the CQ dry run.

[Hzj_jie, 2017-03-21 19:05:12]

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

[commit-bot: I haz the power, 2017-03-21 19:05:16]

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-03-21 19:38:23]

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

[commit-bot: I haz the power, 2017-03-21 19:38:24]

Dry run: This issue passed the CQ dry run.

[Hzj_jie, 2017-03-21 19:38:50]

https://codereview.webrtc.org/2759493002/diff/60001/webrtc/modules/desktop_ca...
File webrtc/modules/desktop_capture/desktop_capture_types.h (right):

https://codereview.webrtc.org/2759493002/diff/60001/webrtc/modules/desktop_ca...
webrtc/modules/desktop_capture/desktop_capture_types.h:45:
SCREEN_CAPTURER_WIN_DIRECTX = FOURCC('W', 'S', 'D', 0),
On 2017/03/21 18:54:37, Sergey Ulanov wrote:
> On 2017/03/21 18:40:39, Hzj_jie wrote:
> > On 2017/03/21 00:35:43, Sergey Ulanov wrote:
> > > ' ' instead of 0 please.
> > > Also would be easier to understand these names if they were "GDI " and
> "DXGI"?
> > 
> > I am trying to make each bit useful, here WSG means Windows Screencapturer
> Gdi,
> > and the forth bit is preserved (changed to ' ').
> 
> I got that, but "GDI" would be much clearer if one sees it logs and it's just
as
> unambiguous (we don't have GDI capturer on Linux or Mac). For window capturer
on
> windows we could use GDIW.

Done.

https://codereview.webrtc.org/2759493002/diff/140001/webrtc/modules/desktop_c...
File webrtc/modules/desktop_capture/desktop_frame.h (right):

https://codereview.webrtc.org/2759493002/diff/140001/webrtc/modules/desktop_c...
webrtc/modules/desktop_capture/desktop_frame.h:72: // The generator of current
DesktopFrame. Not all DesktopCapturer
On 2017/03/21 18:54:37, Sergey Ulanov wrote:
> nit: It's not clear from the comment that this identifies capturer
> implementation, not a capturer instance. Also mention that it's set to UNKNOWN
> by default.

Done.

[Hzj_jie, 2017-03-21 19:39:00]

The CQ bit was checked by zijiehe@chromium.org

[Hzj_jie, 2017-03-21 19:39:00]

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/2759493002/#ps100002 (title:
"Resolve review comments")

[commit-bot: I haz the power, 2017-03-21 19:39:04]

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-03-21 19:41:19]

CQ is committing da patch.

Bot data: {"patchset_id": 100002, "attempt_start_ts": 1490125140190920,
"parent_rev": "14325edfe408603948c8becbe3bff7d6252b6659", "commit_rev":
"41e3d9ff3bf7a7364b643f851f14062fd43fcc11"}

[commit-bot: I haz the power, 2017-03-21 19:41:27]

Description was changed from

==========
Add DesktopCapturerId and attach it to DesktopFrame

This change adds a DesktopCapturerId namespace, and attaches an int to each
DesktopFrame. ScreenCapturerWinGdi and ScreenCapturerWinDirectx now actively set
this field to differentiate themselves.

BUG=679523, 650926
==========

to

==========
Add DesktopCapturerId and attach it to DesktopFrame

This change adds a DesktopCapturerId namespace, and attaches an int to each
DesktopFrame. ScreenCapturerWinGdi and ScreenCapturerWinDirectx now actively set
this field to differentiate themselves.

BUG=679523, 650926

Review-Url: https://codereview.webrtc.org/2759493002
Cr-Commit-Position: refs/heads/master@{#17329}
Committed:
https://chromium.googlesource.com/external/webrtc/+/41e3d9ff3bf7a7364b643f851...
==========

[commit-bot: I haz the power, 2017-03-21 19:41:28]

Committed patchset #4 (id:100002) as
https://chromium.googlesource.com/external/webrtc/+/41e3d9ff3bf7a7364b643f851...

[Henrik Grunell WebRTC, 2017-03-22 08:13:23]

A revert of this CL (patchset #4 id:100002) has been created in
https://codereview.webrtc.org/2767003002/ by henrikg@webrtc.org.

The reason for reverting is: I suspect that this CL breaks Chromium WebRTC FYI
bots. (Thanks kjellander@ for spotting.) The added dep in BUILD.gn would be the
problem.

Example:

https://luci-logdog.appspot.com/v/?s=chromium%2Fbb%2Fchromium.webrtc.fyi%2FLi...

FAILED:
newlib_pnacl/obj/third_party/webrtc/api/libjingle_peerconnection_api/mediaconstraintsinterface.o

/b/c/goma_client/gomacc
../../native_client/toolchain/linux_x86/pnacl_newlib/bin/pnacl-clang++ -MMD -MF
newlib_pnacl/obj/third_party/webrtc/api/libjingle_peerconnection_api/mediaconstraintsinterface.o.d
-DNACL_TC_REV=5dfe030a71ca66e72c5719ef5034c2ed24706c43 -DV8_DEPRECATION_WARNINGS
-DUSE_OPENSSL_CERTS=1 -DNO_TCMALLOC -DFULL_SAFE_BROWSING -DSAFE_BROWSING_CSD
-DSAFE_BROWSING_DB_LOCAL -DCHROMIUM_BUILD -DENABLE_MEDIA_ROUTER=1
-DFIELDTRIAL_TESTING_ENABLED -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
-D_LARGEFILE64_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS
-D_FORTIFY_SOURCE=2 -DNDEBUG -DNVALGRIND -DWEBRTC_RESTRICT_LOGGING
-DEXPAT_RELATIVE_PATH -DHAVE_SCTP -DENABLE_EXTERNAL_AUTH -DHAVE_WEBRTC_VIDEO
-DHAVE_WEBRTC_VOICE -DLOGGING_INSIDE_WEBRTC -DUSE_WEBRTC_DEV_BRANCH
-DFEATURE_ENABLE_VOICEMAIL -DEXPAT_RELATIVE_PATH -DGTEST_RELATIVE_PATH
-DNO_MAIN_THREAD_WRAPPING -DNO_SOUND_SYSTEM -DWEBRTC_CHROMIUM_BUILD
-DWEBRTC_POSIX -I../.. -Inewlib_pnacl/gen -I../../third_party/webrtc_overrides
-I../../third_party -fno-strict-aliasing -Wno-builtin-macro-redefined
-D__DATE__= -D__TIME__= -D__TIMESTAMP__= -fcolor-diagnostics -Wall -Werror
-Wextra -Wno-missing-field-initializers -Wno-unused-parameter
-Wno-c++11-narrowing -Wno-covered-switch-default -Wno-deprecated-register
-Wno-unneeded-internal-declaration -Wno-inconsistent-missing-override -O2
-fno-ident -fdata-sections -ffunction-sections -g0 -fvisibility=hidden
-fvisibility-inlines-hidden -std=gnu++11 -fno-rtti -fno-exceptions -c
../../third_party/webrtc/api/mediaconstraintsinterface.cc -o
newlib_pnacl/obj/third_party/webrtc/api/libjingle_peerconnection_api/mediaconstraintsinterface.o
In file included from
../../third_party/webrtc/api/mediaconstraintsinterface.cc:11:
In file included from
../../third_party/webrtc/api/mediaconstraintsinterface.h:27:
In file included from ../../third_party/webrtc/api/peerconnectioninterface.h:77:
In file included from ../../third_party/webrtc/api/dtmfsenderinterface.h:16:
In file included from ../../third_party/webrtc/api/mediastreaminterface.h:33:
In file included from ../../third_party/webrtc/media/base/mediachannel.h:28:
../../third_party/webrtc/base/socket.h:18:10: fatal error: 'sys/socket.h' file
not found
#include <sys/socket.h>
         ^
1 error generated.
.

[Hzj_jie, 2017-03-22 17:39:01]

Description was changed from

==========
Add DesktopCapturerId and attach it to DesktopFrame

This change adds a DesktopCapturerId namespace, and attaches an int to each
DesktopFrame. ScreenCapturerWinGdi and ScreenCapturerWinDirectx now actively set
this field to differentiate themselves.

BUG=679523, 650926

Review-Url: https://codereview.webrtc.org/2759493002
Cr-Commit-Position: refs/heads/master@{#17329}
Committed:
https://chromium.googlesource.com/external/webrtc/+/41e3d9ff3bf7a7364b643f851...
==========

to

==========
Add DesktopCapturerId and attach it to DesktopFrame

This change adds a DesktopCapturerId namespace, and attaches an int to each
DesktopFrame. ScreenCapturerWinGdi and ScreenCapturerWinDirectx now actively set
this field to differentiate themselves.

BUG=679523, 650926

Review-Url: https://codereview.webrtc.org/2759493002
Cr-Commit-Position: refs/heads/master@{#17329}
Committed:
https://chromium.googlesource.com/external/webrtc/+/41e3d9ff3bf7a7364b643f851...
==========

[Hzj_jie, 2017-03-22 17:39:07]

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

[commit-bot: I haz the power, 2017-03-22 17:52:43]

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

[commit-bot: I haz the power, 2017-03-22 17:52:44]

Dry run: Try jobs failed on following builders:
  win_x64_dbg on master.tryserver.webrtc (JOB_FAILED,
http://build.chromium.org/p/tryserver.webrtc/builders/win_x64_dbg/builds/7596)

[Hzj_jie, 2017-03-22 18:17:20]

The CQ bit was checked by zijiehe@chromium.org

[Hzj_jie, 2017-03-22 18:17:21]

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/2759493002/#ps170001 (title:
"Remove dependency of webrtc/media:rtc_media_base")

[commit-bot: I haz the power, 2017-03-22 18:17:25]

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-03-22 18:38:47]

CQ is committing da patch.

Bot data: {"patchset_id": 170001, "attempt_start_ts": 1490206640682270,
"parent_rev": "ce302b82c919182887784eff6e6aca7716c6c9c1", "commit_rev":
"88ac827877767eb07cbde067529467ace0a690f1"}

[commit-bot: I haz the power, 2017-03-22 18:38:50]

Description was changed from

==========
Add DesktopCapturerId and attach it to DesktopFrame

This change adds a DesktopCapturerId namespace, and attaches an int to each
DesktopFrame. ScreenCapturerWinGdi and ScreenCapturerWinDirectx now actively set
this field to differentiate themselves.

BUG=679523, 650926

Review-Url: https://codereview.webrtc.org/2759493002
Cr-Commit-Position: refs/heads/master@{#17329}
Committed:
https://chromium.googlesource.com/external/webrtc/+/41e3d9ff3bf7a7364b643f851...
==========

to

==========
Add DesktopCapturerId and attach it to DesktopFrame

This change adds a DesktopCapturerId namespace, and attaches an int to each
DesktopFrame. ScreenCapturerWinGdi and ScreenCapturerWinDirectx now actively set
this field to differentiate themselves.

BUG=679523, 650926

Review-Url: https://codereview.webrtc.org/2759493002
Cr-Original-Commit-Position: refs/heads/master@{#17329}
Committed:
https://chromium.googlesource.com/external/webrtc/+/41e3d9ff3bf7a7364b643f851...
Review-Url: https://codereview.webrtc.org/2759493002
Cr-Commit-Position: refs/heads/master@{#17347}
Committed:
https://chromium.googlesource.com/external/webrtc/+/88ac827877767eb07cbde0675...
==========

[commit-bot: I haz the power, 2017-03-22 18:38:52]

Committed patchset #5 (id:170001) as
https://chromium.googlesource.com/external/webrtc/+/88ac827877767eb07cbde0675...