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

Side by Side Diff: media/media.gyp

Issue 160497: Reimplement the AlsaPcmOutputStream and fix the threading issues. (Closed)
Patch Set: Address Andrew's comments. Diff aginst Patch 8 please. Created 11 years, 4 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 unified diff | Download patch
« no previous file with comments | « media/audio/linux/audio_manager_linux.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2009 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 }, 8 },
9 'includes': [ 9 'includes': [
10 '../build/common.gypi', 10 '../build/common.gypi',
(...skipping 20 matching lines...) Expand all
31 'sources': [ 31 'sources': [
32 'audio/audio_output.h', 32 'audio/audio_output.h',
33 'audio/audio_util.cc', 33 'audio/audio_util.cc',
34 'audio/audio_util.h', 34 'audio/audio_util.h',
35 'audio/fake_audio_output_stream.cc', 35 'audio/fake_audio_output_stream.cc',
36 'audio/fake_audio_output_stream.h', 36 'audio/fake_audio_output_stream.h',
37 'audio/linux/audio_manager_linux.cc', 37 'audio/linux/audio_manager_linux.cc',
38 'audio/linux/audio_manager_linux.h', 38 'audio/linux/audio_manager_linux.h',
39 'audio/linux/alsa_output.cc', 39 'audio/linux/alsa_output.cc',
40 'audio/linux/alsa_output.h', 40 'audio/linux/alsa_output.h',
41 'audio/linux/alsa_wrapper.cc',
42 'audio/linux/alsa_wrapper.h',
41 'audio/mac/audio_manager_mac.cc', 43 'audio/mac/audio_manager_mac.cc',
42 'audio/mac/audio_manager_mac.h', 44 'audio/mac/audio_manager_mac.h',
43 'audio/mac/audio_output_mac.cc', 45 'audio/mac/audio_output_mac.cc',
44 'audio/mac/audio_output_mac.h', 46 'audio/mac/audio_output_mac.h',
45 'audio/simple_sources.cc', 47 'audio/simple_sources.cc',
46 'audio/simple_sources.h', 48 'audio/simple_sources.h',
47 'audio/win/audio_manager_win.h', 49 'audio/win/audio_manager_win.h',
48 'audio/win/audio_output_win.cc', 50 'audio/win/audio_output_win.cc',
49 'audio/win/waveout_output_win.cc', 51 'audio/win/waveout_output_win.cc',
50 'audio/win/waveout_output_win.h', 52 'audio/win/waveout_output_win.h',
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
146 'msvs_guid': 'C8C6183C-B03C-11DD-B471-DFD256D89593', 148 'msvs_guid': 'C8C6183C-B03C-11DD-B471-DFD256D89593',
147 'dependencies': [ 149 'dependencies': [
148 'media', 150 'media',
149 '../base/base.gyp:base', 151 '../base/base.gyp:base',
150 '../testing/gmock.gyp:gmock', 152 '../testing/gmock.gyp:gmock',
151 '../testing/gtest.gyp:gtest', 153 '../testing/gtest.gyp:gtest',
152 '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg', 154 '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
153 ], 155 ],
154 'sources': [ 156 'sources': [
155 'audio/audio_util_unittest.cc', 157 'audio/audio_util_unittest.cc',
158 'audio/linux/alsa_output_unittest.cc',
156 'audio/mac/audio_output_mac_unittest.cc', 159 'audio/mac/audio_output_mac_unittest.cc',
157 'audio/simple_sources_unittest.cc', 160 'audio/simple_sources_unittest.cc',
158 'audio/win/audio_output_win_unittest.cc', 161 'audio/win/audio_output_win_unittest.cc',
159 'base/buffer_queue_unittest.cc', 162 'base/buffer_queue_unittest.cc',
160 'base/clock_impl_unittest.cc', 163 'base/clock_impl_unittest.cc',
161 'base/data_buffer_unittest.cc', 164 'base/data_buffer_unittest.cc',
162 'base/mock_ffmpeg.cc', 165 'base/mock_ffmpeg.cc',
163 'base/mock_ffmpeg.h', 166 'base/mock_ffmpeg.h',
164 'base/mock_filter_host.h', 167 'base/mock_filter_host.h',
165 'base/mock_filters.cc', 168 'base/mock_filters.cc',
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
251 'msvs_settings': { 254 'msvs_settings': {
252 'VCLinkerTool': { 255 'VCLinkerTool': {
253 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS 256 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS
254 }, 257 },
255 }, 258 },
256 }, 259 },
257 ], 260 ],
258 }], 261 }],
259 ], 262 ],
260 } 263 }
OLDNEW
« no previous file with comments | « media/audio/linux/audio_manager_linux.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698