diff options
| author | torne@chromium.org <torne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-06 11:45:14 +0000 |
|---|---|---|
| committer | torne@chromium.org <torne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-06 11:45:14 +0000 |
| commit | ab2bb21693b9d362c867f0e4500a98fb49b71a84 (patch) | |
| tree | fe6cf6dd2d9121c630bc723bc615e8cecdcd09df /content | |
| parent | a95bf056c6481fff7d9a70ec7f2780ff9b0a57cc (diff) | |
| download | chromium_src-ab2bb21693b9d362c867f0e4500a98fb49b71a84.zip chromium_src-ab2bb21693b9d362c867f0e4500a98fb49b71a84.tar.gz chromium_src-ab2bb21693b9d362c867f0e4500a98fb49b71a84.tar.bz2 | |
Android: disable use of libyuv.
The Anrdoid WebView build doesn't have libyuv, so the code depending on
it was broken there. It doesn't look like we need this on Android at
all, so just disable it based on OS for now; this can be revisited if
it's needed later.
BUG=
Review URL: https://codereview.chromium.org/11366084
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@166190 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/browser/renderer_host/media/video_capture_controller.cc | 5 | ||||
| -rw-r--r-- | content/content_browser.gypi | 6 |
2 files changed, 9 insertions, 2 deletions
diff --git a/content/browser/renderer_host/media/video_capture_controller.cc b/content/browser/renderer_host/media/video_capture_controller.cc index 84dcf8a..2a8f82f 100644 --- a/content/browser/renderer_host/media/video_capture_controller.cc +++ b/content/browser/renderer_host/media/video_capture_controller.cc @@ -13,7 +13,10 @@ #include "content/browser/renderer_host/media/video_capture_manager.h" #include "content/public/browser/browser_thread.h" #include "media/base/yuv_convert.h" + +#if !defined(OS_IOS) && !defined(OS_ANDROID) #include "third_party/libyuv/include/libyuv.h" +#endif namespace content { @@ -332,7 +335,7 @@ void VideoCaptureController::OnIncomingCapturedFrame(const uint8* data, frame_info_.width, frame_info_.width / 2); break; } -#if !defined(OS_IOS) +#if !defined(OS_IOS) && !defined(OS_ANDROID) case media::VideoCaptureCapability::kMJPEG: { int yplane_stride = frame_info_.width; int uv_plane_stride = (frame_info_.width + 1) / 2; diff --git a/content/content_browser.gypi b/content/content_browser.gypi index 575d278..df1efe3 100644 --- a/content/content_browser.gypi +++ b/content/content_browser.gypi @@ -921,7 +921,6 @@ '../ppapi/ppapi_internal.gyp:ppapi_ipc', '../printing/printing.gyp:printing', '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit', - '../third_party/libyuv/libyuv.gyp:libyuv', '../ui/surface/surface.gyp:surface', '../webkit/support/webkit_support.gyp:webkit_resources', '../webkit/support/webkit_support.gyp:webkit_storage', @@ -933,6 +932,11 @@ '../sandbox/sandbox.gyp:sandbox', ], }], + ['OS!="android" and OS!="ios"', { + 'dependencies': [ + '../third_party/libyuv/libyuv.gyp:libyuv', + ], + }], ['enable_webrtc==1', { 'sources': [ 'browser/renderer_host/p2p/socket_host.cc', |