chromium/src
0
Fork 0
Code Activity

media: Move audio_parameters and audio_point to media/base/

Browse Source 
These 2 files are used in lots of places and should be in media/base/
to clean up some dependency issues (as noted by gn check).

BUG=599578
TEST=compiles with gn and gyp

Review URL: https://codereview.chromium.org/1907973003

Cr-Commit-Position: refs/heads/master@{#389216}
This commit is contained in:
jrummell
2016-04-22 12:54:27 -07:00
committed by Commit bot
parent 03a223eedb
commit 37a54c0afb
137 changed files with 376 additions and 375 deletions
chrome
browser
copresence
chrome_whispernet_client.ccchrome_whispernet_client_browsertest.cc
media
webrtc_audio_quality_browsertest.ccwebrtc_browsertest_audio.cc
renderer
extensions
cast_streaming_native_handler.cc
media
cast_receiver_audio_valve.cccast_rtp_stream.cc
chromecast/media/audio
cast_audio_output_stream.h
components/audio_modem
audio_player_impl.ccaudio_recorder.haudio_recorder_impl.h
content
browser
media
capture
audio_mirroring_manager_unittest.cc
media_internals.ccmedia_internals_unittest.cc
renderer_host
media
audio_input_debug_writer.haudio_input_device_manager.ccaudio_input_sync_writer.haudio_input_sync_writer_unittest.ccaudio_output_device_enumerator.haudio_sync_reader.ccmedia_stream_manager.cc
render_message_filter.ccrender_message_filter.h
common
media
audio_messages.hmedia_param_traits.cc
speech_recognition_messages.hview_messages.h
public
common
DEPSmedia_stream_request.h
renderer
media
audio_renderer_mixer_manager.haudio_renderer_mixer_manager_unittest.ccaudio_track_recorder.ccmedia_recorder_handler.ccmedia_stream_audio_processor.ccmedia_stream_audio_processor_options.ccmedia_stream_audio_processor_unittest.ccmedia_stream_audio_sink_owner.ccmedia_stream_audio_track_sink.hmedia_stream_dispatcher.ccmedia_stream_dispatcher_unittest.ccmedia_stream_track.hrenderer_webaudiodevice_impl.hspeech_recognition_audio_sink.ccspeech_recognition_audio_sink.hspeech_recognition_audio_sink_unittest.ccwebaudio_capturer_source.h
webrtc
webrtc_audio_sink_adapter.h
webrtc_audio_capturer_unittest.ccwebrtc_audio_device_impl.ccwebrtc_audio_renderer.ccwebrtc_local_audio_source_provider.ccwebrtc_local_audio_source_provider_unittest.ccwebrtc_local_audio_track.hwebrtc_local_audio_track_unittest.cc
pepper
pepper_media_stream_audio_track_host.hpepper_platform_audio_input.h
shell
renderer
layout_test
blink_test_runner.cc
media
BUILD.gn
audio
BUILD.gn
alsa
alsa_input.halsa_output.haudio_manager_alsa.cc
android
audio_manager_android.ccaudio_record_input.hopensles_input.hopensles_output.h
audio_device_thread.haudio_input_controller.haudio_input_device.haudio_input_ipc.haudio_manager.haudio_output_controller_unittest.ccaudio_output_device.haudio_output_dispatcher.haudio_output_dispatcher_impl.haudio_output_ipc.haudio_output_proxy.haudio_output_resampler.haudio_parameters_unittest.cc
cras
cras_input.hcras_unified.h
fake_audio_input_stream.hfake_audio_output_stream.hfake_audio_worker.ccfake_audio_worker_unittest.cc
mac
audio_auhal_mac.haudio_input_mac.haudio_low_latency_input_mac.haudio_manager_mac.cc
mock_audio_manager.cc
pulse
audio_manager_pulse.ccpulse_input.hpulse_output.hpulse_util.cc
simple_sources_unittest.cc
sounds
audio_stream_handler.h
test_audio_input_controller_factory.hvirtual_audio_input_stream.hvirtual_audio_output_stream.h
win
audio_low_latency_input_win.haudio_low_latency_output_win.haudio_manager_win.cccore_audio_util_win.hwavein_input_win.hwaveout_output_win.h
base
BUILD.gnaudio_buffer_converter.haudio_bus.ccaudio_bus_unittest.ccaudio_capturer_source.haudio_converter.haudio_hardware_config.haudio_hardware_config_unittest.ccaudio_parameters.ccaudio_parameters.haudio_parameters_unittest.ccaudio_point.ccaudio_point.haudio_point_unittest.ccaudio_renderer_sink.haudio_splicer.hchannel_mixer.ccchannel_mixer_unittest.ccfake_audio_renderer_sink.hmock_audio_renderer_sink.houtput_device_info.htest_helpers.h
blink
webaudiosourceprovider_impl_unittest.cc
cast
test
fake_media_source.hreceiver.cc
filters
audio_renderer_algorithm.h
media.gyp
muxers
webm_muxer.ccwebm_muxer_unittest.cc
shared_memory_support.gypi
ppapi
proxy
audio_input_resource.cc
shared_impl
ppb_audio_shared.cc

2
chrome/browser/copresence/chrome_whispernet_client.cc

@ -20,7 +20,7 @@
#include "grit/browser_resources.h"
#include "media/audio/audio_manager.h"
#include "media/audio/audio_manager_base.h"
#include "media/audio/audio_parameters.h"
#include "media/base/audio_parameters.h"
using audio_modem::AUDIBLE;
using audio_modem::AudioType;

2
chrome/browser/copresence/chrome_whispernet_client_browsertest.cc

@ -25,9 +25,9 @@
#include "components/audio_modem/public/whispernet_client.h"
#include "media/audio/audio_manager.h"
#include "media/audio/audio_manager_base.h"
#include "media/audio/audio_parameters.h"
#include "media/base/audio_bus.h"
#include "media/base/audio_converter.h"
#include "media/base/audio_parameters.h"
using audio_modem::WhispernetClient;
using audio_modem::AUDIBLE;

2
chrome/browser/media/webrtc_audio_quality_browsertest.cc

@ -31,7 +31,7 @@
#include "chrome/test/base/ui_test_utils.h"
#include "content/public/common/content_switches.h"
#include "content/public/test/browser_test_utils.h"
#include "media/audio/audio_parameters.h"
#include "media/base/audio_parameters.h"
#include "media/base/media_switches.h"
#include "net/test/embedded_test_server/embedded_test_server.h"
#include "testing/perf/perf_test.h"

2
chrome/browser/media/webrtc_browsertest_audio.cc

@ -8,10 +8,10 @@
#include "base/files/file.h"
#include "base/files/file_path.h"
#include "media/audio/audio_parameters.h"
#include "media/audio/audio_power_monitor.h"
#include "media/audio/sounds/wav_audio_handler.h"
#include "media/base/audio_bus.h"
#include "media/base/audio_parameters.h"
namespace {
// Opens |wav_filename|, reads it and loads it as a wav file. This function will

2
chrome/renderer/extensions/cast_streaming_native_handler.cc

@ -32,7 +32,7 @@
#include "content/public/child/v8_value_converter.h"
#include "content/public/renderer/media_stream_utils.h"
#include "extensions/renderer/script_context.h"
#include "media/audio/audio_parameters.h"
#include "media/base/audio_parameters.h"
#include "net/base/host_port_pair.h"
#include "net/base/ip_address.h"
#include "third_party/WebKit/public/platform/WebMediaStream.h"

2
chrome/renderer/media/cast_receiver_audio_valve.cc

@ -6,7 +6,7 @@
#include "base/bind.h"
#include "base/bind_helpers.h"
#include "media/audio/audio_parameters.h"
#include "media/base/audio_parameters.h"
CastReceiverAudioValve::CastReceiverAudioValve(
const media::AudioParameters& params,

2
chrome/renderer/media/cast_rtp_stream.cc

@ -31,9 +31,9 @@
#include "content/public/renderer/media_stream_video_sink.h"
#include "content/public/renderer/render_thread.h"
#include "content/public/renderer/video_encode_accelerator.h"
#include "media/audio/audio_parameters.h"
#include "media/base/audio_bus.h"
#include "media/base/audio_converter.h"
#include "media/base/audio_parameters.h"
#include "media/base/bind_to_current_loop.h"
#include "media/base/limits.h"
#include "media/base/video_frame.h"

2
chromecast/media/audio/cast_audio_output_stream.h

@ -9,7 +9,7 @@
#include "base/memory/weak_ptr.h"
#include "base/time/time.h"
#include "media/audio/audio_io.h"
#include "media/audio/audio_parameters.h"
#include "media/base/audio_parameters.h"
namespace base {
class SingleThreadTaskRunner;

2
components/audio_modem/audio_player_impl.cc

@ -12,8 +12,8 @@
#include "base/logging.h"
#include "components/audio_modem/public/audio_modem_types.h"
#include "media/audio/audio_manager.h"
#include "media/audio/audio_parameters.h"
#include "media/base/audio_bus.h"
#include "media/base/audio_parameters.h"
namespace {

2
components/audio_modem/audio_recorder.h

@ -10,8 +10,8 @@
#include "base/macros.h"
#include "base/memory/scoped_ptr.h"
#include "media/audio/audio_io.h"
#include "media/audio/audio_parameters.h"
#include "media/base/audio_converter.h"
#include "media/base/audio_parameters.h"
namespace audio_modem {

2
components/audio_modem/audio_recorder_impl.h

@ -14,7 +14,7 @@
#include "base/memory/scoped_ptr.h"
#include "components/audio_modem/audio_recorder.h"
#include "media/audio/audio_io.h"
#include "media/audio/audio_parameters.h"
#include "media/base/audio_parameters.h"
namespace base {
class MessageLoop;

2
content/browser/media/capture/audio_mirroring_manager_unittest.cc

@ -13,7 +13,7 @@
#include "base/message_loop/message_loop.h"
#include "base/synchronization/waitable_event.h"
#include "content/browser/browser_thread_impl.h"
#include "media/audio/audio_parameters.h"
#include "media/base/audio_parameters.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"

2
content/browser/media/media_internals.cc

@ -20,7 +20,7 @@
#include "content/public/browser/render_process_host.h"
#include "content/public/browser/web_contents.h"
#include "content/public/browser/web_ui.h"
#include "media/audio/audio_parameters.h"
#include "media/base/audio_parameters.h"
#include "media/base/media_log_event.h"
#include "media/filters/gpu_video_decoder.h"

2
content/browser/media/media_internals_unittest.cc

@ -14,7 +14,7 @@
#include "base/strings/utf_string_conversions.h"
#include "build/build_config.h"
#include "content/public/test/test_browser_thread_bundle.h"
#include "media/audio/audio_parameters.h"
#include "media/base/audio_parameters.h"
#include "media/base/channel_layout.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "ui/gfx/geometry/size.h"

2
content/browser/renderer_host/media/audio_input_debug_writer.h

@ -16,7 +16,7 @@
#include "base/move.h"
#include "content/common/content_export.h"
#include "media/audio/audio_input_writer.h"
#include "media/audio/audio_parameters.h"
#include "media/base/audio_parameters.h"
namespace media {

2
content/browser/renderer_host/media/audio_input_device_manager.cc

@ -13,7 +13,7 @@
#include "content/public/common/media_stream_request.h"
#include "media/audio/audio_input_ipc.h"
#include "media/audio/audio_manager_base.h"
#include "media/audio/audio_parameters.h"
#include "media/base/audio_parameters.h"
#include "media/base/channel_layout.h"
#if defined(OS_CHROMEOS)

2
content/browser/renderer_host/media/audio_input_sync_writer.h

@ -19,8 +19,8 @@
#include "build/build_config.h"
#include "content/common/content_export.h"
#include "media/audio/audio_input_controller.h"
#include "media/audio/audio_parameters.h"
#include "media/base/audio_bus.h"
#include "media/base/audio_parameters.h"
#if defined(OS_POSIX)
#include "base/file_descriptor_posix.h"

2
content/browser/renderer_host/media/audio_input_sync_writer_unittest.cc

@ -15,8 +15,8 @@
#include "base/time/time.h"
#include "build/build_config.h"
#include "content/public/test/test_browser_thread_bundle.h"
#include "media/audio/audio_parameters.h"
#include "media/base/audio_bus.h"
#include "media/base/audio_parameters.h"
#include "media/base/channel_layout.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"

2
content/browser/renderer_host/media/audio_output_device_enumerator.h

@ -23,7 +23,7 @@
#include "base/memory/weak_ptr.h"
#include "base/threading/thread_checker.h"
#include "content/common/content_export.h"
#include "media/audio/audio_parameters.h"
#include "media/base/audio_parameters.h"
namespace base {
class SingleThreadTaskRunner;

2
content/browser/renderer_host/media/audio_sync_reader.cc

@ -13,7 +13,7 @@
#include "build/build_config.h"
#include "content/browser/renderer_host/media/media_stream_manager.h"
#include "content/public/common/content_switches.h"
#include "media/audio/audio_parameters.h"
#include "media/base/audio_parameters.h"
using media::AudioBus;
using media::AudioOutputBuffer;

2
content/browser/renderer_host/media/media_stream_manager.cc

@ -48,7 +48,7 @@
#include "content/public/common/media_stream_request.h"
#include "crypto/hmac.h"
#include "media/audio/audio_manager_base.h"
#include "media/audio/audio_parameters.h"
#include "media/base/audio_parameters.h"
#include "media/base/channel_layout.h"
#include "media/base/media_switches.h"
#include "media/capture/video/video_capture_device_factory.h"

2
content/browser/renderer_host/render_message_filter.cc

@ -57,7 +57,7 @@
#include "ipc/ipc_platform_file.h"
#include "media/audio/audio_manager.h"
#include "media/audio/audio_manager_base.h"
#include "media/audio/audio_parameters.h"
#include "media/base/audio_parameters.h"
#include "media/base/media_log_event.h"
#include "net/base/io_buffer.h"
#include "net/base/keygen_handler.h"

2
content/browser/renderer_host/render_message_filter.h

@ -26,7 +26,7 @@
#include "content/public/browser/browser_message_filter.h"
#include "gpu/config/gpu_info.h"
#include "ipc/message_filter.h"
#include "media/audio/audio_parameters.h"
#include "media/base/audio_parameters.h"
#include "media/base/channel_layout.h"
#include "third_party/WebKit/public/web/WebPopupType.h"
#include "ui/gfx/geometry/rect.h"

2
content/common/media/audio_messages.h

@ -16,7 +16,7 @@
#include "ipc/ipc_message_macros.h"
#include "media/audio/audio_input_ipc.h"
#include "media/audio/audio_output_ipc.h"
#include "media/audio/audio_parameters.h"
#include "media/base/audio_parameters.h"
#include "media/gpu/ipc/common/media_param_traits.h"
#include "url/origin.h"

4
content/common/media/media_param_traits.cc

@ -8,8 +8,8 @@
#include "content/common/media/audio_messages.h"
#include "content/common/media/video_capture_messages.h"
#include "ipc/ipc_message_utils.h"
#include "media/audio/audio_parameters.h"
#include "media/audio/point.h"
#include "media/base/audio_parameters.h"
#include "media/base/audio_point.h"
#include "media/base/limits.h"
#include "ui/gfx/ipc/gfx_param_traits.h"
#include "ui/gfx/ipc/skia/gfx_skia_param_traits.h"

2
content/common/speech_recognition_messages.h

@ -15,7 +15,7 @@
#include "content/public/common/speech_recognition_result.h"
#include "ipc/ipc_message_macros.h"
#include "ipc/ipc_param_traits.h"
#include "media/audio/audio_parameters.h"
#include "media/base/audio_parameters.h"
#include "ui/gfx/geometry/rect.h"
#define IPC_MESSAGE_START SpeechRecognitionMsgStart

2
content/common/view_messages.h

@ -38,7 +38,7 @@
#include "content/public/common/window_container_type.h"
#include "ipc/ipc_channel_handle.h"
#include "ipc/ipc_message_macros.h"
#include "media/audio/audio_parameters.h"
#include "media/base/audio_parameters.h"
#include "media/base/channel_layout.h"
#include "media/base/media_log_event.h"
#include "net/base/network_change_notifier.h"

2
content/public/common/DEPS

@ -3,6 +3,6 @@ specific_include_rules = {
"+content/common",
],
"media_stream_request.h": [
"+media/audio/audio_parameters.h",
"+media/base/audio_parameters.h",
]
}

2
content/public/common/media_stream_request.h

@ -14,7 +14,7 @@
#include "base/callback_forward.h"
#include "content/common/content_export.h"
#include "media/audio/audio_parameters.h"
#include "media/base/audio_parameters.h"
#include "ui/gfx/native_widget_types.h"
#include "url/gurl.h"

2
content/renderer/media/audio_renderer_mixer_manager.h

@ -13,7 +13,7 @@
#include "base/synchronization/lock.h"
#include "content/common/content_export.h"
#include "media/audio/audio_manager_base.h"
#include "media/audio/audio_parameters.h"
#include "media/base/audio_parameters.h"
#include "media/base/output_device_info.h"
#include "url/origin.h"

2
content/renderer/media/audio_renderer_mixer_manager_unittest.cc

@ -11,8 +11,8 @@
#include "base/memory/ref_counted.h"
#include "content/renderer/media/audio_device_factory.h"
#include "media/audio/audio_manager_base.h"
#include "media/audio/audio_parameters.h"
#include "media/base/audio_capturer_source.h"
#include "media/base/audio_parameters.h"
#include "media/base/audio_renderer_mixer.h"
#include "media/base/audio_renderer_mixer_input.h"
#include "media/base/fake_audio_render_callback.h"

2
content/renderer/media/audio_track_recorder.cc

@ -11,10 +11,10 @@
#include "base/macros.h"
#include "base/stl_util.h"
#include "content/renderer/media/media_stream_audio_track.h"
#include "media/audio/audio_parameters.h"
#include "media/base/audio_bus.h"
#include "media/base/audio_converter.h"
#include "media/base/audio_fifo.h"
#include "media/base/audio_parameters.h"
#include "media/base/bind_to_current_loop.h"
#include "third_party/opus/src/include/opus.h"

2
content/renderer/media/media_recorder_handler.cc

@ -17,8 +17,8 @@
#include "content/renderer/media/media_stream_track.h"
#include "content/renderer/media/video_track_recorder.h"
#include "content/renderer/media/webrtc_uma_histograms.h"
#include "media/audio/audio_parameters.h"
#include "media/base/audio_bus.h"
#include "media/base/audio_parameters.h"
#include "media/base/bind_to_current_loop.h"
#include "media/base/mime_util.h"
#include "media/base/video_frame.h"

2
content/renderer/media/media_stream_audio_processor.cc

@ -17,9 +17,9 @@
#include "content/public/common/content_switches.h"
#include "content/renderer/media/media_stream_audio_processor_options.h"
#include "content/renderer/media/webrtc_audio_device_impl.h"
#include "media/audio/audio_parameters.h"
#include "media/base/audio_converter.h"
#include "media/base/audio_fifo.h"
#include "media/base/audio_parameters.h"
#include "media/base/channel_layout.h"
#include "third_party/WebKit/public/platform/WebMediaConstraints.h"
#include "third_party/webrtc/api/mediaconstraintsinterface.h"

2
content/renderer/media/media_stream_audio_processor_options.cc

@ -20,7 +20,7 @@
#include "content/common/media/media_stream_options.h"
#include "content/renderer/media/media_stream_constraints_util.h"
#include "content/renderer/media/media_stream_source.h"
#include "media/audio/audio_parameters.h"
#include "media/base/audio_parameters.h"
#include "third_party/webrtc/modules/audio_processing/include/audio_processing.h"
#include "third_party/webrtc/modules/audio_processing/typing_detection.h"

2
content/renderer/media/media_stream_audio_processor_unittest.cc

@ -19,8 +19,8 @@
#include "content/renderer/media/media_stream_audio_processor.h"
#include "content/renderer/media/media_stream_audio_processor_options.h"
#include "content/renderer/media/mock_constraint_factory.h"
#include "media/audio/audio_parameters.h"
#include "media/base/audio_bus.h"
#include "media/base/audio_parameters.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "third_party/WebKit/public/platform/WebMediaConstraints.h"

2
content/renderer/media/media_stream_audio_sink_owner.cc

@ -5,7 +5,7 @@
#include "content/renderer/media/media_stream_audio_sink_owner.h"
#include "content/public/renderer/media_stream_audio_sink.h"
#include "media/audio/audio_parameters.h"
#include "media/base/audio_parameters.h"
namespace content {

2
content/renderer/media/media_stream_audio_track_sink.h

@ -10,7 +10,7 @@
#include "base/logging.h"
#include "base/memory/ref_counted.h"
#include "base/time/time.h"
#include "media/audio/audio_parameters.h"
#include "media/base/audio_parameters.h"
#include "third_party/WebKit/public/platform/WebMediaStreamSource.h"
namespace media {

2
content/renderer/media/media_stream_dispatcher.cc

@ -10,7 +10,7 @@
#include "content/common/media/media_stream_messages.h"
#include "content/renderer/media/media_stream_dispatcher_eventhandler.h"
#include "content/renderer/render_thread_impl.h"
#include "media/audio/audio_parameters.h"
#include "media/base/audio_parameters.h"
#include "third_party/WebKit/public/web/WebUserGestureIndicator.h"
#include "url/gurl.h"

2
content/renderer/media/media_stream_dispatcher_unittest.cc

@ -15,7 +15,7 @@
#include "content/common/media/media_stream_messages.h"
#include "content/public/common/media_stream_request.h"
#include "content/renderer/media/media_stream_dispatcher_eventhandler.h"
#include "media/audio/audio_parameters.h"
#include "media/base/audio_parameters.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "url/gurl.h"

2
content/renderer/media/media_stream_track.h

@ -9,7 +9,7 @@
#include "base/macros.h"
#include "base/threading/thread_checker.h"
#include "content/common/content_export.h"
#include "media/audio/audio_parameters.h"
#include "media/base/audio_parameters.h"
#include "third_party/WebKit/public/platform/WebMediaStreamTrack.h"
namespace content {

2
content/renderer/media/renderer_webaudiodevice_impl.h

@ -11,7 +11,7 @@
#include "base/macros.h"
#include "base/memory/ref_counted.h"
#include "base/threading/thread_checker.h"
#include "media/audio/audio_parameters.h"
#include "media/base/audio_parameters.h"
#include "media/base/audio_renderer_sink.h"
#include "third_party/WebKit/public/platform/WebAudioDevice.h"
#include "third_party/WebKit/public/platform/WebVector.h"

2
content/renderer/media/speech_recognition_audio_sink.cc

@ -11,8 +11,8 @@
#include "base/memory/shared_memory.h"
#include "base/time/time.h"
#include "content/renderer/media/media_stream_audio_source.h"
#include "media/audio/audio_parameters.h"
#include "media/base/audio_fifo.h"
#include "media/base/audio_parameters.h"
namespace content {

2
content/renderer/media/speech_recognition_audio_sink.h

@ -16,8 +16,8 @@
#include "base/threading/thread_checker.h"
#include "content/common/content_export.h"
#include "content/public/renderer/media_stream_audio_sink.h"
#include "media/audio/audio_parameters.h"
#include "media/base/audio_converter.h"
#include "media/base/audio_parameters.h"
#include "third_party/WebKit/public/platform/WebMediaStreamTrack.h"
namespace media {

2
content/renderer/media/speech_recognition_audio_sink_unittest.cc

@ -15,8 +15,8 @@
#include "content/renderer/media/media_stream_audio_source.h"
#include "content/renderer/media/webrtc/webrtc_local_audio_track_adapter.h"
#include "content/renderer/media/webrtc_local_audio_track.h"
#include "media/audio/audio_parameters.h"
#include "media/base/audio_bus.h"
#include "media/base/audio_parameters.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "third_party/WebKit/public/platform/WebMediaStreamTrack.h"

2
content/renderer/media/webaudio_capturer_source.h

@ -11,9 +11,9 @@
#include "base/synchronization/lock.h"
#include "base/threading/thread_checker.h"
#include "base/time/time.h"
#include "media/audio/audio_parameters.h"
#include "media/base/audio_bus.h"
#include "media/base/audio_capturer_source.h"
#include "media/base/audio_parameters.h"
#include "media/base/audio_push_fifo.h"
#include "third_party/WebKit/public/platform/WebAudioDestinationConsumer.h"
#include "third_party/WebKit/public/platform/WebMediaStreamSource.h"

2
content/renderer/media/webrtc/webrtc_audio_sink_adapter.h

@ -11,7 +11,7 @@
#include "base/macros.h"
#include "content/public/renderer/media_stream_audio_sink.h"
#include "media/audio/audio_parameters.h"
#include "media/base/audio_parameters.h"
namespace webrtc {
class AudioTrackSinkInterface;

2
content/renderer/media/webrtc_audio_capturer_unittest.cc

@ -9,8 +9,8 @@
#include "content/renderer/media/webrtc/webrtc_local_audio_track_adapter.h"
#include "content/renderer/media/webrtc_audio_capturer.h"
#include "content/renderer/media/webrtc_local_audio_track.h"
#include "media/audio/audio_parameters.h"
#include "media/base/audio_bus.h"
#include "media/base/audio_parameters.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "third_party/WebKit/public/platform/WebMediaConstraints.h"

2
content/renderer/media/webrtc_audio_device_impl.cc

@ -12,8 +12,8 @@
#include "content/renderer/media/webrtc_audio_capturer.h"
#include "content/renderer/media/webrtc_audio_renderer.h"
#include "content/renderer/render_thread_impl.h"
#include "media/audio/audio_parameters.h"
#include "media/audio/sample_rates.h"
#include "media/base/audio_parameters.h"
using media::AudioParameters;
using media::ChannelLayout;

2
content/renderer/media/webrtc_audio_renderer.cc

@ -18,9 +18,9 @@
#include "content/renderer/media/webrtc_audio_device_impl.h"
#include "content/renderer/media/webrtc_logging.h"
#include "content/renderer/render_frame_impl.h"
#include "media/audio/audio_parameters.h"
#include "media/audio/sample_rates.h"
#include "media/base/audio_capturer_source.h"
#include "media/base/audio_parameters.h"
#include "third_party/WebKit/public/platform/WebMediaStreamTrack.h"
#include "third_party/webrtc/api/mediastreaminterface.h"
#include "third_party/webrtc/media/base/audiorenderer.h"

2
content/renderer/media/webrtc_local_audio_source_provider.cc

@ -6,9 +6,9 @@
#include "base/logging.h"
#include "content/renderer/render_thread_impl.h"
#include "media/audio/audio_parameters.h"
#include "media/base/audio_fifo.h"
#include "media/base/audio_hardware_config.h"
#include "media/base/audio_parameters.h"
#include "third_party/WebKit/public/platform/WebAudioSourceProviderClient.h"
using blink::WebVector;

2
content/renderer/media/webrtc_local_audio_source_provider_unittest.cc

@ -8,8 +8,8 @@
#include "content/renderer/media/webrtc/webrtc_local_audio_track_adapter.h"
#include "content/renderer/media/webrtc_local_audio_source_provider.h"
#include "content/renderer/media/webrtc_local_audio_track.h"
#include "media/audio/audio_parameters.h"
#include "media/base/audio_bus.h"
#include "media/base/audio_parameters.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "third_party/WebKit/public/platform/WebMediaStreamTrack.h"
#include "third_party/WebKit/public/platform/WebString.h"

2
content/renderer/media/webrtc_local_audio_track.h

@ -15,7 +15,7 @@
#include "content/renderer/media/media_stream_audio_track.h"
#include "content/renderer/media/tagged_list.h"
#include "content/renderer/media/webrtc/webrtc_local_audio_track_adapter.h"
#include "media/audio/audio_parameters.h"
#include "media/base/audio_parameters.h"
namespace media {
class AudioBus;

2
content/renderer/media/webrtc_local_audio_track_unittest.cc

@ -12,9 +12,9 @@
#include "content/renderer/media/webrtc/webrtc_local_audio_track_adapter.h"
#include "content/renderer/media/webrtc_audio_capturer.h"
#include "content/renderer/media/webrtc_local_audio_track.h"
#include "media/audio/audio_parameters.h"
#include "media/base/audio_bus.h"
#include "media/base/audio_capturer_source.h"
#include "media/base/audio_parameters.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "third_party/WebKit/public/platform/WebMediaConstraints.h"

2
content/renderer/pepper/pepper_media_stream_audio_track_host.h

@ -17,7 +17,7 @@
#include "base/threading/thread_checker.h"
#include "content/public/renderer/media_stream_audio_sink.h"
#include "content/renderer/pepper/pepper_media_stream_track_host_base.h"
#include "media/audio/audio_parameters.h"
#include "media/base/audio_parameters.h"
#include "ppapi/host/host_message_context.h"
#include "ppapi/shared_impl/media_stream_audio_track_shared.h"
#include "third_party/WebKit/public/platform/WebMediaStreamTrack.h"

2
content/renderer/pepper/pepper_platform_audio_input.h

@ -13,7 +13,7 @@
#include "base/memory/ref_counted.h"
#include "base/memory/weak_ptr.h"
#include "media/audio/audio_input_ipc.h"
#include "media/audio/audio_parameters.h"
#include "media/base/audio_parameters.h"
class GURL;

2
content/shell/renderer/layout_test/blink_test_runner.cc

@ -53,8 +53,8 @@
#include "content/shell/renderer/layout_test/blink_test_helpers.h"
#include "content/shell/renderer/layout_test/layout_test_render_thread_observer.h"
#include "content/shell/renderer/layout_test/leak_detector.h"
#include "media/audio/audio_parameters.h"
#include "media/base/audio_capturer_source.h"
#include "media/base/audio_parameters.h"
#include "media/base/video_capturer_source.h"
#include "net/base/filename_util.h"
#include "net/base/net_errors.h"

10
media/BUILD.gn

@ -749,15 +749,15 @@ source_set("test_support") {
]
}
# TODO(dalecurtis): How to split this across audio/base directories??
# TODO(jrummell): This should be renamed and moved to media/base/BUILD.gn.
component("shared_memory_support") {
sources = [
"audio/audio_parameters.cc",
"audio/audio_parameters.h",
"audio/point.cc",
"audio/point.h",
"base/audio_bus.cc",
"base/audio_bus.h",
"base/audio_parameters.cc",
"base/audio_parameters.h",
"base/audio_point.cc",
"base/audio_point.h",
"base/channel_layout.cc",
"base/channel_layout.h",
"base/limits.h",

2
media/audio/BUILD.gn

@ -292,11 +292,9 @@ source_set("unittests") {
"audio_output_controller_unittest.cc",
"audio_output_device_unittest.cc",
"audio_output_proxy_unittest.cc",
"audio_parameters_unittest.cc",
"audio_power_monitor_unittest.cc",
"audio_streams_tracker_unittest.cc",
"fake_audio_worker_unittest.cc",
"point_unittest.cc",
"simple_sources_unittest.cc",
"virtual_audio_input_stream_unittest.cc",
"virtual_audio_output_stream_unittest.cc",

2
media/audio/alsa/alsa_input.h

@ -17,7 +17,7 @@
#include "base/time/time.h"
#include "media/audio/agc_audio_stream.h"
#include "media/audio/audio_io.h"
#include "media/audio/audio_parameters.h"
#include "media/base/audio_parameters.h"
namespace media {

2
media/audio/alsa/alsa_output.h

@ -33,7 +33,7 @@
#include "base/memory/weak_ptr.h"
#include "base/time/time.h"
#include "media/audio/audio_io.h"
#include "media/audio/audio_parameters.h"
#include "media/base/audio_parameters.h"
namespace base {
class MessageLoop;

2
media/audio/alsa/audio_manager_alsa.cc

@ -17,7 +17,6 @@
#include "base/process/launch.h"
#include "base/stl_util.h"
#include "media/audio/audio_output_dispatcher.h"
#include "media/audio/audio_parameters.h"
#if defined(USE_CRAS)
#include "media/audio/cras/audio_manager_cras.h"
#endif
@ -27,6 +26,7 @@
#if defined(USE_PULSEAUDIO)
#include "media/audio/pulse/audio_manager_pulse.h"
#endif
#include "media/base/audio_parameters.h"
#include "media/base/channel_layout.h"
#include "media/base/limits.h"
#include "media/base/media_switches.h"

2
media/audio/android/audio_manager_android.cc

@ -18,8 +18,8 @@
#include "media/audio/android/opensles_input.h"
#include "media/audio/android/opensles_output.h"
#include "media/audio/audio_manager.h"
#include "media/audio/audio_parameters.h"
#include "media/audio/fake_audio_input_stream.h"
#include "media/base/audio_parameters.h"
#include "media/base/channel_layout.h"
using base::android::AppendJavaStringArrayToStringVector;

2
media/audio/android/audio_record_input.h

@ -11,7 +11,7 @@
#include "base/macros.h"
#include "base/threading/thread_checker.h"
#include "media/audio/audio_io.h"
#include "media/audio/audio_parameters.h"
#include "media/base/audio_parameters.h"
namespace media {

2
media/audio/android/opensles_input.h

@ -15,7 +15,7 @@
#include "base/threading/thread_checker.h"
#include "media/audio/android/opensles_util.h"
#include "media/audio/audio_io.h"
#include "media/audio/audio_parameters.h"
#include "media/base/audio_parameters.h"
namespace media {

2
media/audio/android/opensles_output.h

@ -16,7 +16,7 @@
#include "base/threading/thread_checker.h"
#include "media/audio/android/opensles_util.h"
#include "media/audio/audio_io.h"
#include "media/audio/audio_parameters.h"
#include "media/base/audio_parameters.h"
namespace media {

2
media/audio/audio_device_thread.h

@ -13,7 +13,7 @@
#include "base/memory/shared_memory.h"
#include "base/sync_socket.h"
#include "base/synchronization/lock.h"
#include "media/audio/audio_parameters.h"
#include "media/base/audio_parameters.h"
#include "media/base/media_export.h"
namespace base {

2
media/audio/audio_input_controller.h

@ -23,8 +23,8 @@
#include "build/build_config.h"
#include "media/audio/audio_io.h"
#include "media/audio/audio_manager_base.h"
#include "media/audio/audio_parameters.h"
#include "media/base/audio_bus.h"
#include "media/base/audio_parameters.h"
// An AudioInputController controls an AudioInputStream and records data
// from this input stream. The two main methods are Record() and Close() and

2
media/audio/audio_input_device.h

@ -61,9 +61,9 @@
#include "base/memory/shared_memory.h"
#include "media/audio/audio_device_thread.h"
#include "media/audio/audio_input_ipc.h"
#include "media/audio/audio_parameters.h"
#include "media/audio/scoped_task_runner_observer.h"
#include "media/base/audio_capturer_source.h"
#include "media/base/audio_parameters.h"
#include "media/base/media_export.h"
namespace media {

2
media/audio/audio_input_ipc.h

@ -9,7 +9,7 @@
#include "base/memory/shared_memory.h"
#include "base/sync_socket.h"
#include "media/audio/audio_parameters.h"
#include "media/base/audio_parameters.h"
#include "media/base/media_export.h"
namespace media {

2
media/audio/audio_manager.h

@ -15,7 +15,7 @@
#include "build/build_config.h"
#include "media/audio/audio_device_name.h"
#include "media/audio/audio_logging.h"
#include "media/audio/audio_parameters.h"
#include "media/base/audio_parameters.h"
namespace base {
class SingleThreadTaskRunner;

2
media/audio/audio_output_controller_unittest.cc

@ -15,8 +15,8 @@
#include "base/thread_task_runner_handle.h"
#include "media/audio/audio_manager_base.h"
#include "media/audio/audio_output_controller.h"
#include "media/audio/audio_parameters.h"
#include "media/base/audio_bus.h"
#include "media/base/audio_parameters.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"

2
media/audio/audio_output_device.h

@ -71,8 +71,8 @@
#include "base/synchronization/waitable_event.h"
#include "media/audio/audio_device_thread.h"
#include "media/audio/audio_output_ipc.h"
#include "media/audio/audio_parameters.h"
#include "media/audio/scoped_task_runner_observer.h"
#include "media/base/audio_parameters.h"
#include "media/base/audio_renderer_sink.h"
#include "media/base/media_export.h"
#include "media/base/output_device_info.h"

2
media/audio/audio_output_dispatcher.h

@ -22,7 +22,7 @@
#include "base/memory/ref_counted.h"
#include "media/audio/audio_io.h"
#include "media/audio/audio_manager.h"
#include "media/audio/audio_parameters.h"
#include "media/base/audio_parameters.h"
namespace base {
class SingleThreadTaskRunner;

2
media/audio/audio_output_dispatcher_impl.h

@ -25,7 +25,7 @@
#include "media/audio/audio_logging.h"
#include "media/audio/audio_manager.h"
#include "media/audio/audio_output_dispatcher.h"
#include "media/audio/audio_parameters.h"
#include "media/base/audio_parameters.h"
namespace media {

2
media/audio/audio_output_ipc.h

@ -9,7 +9,7 @@
#include "base/memory/shared_memory.h"
#include "base/sync_socket.h"
#include "media/audio/audio_parameters.h"
#include "media/base/audio_parameters.h"
#include "media/base/media_export.h"
#include "media/base/output_device_info.h"
#include "url/origin.h"

2
media/audio/audio_output_proxy.h

@ -10,7 +10,7 @@
#include "base/memory/ref_counted.h"
#include "base/threading/non_thread_safe.h"
#include "media/audio/audio_io.h"
#include "media/audio/audio_parameters.h"
#include "media/base/audio_parameters.h"
namespace media {

2
media/audio/audio_output_resampler.h

@ -14,7 +14,7 @@
#include "media/audio/audio_io.h"
#include "media/audio/audio_manager.h"
#include "media/audio/audio_output_dispatcher_impl.h"
#include "media/audio/audio_parameters.h"
#include "media/base/audio_parameters.h"
namespace media {

226
media/audio/audio_parameters_unittest.cc

@ -1,226 +0,0 @@
// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#include <stddef.h>
#include "base/macros.h"
#include "base/strings/string_number_conversions.h"
#include "media/audio/audio_parameters.h"
#include "testing/gtest/include/gtest/gtest.h"
namespace media {
TEST(AudioParameters, Constructor_Default) {
AudioParameters::Format expected_format = AudioParameters::AUDIO_PCM_LINEAR;
int expected_bits = 0;
int expected_channels = 0;
ChannelLayout expected_channel_layout = CHANNEL_LAYOUT_NONE;
int expected_rate = 0;
int expected_samples = 0;
AudioParameters::PlatformEffectsMask expected_effects =
AudioParameters::NO_EFFECTS;
std::vector<Point> expected_mic_positions;
AudioParameters params;
EXPECT_EQ(expected_format, params.format());
EXPECT_EQ(expected_bits, params.bits_per_sample());
EXPECT_EQ(expected_channels, params.channels());
EXPECT_EQ(expected_channel_layout, params.channel_layout());
EXPECT_EQ(expected_rate, params.sample_rate());
EXPECT_EQ(expected_samples, params.frames_per_buffer());
EXPECT_EQ(expected_effects, params.effects());
EXPECT_EQ(expected_mic_positions, params.mic_positions());
}
TEST(AudioParameters, Constructor_ParameterValues) {
AudioParameters::Format expected_format =
AudioParameters::AUDIO_PCM_LOW_LATENCY;
int expected_bits = 16;
int expected_channels = 6;
ChannelLayout expected_channel_layout = CHANNEL_LAYOUT_5_1;
int expected_rate = 44100;
int expected_samples = 880;
AudioParameters params(expected_format, expected_channel_layout,
expected_rate, expected_bits, expected_samples);
EXPECT_EQ(expected_format, params.format());
EXPECT_EQ(expected_bits, params.bits_per_sample());
EXPECT_EQ(expected_channels, params.channels());
EXPECT_EQ(expected_channel_layout, params.channel_layout());
EXPECT_EQ(expected_rate, params.sample_rate());
EXPECT_EQ(expected_samples, params.frames_per_buffer());
}
TEST(AudioParameters, GetBytesPerBuffer) {
EXPECT_EQ(100, AudioParameters(AudioParameters::AUDIO_PCM_LINEAR,
CHANNEL_LAYOUT_MONO, 1000, 8, 100)
.GetBytesPerBuffer());
EXPECT_EQ(200, AudioParameters(AudioParameters::AUDIO_PCM_LINEAR,
CHANNEL_LAYOUT_MONO, 1000, 16, 100)
.GetBytesPerBuffer());
EXPECT_EQ(200, AudioParameters(AudioParameters::AUDIO_PCM_LINEAR,
CHANNEL_LAYOUT_STEREO, 1000, 8, 100)
.GetBytesPerBuffer());
EXPECT_EQ(200, AudioParameters(AudioParameters::AUDIO_PCM_LINEAR,
CHANNEL_LAYOUT_MONO, 1000, 8, 200)
.GetBytesPerBuffer());
EXPECT_EQ(800, AudioParameters(AudioParameters::AUDIO_PCM_LINEAR,
CHANNEL_LAYOUT_STEREO, 1000, 16, 200)
.GetBytesPerBuffer());
EXPECT_EQ(300, AudioParameters(AudioParameters::AUDIO_PCM_LINEAR,
CHANNEL_LAYOUT_STEREO_AND_KEYBOARD_MIC,
1000, 8, 100)
.GetBytesPerBuffer());
}
TEST(AudioParameters, GetBytesPerSecond) {
EXPECT_EQ(0, AudioParameters(AudioParameters::AUDIO_PCM_LINEAR,
CHANNEL_LAYOUT_NONE, 0, 0, 0)
.GetBytesPerSecond());
EXPECT_EQ(0, AudioParameters(AudioParameters::AUDIO_PCM_LINEAR,
CHANNEL_LAYOUT_STEREO, 0, 0, 0)
.GetBytesPerSecond());
EXPECT_EQ(0, AudioParameters(AudioParameters::AUDIO_PCM_LINEAR,
CHANNEL_LAYOUT_NONE, 100, 0, 0)
.GetBytesPerSecond());
EXPECT_EQ(0, AudioParameters(AudioParameters::AUDIO_PCM_LINEAR,
CHANNEL_LAYOUT_NONE, 0, 8, 0)
.GetBytesPerSecond());
EXPECT_EQ(200, AudioParameters(AudioParameters::AUDIO_PCM_LINEAR,
CHANNEL_LAYOUT_STEREO, 100, 8, 0)
.GetBytesPerSecond());
}
TEST(AudioParameters, Compare) {
AudioParameters values[] = {
AudioParameters(AudioParameters::AUDIO_PCM_LINEAR, CHANNEL_LAYOUT_MONO,
1000, 8, 100),
AudioParameters(AudioParameters::AUDIO_PCM_LINEAR, CHANNEL_LAYOUT_MONO,
1000, 8, 200),
AudioParameters(AudioParameters::AUDIO_PCM_LINEAR, CHANNEL_LAYOUT_MONO,
1000, 16, 100),
AudioParameters(AudioParameters::AUDIO_PCM_LINEAR, CHANNEL_LAYOUT_MONO,
1000, 16, 200),
AudioParameters(AudioParameters::AUDIO_PCM_LINEAR, CHANNEL_LAYOUT_MONO,
2000, 8, 100),
AudioParameters(AudioParameters::AUDIO_PCM_LINEAR, CHANNEL_LAYOUT_MONO,
2000, 8, 200),
AudioParameters(AudioParameters::AUDIO_PCM_LINEAR, CHANNEL_LAYOUT_MONO,
2000, 16, 100),
AudioParameters(AudioParameters::AUDIO_PCM_LINEAR, CHANNEL_LAYOUT_MONO,
2000, 16, 200),
AudioParameters(AudioParameters::AUDIO_PCM_LINEAR, CHANNEL_LAYOUT_STEREO,
1000, 8, 100),
AudioParameters(AudioParameters::AUDIO_PCM_LINEAR, CHANNEL_LAYOUT_STEREO,
1000, 8, 200),
AudioParameters(AudioParameters::AUDIO_PCM_LINEAR, CHANNEL_LAYOUT_STEREO,
1000, 16, 100),
AudioParameters(AudioParameters::AUDIO_PCM_LINEAR, CHANNEL_LAYOUT_STEREO,
1000, 16, 200),
AudioParameters(AudioParameters::AUDIO_PCM_LINEAR, CHANNEL_LAYOUT_STEREO,
2000, 8, 100),
AudioParameters(AudioParameters::AUDIO_PCM_LINEAR, CHANNEL_LAYOUT_STEREO,
2000, 8, 200),
AudioParameters(AudioParameters::AUDIO_PCM_LINEAR, CHANNEL_LAYOUT_STEREO,
2000, 16, 100),
AudioParameters(AudioParameters::AUDIO_PCM_LINEAR, CHANNEL_LAYOUT_STEREO,
2000, 16, 200),
AudioParameters(AudioParameters::AUDIO_PCM_LINEAR,
CHANNEL_LAYOUT_STEREO_AND_KEYBOARD_MIC, 1000, 8, 100),
AudioParameters(AudioParameters::AUDIO_PCM_LINEAR,
CHANNEL_LAYOUT_STEREO_AND_KEYBOARD_MIC, 1000, 8, 200),
AudioParameters(AudioParameters::AUDIO_PCM_LINEAR,
CHANNEL_LAYOUT_STEREO_AND_KEYBOARD_MIC, 1000, 16, 100),
AudioParameters(AudioParameters::AUDIO_PCM_LINEAR,
CHANNEL_LAYOUT_STEREO_AND_KEYBOARD_MIC, 1000, 16, 200),
AudioParameters(AudioParameters::AUDIO_PCM_LINEAR,
CHANNEL_LAYOUT_STEREO_AND_KEYBOARD_MIC, 2000, 8, 100),
AudioParameters(AudioParameters::AUDIO_PCM_LINEAR,
CHANNEL_LAYOUT_STEREO_AND_KEYBOARD_MIC, 2000, 8, 200),
AudioParameters(AudioParameters::AUDIO_PCM_LINEAR,
CHANNEL_LAYOUT_STEREO_AND_KEYBOARD_MIC, 2000, 16, 100),
AudioParameters(AudioParameters::AUDIO_PCM_LINEAR,
CHANNEL_LAYOUT_STEREO_AND_KEYBOARD_MIC, 2000, 16, 200),
AudioParameters(AudioParameters::AUDIO_PCM_LOW_LATENCY, CHANNEL_LAYOUT_MONO,
1000, 8, 100),
AudioParameters(AudioParameters::AUDIO_PCM_LOW_LATENCY, CHANNEL_LAYOUT_MONO,
1000, 8, 200),
AudioParameters(AudioParameters::AUDIO_PCM_LOW_LATENCY, CHANNEL_LAYOUT_MONO,
1000, 16, 100),
AudioParameters(AudioParameters::AUDIO_PCM_LOW_LATENCY, CHANNEL_LAYOUT_MONO,
1000, 16, 200),
AudioParameters(AudioParameters::AUDIO_PCM_LOW_LATENCY, CHANNEL_LAYOUT_MONO,
2000, 8, 100),
AudioParameters(AudioParameters::AUDIO_PCM_LOW_LATENCY, CHANNEL_LAYOUT_MONO,
2000, 8, 200),
AudioParameters(AudioParameters::AUDIO_PCM_LOW_LATENCY, CHANNEL_LAYOUT_MONO,
2000, 16, 100),
AudioParameters(AudioParameters::AUDIO_PCM_LOW_LATENCY, CHANNEL_LAYOUT_MONO,
2000, 16, 200),
AudioParameters(AudioParameters::AUDIO_PCM_LOW_LATENCY,
CHANNEL_LAYOUT_STEREO, 1000, 8, 100),
AudioParameters(AudioParameters::AUDIO_PCM_LOW_LATENCY,
CHANNEL_LAYOUT_STEREO, 1000, 8, 200),
AudioParameters(AudioParameters::AUDIO_PCM_LOW_LATENCY,
CHANNEL_LAYOUT_STEREO, 1000, 16, 100),
AudioParameters(AudioParameters::AUDIO_PCM_LOW_LATENCY,
CHANNEL_LAYOUT_STEREO, 1000, 16, 200),
AudioParameters(AudioParameters::AUDIO_PCM_LOW_LATENCY,
CHANNEL_LAYOUT_STEREO, 2000, 8, 100),
AudioParameters(AudioParameters::AUDIO_PCM_LOW_LATENCY,
CHANNEL_LAYOUT_STEREO, 2000, 8, 200),
AudioParameters(AudioParameters::AUDIO_PCM_LOW_LATENCY,
CHANNEL_LAYOUT_STEREO, 2000, 16, 100),
AudioParameters(AudioParameters::AUDIO_PCM_LOW_LATENCY,
CHANNEL_LAYOUT_STEREO, 2000, 16, 200),
AudioParameters(AudioParameters::AUDIO_PCM_LOW_LATENCY,
CHANNEL_LAYOUT_STEREO_AND_KEYBOARD_MIC, 1000, 8, 100),
AudioParameters(AudioParameters::AUDIO_PCM_LOW_LATENCY,
CHANNEL_LAYOUT_STEREO_AND_KEYBOARD_MIC, 1000, 8, 200),
AudioParameters(AudioParameters::AUDIO_PCM_LOW_LATENCY,
CHANNEL_LAYOUT_STEREO_AND_KEYBOARD_MIC, 1000, 16, 100),
AudioParameters(AudioParameters::AUDIO_PCM_LOW_LATENCY,
CHANNEL_LAYOUT_STEREO_AND_KEYBOARD_MIC, 1000, 16, 200),
AudioParameters(AudioParameters::AUDIO_PCM_LOW_LATENCY,
CHANNEL_LAYOUT_STEREO_AND_KEYBOARD_MIC, 2000, 8, 100),
AudioParameters(AudioParameters::AUDIO_PCM_LOW_LATENCY,
CHANNEL_LAYOUT_STEREO_AND_KEYBOARD_MIC, 2000, 8, 200),
AudioParameters(AudioParameters::AUDIO_PCM_LOW_LATENCY,
CHANNEL_LAYOUT_STEREO_AND_KEYBOARD_MIC, 2000, 16, 100),
AudioParameters(AudioParameters::AUDIO_PCM_LOW_LATENCY,
CHANNEL_LAYOUT_STEREO_AND_KEYBOARD_MIC, 2000, 16, 200),
};
for (size_t i = 0; i < arraysize(values); ++i) {
for (size_t j = 0; j < arraysize(values); ++j) {
SCOPED_TRACE("i=" + base::SizeTToString(i) + " j=" +
base::SizeTToString(j));
EXPECT_EQ(i < j, values[i] < values[j]);
}
// Verify that a value is never less than itself.
EXPECT_FALSE(values[i] < values[i]);
}
}
TEST(AudioParameters, Constructor_ValidChannelCounts) {
int expected_channels = 8;
ChannelLayout expected_layout = CHANNEL_LAYOUT_DISCRETE;
AudioParameters params(AudioParameters::AUDIO_PCM_LOW_LATENCY,
expected_layout, 44100, 16, 880);
params.set_channels_for_discrete(expected_channels);
EXPECT_EQ(expected_channels, params.channels());
EXPECT_EQ(expected_layout, params.channel_layout());
EXPECT_TRUE(params.IsValid());
}
} // namespace media

2
media/audio/cras/cras_input.h

@ -15,7 +15,7 @@
#include "base/macros.h"
#include "media/audio/agc_audio_stream.h"
#include "media/audio/audio_io.h"
#include "media/audio/audio_parameters.h"
#include "media/base/audio_parameters.h"
#include "media/base/media_export.h"
namespace media {

2
media/audio/cras/cras_unified.h

@ -17,7 +17,7 @@
#include "base/compiler_specific.h"
#include "base/macros.h"
#include "media/audio/audio_io.h"
#include "media/audio/audio_parameters.h"
#include "media/base/audio_parameters.h"
namespace media {

2
media/audio/fake_audio_input_stream.h

@ -13,8 +13,8 @@
#include "base/macros.h"
#include "base/memory/scoped_ptr.h"
#include "media/audio/audio_io.h"
#include "media/audio/audio_parameters.h"
#include "media/audio/fake_audio_worker.h"
#include "media/base/audio_parameters.h"
namespace media {

2
media/audio/fake_audio_output_stream.h

@ -8,8 +8,8 @@
#include "base/macros.h"
#include "base/memory/scoped_ptr.h"
#include "media/audio/audio_io.h"
#include "media/audio/audio_parameters.h"
#include "media/audio/fake_audio_worker.h"
#include "media/base/audio_parameters.h"
namespace media {

2
media/audio/fake_audio_worker.cc

@ -15,7 +15,7 @@
#include "base/synchronization/lock.h"
#include "base/threading/thread_checker.h"
#include "base/time/time.h"
#include "media/audio/audio_parameters.h"
#include "media/base/audio_parameters.h"
namespace media {

2
media/audio/fake_audio_worker_unittest.cc

@ -6,9 +6,9 @@
#include "base/macros.h"
#include "base/message_loop/message_loop.h"
#include "base/time/time.h"
#include "media/audio/audio_parameters.h"
#include "media/audio/fake_audio_worker.h"
#include "media/audio/simple_sources.h"
#include "media/base/audio_parameters.h"
#include "testing/gtest/include/gtest/gtest.h"
namespace media {

2
media/audio/mac/audio_auhal_mac.h

@ -28,7 +28,7 @@
#include "base/synchronization/lock.h"
#include "base/threading/thread_checker.h"
#include "media/audio/audio_io.h"
#include "media/audio/audio_parameters.h"
#include "media/base/audio_parameters.h"
namespace media {

2
media/audio/mac/audio_input_mac.h

@ -14,7 +14,7 @@
#include "base/macros.h"
#include "base/time/time.h"
#include "media/audio/audio_io.h"
#include "media/audio/audio_parameters.h"
#include "media/base/audio_parameters.h"
namespace media {

2
media/audio/mac/audio_low_latency_input_mac.h

@ -51,8 +51,8 @@
#include "base/timer/timer.h"
#include "media/audio/agc_audio_stream.h"
#include "media/audio/audio_io.h"
#include "media/audio/audio_parameters.h"
#include "media/base/audio_block_fifo.h"
#include "media/base/audio_parameters.h"
namespace media {

2
media/audio/mac/audio_manager_mac.cc

@ -16,10 +16,10 @@
#include "base/power_monitor/power_observer.h"
#include "base/strings/sys_string_conversions.h"
#include "base/threading/thread_checker.h"
#include "media/audio/audio_parameters.h"
#include "media/audio/mac/audio_auhal_mac.h"
#include "media/audio/mac/audio_input_mac.h"
#include "media/audio/mac/audio_low_latency_input_mac.h"
#include "media/base/audio_parameters.h"
#include "media/base/bind_to_current_loop.h"
#include "media/base/channel_layout.h"
#include "media/base/limits.h"

2
media/audio/mock_audio_manager.cc

@ -6,7 +6,7 @@
#include "base/logging.h"
#include "base/single_thread_task_runner.h"
#include "media/audio/audio_parameters.h"
#include "media/base/audio_parameters.h"
namespace media {

2
media/audio/pulse/audio_manager_pulse.cc

@ -13,10 +13,10 @@
#if defined(USE_ALSA)
#include "media/audio/alsa/audio_manager_alsa.h"
#endif
#include "media/audio/audio_parameters.h"
#include "media/audio/pulse/pulse_input.h"
#include "media/audio/pulse/pulse_output.h"
#include "media/audio/pulse/pulse_util.h"
#include "media/base/audio_parameters.h"
#include "media/base/channel_layout.h"
#if defined(DLOPEN_PULSEAUDIO)

2
media/audio/pulse/pulse_input.h

@ -14,8 +14,8 @@
#include "media/audio/agc_audio_stream.h"
#include "media/audio/audio_device_name.h"
#include "media/audio/audio_io.h"
#include "media/audio/audio_parameters.h"
#include "media/base/audio_block_fifo.h"
#include "media/base/audio_parameters.h"
namespace media {

2
media/audio/pulse/pulse_output.h

@ -29,7 +29,7 @@
#include "base/memory/scoped_ptr.h"
#include "base/threading/thread_checker.h"
#include "media/audio/audio_io.h"
#include "media/audio/audio_parameters.h"
#include "media/base/audio_parameters.h"
struct pa_context;
struct pa_operation;

2
media/audio/pulse/pulse_util.cc

@ -10,7 +10,7 @@
#include "base/macros.h"
#include "base/time/time.h"
#include "media/audio/audio_manager_base.h"
#include "media/audio/audio_parameters.h"
#include "media/base/audio_parameters.h"
namespace media {

2
media/audio/simple_sources_unittest.cc

@ -10,10 +10,10 @@
#include "base/files/file_util.h"
#include "base/logging.h"
#include "base/memory/scoped_ptr.h"
#include "media/audio/audio_parameters.h"
#include "media/audio/simple_sources.h"
#include "media/audio/sounds/test_data.h"
#include "media/base/audio_bus.h"
#include "media/base/audio_parameters.h"
#include "testing/gtest/include/gtest/gtest.h"
namespace media {

2
media/audio/sounds/audio_stream_handler.h

@ -13,7 +13,7 @@
#include "base/threading/non_thread_safe.h"
#include "base/time/time.h"
#include "media/audio/audio_io.h"
#include "media/audio/audio_parameters.h"
#include "media/base/audio_parameters.h"
#include "media/base/media_export.h"
namespace media {

1
media/audio/test_audio_input_controller_factory.h

@ -8,6 +8,7 @@
#include "base/bind.h"
#include "base/macros.h"
#include "media/audio/audio_input_controller.h"
#include "media/base/audio_parameters.h"
namespace media {

2
media/audio/virtual_audio_input_stream.h

@ -15,9 +15,9 @@
#include "base/synchronization/lock.h"
#include "base/threading/thread_checker.h"
#include "media/audio/audio_io.h"
#include "media/audio/audio_parameters.h"
#include "media/audio/fake_audio_worker.h"
#include "media/base/audio_converter.h"
#include "media/base/audio_parameters.h"
namespace base {
class SingleThreadTaskRunner;

2
media/audio/virtual_audio_output_stream.h

@ -9,8 +9,8 @@
#include "base/macros.h"
#include "base/threading/thread_checker.h"
#include "media/audio/audio_io.h"
#include "media/audio/audio_parameters.h"
#include "media/base/audio_converter.h"
#include "media/base/audio_parameters.h"
namespace media {

2
media/audio/win/audio_low_latency_input_win.h

@ -73,7 +73,7 @@
#include "base/win/scoped_comptr.h"
#include "base/win/scoped_handle.h"
#include "media/audio/agc_audio_stream.h"
#include "media/audio/audio_parameters.h"
#include "media/base/audio_parameters.h"
#include "media/base/media_export.h"
namespace media {

Some files were not shown because too many files have changed in this diff Show More