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

Side by Side Diff: content/renderer/media/webrtc_audio_device_impl.h

Issue 9858007: Fix a couple of regressions that made it in before the weekend. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix media tests Created 8 years, 9 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 #ifndef CONTENT_RENDERER_MEDIA_WEBRTC_AUDIO_DEVICE_IMPL_H_ 5 #ifndef CONTENT_RENDERER_MEDIA_WEBRTC_AUDIO_DEVICE_IMPL_H_
6 #define CONTENT_RENDERER_MEDIA_WEBRTC_AUDIO_DEVICE_IMPL_H_ 6 #define CONTENT_RENDERER_MEDIA_WEBRTC_AUDIO_DEVICE_IMPL_H_
7 #pragma once 7 #pragma once
8 8
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 240 matching lines...) Expand 10 before | Expand all | Expand 10 after
251 virtual int32_t GetLoudspeakerStatus(bool* enabled) const OVERRIDE; 251 virtual int32_t GetLoudspeakerStatus(bool* enabled) const OVERRIDE;
252 252
253 // Sets the session id. 253 // Sets the session id.
254 void SetSessionId(int session_id); 254 void SetSessionId(int session_id);
255 255
256 // Accessors. 256 // Accessors.
257 size_t input_buffer_size() const { 257 size_t input_buffer_size() const {
258 return input_audio_parameters_.frames_per_buffer(); 258 return input_audio_parameters_.frames_per_buffer();
259 } 259 }
260 size_t output_buffer_size() const { 260 size_t output_buffer_size() const {
261 return input_audio_parameters_.frames_per_buffer(); 261 return output_audio_parameters_.frames_per_buffer();
262 } 262 }
263 int input_channels() const { 263 int input_channels() const {
264 return input_audio_parameters_.channels(); 264 return input_audio_parameters_.channels();
265 } 265 }
266 int output_channels() const { 266 int output_channels() const {
267 return output_audio_parameters_.channels(); 267 return output_audio_parameters_.channels();
268 } 268 }
269 int input_sample_rate() const { 269 int input_sample_rate() const {
270 return input_audio_parameters_.sample_rate(); 270 return input_audio_parameters_.sample_rate();
271 } 271 }
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
333 int bytes_per_sample_; 333 int bytes_per_sample_;
334 334
335 bool initialized_; 335 bool initialized_;
336 bool playing_; 336 bool playing_;
337 bool recording_; 337 bool recording_;
338 338
339 DISALLOW_COPY_AND_ASSIGN(WebRtcAudioDeviceImpl); 339 DISALLOW_COPY_AND_ASSIGN(WebRtcAudioDeviceImpl);
340 }; 340 };
341 341
342 #endif // CONTENT_RENDERER_MEDIA_WEBRTC_AUDIO_DEVICE_IMPL_H_ 342 #endif // CONTENT_RENDERER_MEDIA_WEBRTC_AUDIO_DEVICE_IMPL_H_
OLDNEW
« no previous file with comments | « content/browser/renderer_host/media/audio_renderer_host.cc ('k') | media/audio/audio_input_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698