Benchmark tool for GPU-accelerated video rendering

media/media.gyp

Index: media/media.gyp
diff --git a/media/media.gyp b/media/media.gyp
index e1296234b805ebf969a9633d47f41b5b6175f11b..9cd885fd76da6d46c23fe81e20741f60ab0f752e 100644
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -80,8 +80,6 @@
         'base/filters.cc',
         'base/filters.h',
         'base/media.h',
-        'base/media_filter_collection.cc',

[Alpha Left Google, 2010/11/29 20:06:13]

This file is still not merged correctly. You may have to fix this diff manually.

-        'base/media_filter_collection.h',
         'base/media_format.cc',
         'base/media_format.h',
         'base/media_posix.cc',
@@ -95,8 +93,6 @@
         'base/pts_heap.h',
         'base/seekable_buffer.cc',
         'base/seekable_buffer.h',
-        'base/state_matrix.cc',
-        'base/state_matrix.h',
         'base/video_frame.cc',
         'base/video_frame.h',
         'base/yuv_convert.cc',
@@ -264,7 +260,6 @@
         'base/clock_impl_unittest.cc',
         'base/data_buffer_unittest.cc',
         'base/djb2_unittest.cc',
-        'base/media_filter_collection_unittest.cc',
         'base/mock_ffmpeg.cc',
         'base/mock_ffmpeg.h',
         'base/mock_filter_host.h',
@@ -276,7 +271,6 @@
         'base/pts_heap_unittest.cc',
         'base/run_all_unittests.cc',
         'base/seekable_buffer_unittest.cc',
-        'base/state_matrix_unittest.cc',
         'base/video_frame_unittest.cc',
         'base/yuv_convert_unittest.cc',
         'filters/audio_renderer_algorithm_ola_unittest.cc',
@@ -352,6 +346,49 @@
       ],
     },
     {
+      'target_name': 'shader_bench',
+      'type': 'executable',
+      'dependencies': [
+        'media',
+        '../app/app.gyp:app_base',
+        '../gpu/gpu.gyp:*',
+      ],
+      'sources': [
+        'tools/shader_bench/shader_bench.cc',
+        'tools/shader_bench/cpu_color_painter.cc',
+        'tools/shader_bench/cpu_color_painter.h',
+        'tools/shader_bench/gpu_color_painter.cc',
+        'tools/shader_bench/gpu_color_painter.h',
+        'tools/shader_bench/gpu_color_painter_exp.cc',
+        'tools/shader_bench/gpu_color_painter_exp.h',
+        'tools/shader_bench/gpu_painter.cc',
+        'tools/shader_bench/gpu_painter.h',
+        'tools/shader_bench/painter.cc',
+        'tools/shader_bench/painter.h',
+        'tools/shader_bench/window.cc',
+        'tools/shader_bench/window.h',
+      ],
+      'conditions': [
+        ['OS=="linux"', {
+          'dependencies': [
+            '../build/linux/system.gyp:gtk',
+          ],
+          'sources': [
+            'tools/shader_bench/window_linux.cc',
+          ],
+        }],
+        ['OS=="win"', {
+          'dependencies': [
+            '../third_party/angle/src/build_angle.gyp:libEGL',
+            '../third_party/angle/src/build_angle.gyp:libGLESv2',
+          ],
+          'sources': [
+            'tools/shader_bench/window_win.cc',
+          ],
+        }],
+      ]
+    },
+    {
       'target_name': 'ffmpeg_tests',
       'type': 'executable',
       'dependencies': [