Add use_v4l2_codec use flag to include v4l2 codec on x86 CrOS.

Add use_v4l2_codec use flag to include v4l2 codec on x86 CrOS.

Because some trybots such as linux chromeos ozone use old linux
header files, use this flag to workaround chromium:446088 issue
to skip those trybots. So we can re-submit
https://codereview.chromium.org/826663002/. After 446088 is
fixed, this CL should be reverted.

BUG=445016
TEST=build squawks with this flag

Committed: https://crrev.com/4c80f1560683212ff5116b53f2830ba53b614442
Cr-Commit-Position: refs/heads/master@{#310715}

[henryhsu, 2015-01-08 08:58:43]

henryhsu@chromium.org changed reviewers:
+ posciak@chromium.org, wuchengli@chromium.org

[henryhsu, 2015-01-08 08:58:43]

PTAL

[wuchengli, 2015-01-08 11:16:46]

https://codereview.chromium.org/799543005/diff/40001/content/common/BUILD.gn
File content/common/BUILD.gn (right):

https://codereview.chromium.org/799543005/diff/40001/content/common/BUILD.gn#...
content/common/BUILD.gn:1: # Copyright 2014 The Chromium Authors. All rights
reserved.
Explain in the change description why we are doing this.

https://codereview.chromium.org/799543005/diff/40001/content/common/BUILD.gn#...
content/common/BUILD.gn:286: "gpu/media/exynos_v4l2_video_device.cc",
Change this to generic_v4l2_video_device.cc.

https://codereview.chromium.org/799543005/diff/40001/media/media_options.gni
File media/media_options.gni (right):

https://codereview.chromium.org/799543005/diff/40001/media/media_options.gni#...
media/media_options.gni:54: 
Add a TODO to remove this after the linux header of trybot is updated.

https://codereview.chromium.org/799543005/diff/40001/media/media_options.gni#...
media/media_options.gni:57: use_v4l2_codec = false
Shouldn't this go to content/common/common.gni? No media gn uses this.

[henryhsu, 2015-01-08 12:11:19]

all done

https://codereview.chromium.org/799543005/diff/40001/content/common/BUILD.gn
File content/common/BUILD.gn (right):

https://codereview.chromium.org/799543005/diff/40001/content/common/BUILD.gn#...
content/common/BUILD.gn:1: # Copyright 2014 The Chromium Authors. All rights
reserved.
On 2015/01/08 11:16:46, wuchengli wrote:
> Explain in the change description why we are doing this.

Done.

https://codereview.chromium.org/799543005/diff/40001/content/common/BUILD.gn#...
content/common/BUILD.gn:286: "gpu/media/exynos_v4l2_video_device.cc",
On 2015/01/08 11:16:46, wuchengli wrote:
> Change this to generic_v4l2_video_device.cc.

Done.

https://codereview.chromium.org/799543005/diff/40001/media/media_options.gni
File media/media_options.gni (right):

https://codereview.chromium.org/799543005/diff/40001/media/media_options.gni#...
media/media_options.gni:54: 
On 2015/01/08 11:16:46, wuchengli wrote:
> Add a TODO to remove this after the linux header of trybot is updated.

Done.

https://codereview.chromium.org/799543005/diff/40001/media/media_options.gni#...
media/media_options.gni:57: use_v4l2_codec = false
On 2015/01/08 11:16:46, wuchengli wrote:
> Shouldn't this go to content/common/common.gni? No media gn uses this.

Done.

[wuchengli, 2015-01-08 13:57:10]

wuchengli@chromium.org changed reviewers:
+ piman@chromium.org

[wuchengli, 2015-01-08 13:57:11]

LGTM.

piman: PTAL. This is a workaround, but we need this for M41. This should be
reverted soon after the linux header on trybots are updated.

https://codereview.chromium.org/799543005/diff/60001/content/common/gpu/media...
File content/common/gpu/media/v4l2_video_decode_accelerator.cc (right):

https://codereview.chromium.org/799543005/diff/60001/content/common/gpu/media...
content/common/gpu/media/v4l2_video_decode_accelerator.cc:77: size_t bytes_used;
Henry said this is required to fix the compile warning for inte. platform.

[piman, 2015-01-08 18:35:45]

lgtm

[henryhsu, 2015-01-09 02:59:40]

The CQ bit was checked by henryhsu@chromium.org

[commit-bot: I haz the power, 2015-01-09 03:01:22]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/799543005/60001

[commit-bot: I haz the power, 2015-01-09 03:52:15]

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

[commit-bot: I haz the power, 2015-01-09 03:52:16]

Failed to apply patch for content/content_common.gypi:
While running git apply --index -3 -p1;
  error: patch failed: content/content_common.gypi:31
  Falling back to three-way merge...
  Applied patch to 'content/content_common.gypi' with conflicts.
  U content/content_common.gypi

Patch:       content/content_common.gypi
Index: content/content_common.gypi
diff --git a/content/content_common.gypi b/content/content_common.gypi
index
69ec5334c2a6509f09da693356ae524130d7ad8e..06f891536bc1e3f4f4b2aed6a2d43210124fab6c
100644
--- a/content/content_common.gypi
+++ b/content/content_common.gypi
@@ -31,6 +31,7 @@
     '../third_party/WebKit/public/blink_headers.gyp:blink_headers',
   ],
   'variables': {
+    'use_v4l2_codec%': 0,
     'public_common_sources': [
       'public/common/appcache_info.h',
       'public/common/bindings_policy.h',
@@ -759,15 +760,13 @@
         '../third_party/libjingle/libjingle.gyp:libjingle',
       ],
     }],
-    ['target_arch=="arm" and chromeos == 1 and use_x11 == 1', {
+    ['chromeos==1 and ((target_arch=="arm" and use_x11==1) or
use_v4l2_codec==1)', {
       'dependencies': [
         '../media/media.gyp:media',
       ],
       'sources': [
         'common/gpu/media/generic_v4l2_video_device.cc',
         'common/gpu/media/generic_v4l2_video_device.h',
-        'common/gpu/media/tegra_v4l2_video_device.cc',
-        'common/gpu/media/tegra_v4l2_video_device.h',
         'common/gpu/media/v4l2_image_processor.cc',
         'common/gpu/media/v4l2_image_processor.h',
         'common/gpu/media/v4l2_video_decode_accelerator.cc',
@@ -780,6 +779,14 @@
       'include_dirs': [
         '<(DEPTH)/third_party/khronos',
       ],
+      'conditions': [
+        ['target_arch == "arm"', {
+          'sources': [
+            'common/gpu/media/tegra_v4l2_video_device.cc',
+            'common/gpu/media/tegra_v4l2_video_device.h',
+          ],
+        }],
+      ],
     }],
     ['target_arch != "arm" and chromeos == 1', {
       'dependencies': [

[commit-bot: I haz the power, 2015-01-09 03:52:29]

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

[henryhsu, 2015-01-09 04:52:20]

The CQ bit was checked by henryhsu@chromium.org

[commit-bot: I haz the power, 2015-01-09 04:53:02]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/799543005/80001

[commit-bot: I haz the power, 2015-01-09 05:53:38]

Committed patchset #5 (id:80001)

[commit-bot: I haz the power, 2015-01-09 05:54:46]

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