summaryrefslogtreecommitdiffstats
path: root/media/media.gyp
diff options
context:
space:
mode:
authorvrk@google.com <vrk@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-19 19:02:53 +0000
committervrk@google.com <vrk@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-19 19:02:53 +0000
commit948d3c6675d7e22c0fdf7d80ff5a1f8b5a8f2892 (patch)
tree7123343248409e61e6afd0cdaa756baa774c7269 /media/media.gyp
parent976327c504a0f80b09ce7403f8cd653c4a7576ae (diff)
downloadchromium_src-948d3c6675d7e22c0fdf7d80ff5a1f8b5a8f2892.zip
chromium_src-948d3c6675d7e22c0fdf7d80ff5a1f8b5a8f2892.tar.gz
chromium_src-948d3c6675d7e22c0fdf7d80ff5a1f8b5a8f2892.tar.bz2
Consolidate AudioRendererAlgorithm classes into one class
There's no reason to have 2 derived classes of AudioRendererAlgorithmBase. This CL deletes the derived classes and pushes the behavior into the base class. It shouldn't change any existing logic; should be just pushing things around. BUG=106492 TEST=media_unittests Review URL: http://codereview.chromium.org/8879041 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@115006 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/media.gyp')
-rw-r--r--media/media.gyp17
1 files changed, 1 insertions, 16 deletions
diff --git a/media/media.gyp b/media/media.gyp
index 3fba5d5..27b9dd2 100644
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -175,10 +175,6 @@
'filters/audio_file_reader.h',
'filters/audio_renderer_algorithm_base.cc',
'filters/audio_renderer_algorithm_base.h',
- 'filters/audio_renderer_algorithm_default.cc',
- 'filters/audio_renderer_algorithm_default.h',
- 'filters/audio_renderer_algorithm_ola.cc',
- 'filters/audio_renderer_algorithm_ola.h',
'filters/audio_renderer_base.cc',
'filters/audio_renderer_base.h',
'filters/bitstream_converter.cc',
@@ -615,7 +611,7 @@
'base/video_util_unittest.cc',
'base/yuv_convert_unittest.cc',
'ffmpeg/ffmpeg_common_unittest.cc',
- 'filters/audio_renderer_algorithm_ola_unittest.cc',
+ 'filters/audio_renderer_algorithm_base_unittest.cc',
'filters/audio_renderer_base_unittest.cc',
'filters/bitstream_converter_unittest.cc',
'filters/chunk_demuxer_unittest.cc',
@@ -705,17 +701,6 @@
],
},
{
- 'target_name': 'wav_ola_test',
- 'type': 'executable',
- 'dependencies': [
- 'media',
- '../base/base.gyp:base',
- ],
- 'sources': [
- 'tools/wav_ola_test/wav_ola_test.cc'
- ],
- },
- {
'target_name': 'qt_faststart',
'type': 'executable',
'sources': [