Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(670)

Unified Diff: media/media.gyp

Issue 11234071: Moved SkCanvasVideoRenderer to media/filters. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Added MEDIA_EXPORT. Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/filters/skcanvas_video_renderer_unittest.cc ('k') | skia/config/win/stdint.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/media.gyp
diff --git a/media/media.gyp b/media/media.gyp
index ca6f97b603b68a02f4f209cfaf8b47d0563b5b9e..633914ef490ec85fdbbf89f571ba3dbb38119ba5 100644
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -26,6 +26,7 @@
'../base/base.gyp:base',
'../build/temp_gyp/googleurl.gyp:googleurl',
'../crypto/crypto.gyp:crypto',
+ '../skia/skia.gyp:skia',
'../ui/ui.gyp:ui',
],
'defines': [
@@ -278,6 +279,8 @@
'filters/h264_to_annex_b_bitstream_converter.h',
'filters/in_memory_url_protocol.cc',
'filters/in_memory_url_protocol.h',
+ 'filters/skcanvas_video_renderer.cc',
+ 'filters/skcanvas_video_renderer.h',
'filters/source_buffer_stream.cc',
'filters/source_buffer_stream.h',
'filters/video_frame_generator.cc',
@@ -431,7 +434,6 @@
# A simple WebM encoder for animated avatars on ChromeOS.
['chromeos==1', {
'dependencies': [
- '../skia/skia.gyp:skia',
'../third_party/libvpx/libvpx.gyp:libvpx',
'../third_party/libyuv/libyuv.gyp:libyuv',
],
@@ -586,6 +588,7 @@
'../base/base.gyp:base',
'../base/base.gyp:base_i18n',
'../base/base.gyp:test_support_base',
+ '../skia/skia.gyp:skia',
'../testing/gmock.gyp:gmock',
'../testing/gtest.gyp:gtest',
'../ui/ui.gyp:ui',
@@ -657,6 +660,7 @@
'filters/h264_to_annex_b_bitstream_converter_unittest.cc',
'filters/pipeline_integration_test.cc',
'filters/pipeline_integration_test_base.cc',
+ 'filters/skcanvas_video_renderer_unittest.cc',
'filters/source_buffer_stream_unittest.cc',
'filters/video_renderer_base_unittest.cc',
'video/capture/video_capture_device_unittest.cc',
« no previous file with comments | « media/filters/skcanvas_video_renderer_unittest.cc ('k') | skia/config/win/stdint.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698