| OLD | NEW | 
|    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_MEDIA_STREAM_DEPENDENCY_FACTORY_H_ |    5 #ifndef CONTENT_RENDERER_MEDIA_MEDIA_STREAM_DEPENDENCY_FACTORY_H_ | 
|    6 #define CONTENT_RENDERER_MEDIA_MEDIA_STREAM_DEPENDENCY_FACTORY_H_ |    6 #define CONTENT_RENDERER_MEDIA_MEDIA_STREAM_DEPENDENCY_FACTORY_H_ | 
|    7  |    7  | 
|    8 #include <string> |    8 #include <string> | 
|    9  |    9  | 
|   10 #include "base/basictypes.h" |   10 #include "base/basictypes.h" | 
| (...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  166  |  166  | 
|  167   virtual const scoped_refptr<webrtc::PeerConnectionFactoryInterface>& |  167   virtual const scoped_refptr<webrtc::PeerConnectionFactoryInterface>& | 
|  168       GetPcFactory(); |  168       GetPcFactory(); | 
|  169   virtual bool PeerConnectionFactoryCreated(); |  169   virtual bool PeerConnectionFactoryCreated(); | 
|  170  |  170  | 
|  171   // Returns a new capturer or existing capturer based on the |render_view_id| |  171   // Returns a new capturer or existing capturer based on the |render_view_id| | 
|  172   // and |device_info|. When the |render_view_id| and |device_info| are valid, |  172   // and |device_info|. When the |render_view_id| and |device_info| are valid, | 
|  173   // it reuses existing capture if any; otherwise it creates a new capturer. |  173   // it reuses existing capture if any; otherwise it creates a new capturer. | 
|  174   virtual scoped_refptr<WebRtcAudioCapturer> CreateAudioCapturer( |  174   virtual scoped_refptr<WebRtcAudioCapturer> CreateAudioCapturer( | 
|  175       int render_view_id, const StreamDeviceInfo& device_info, |  175       int render_view_id, const StreamDeviceInfo& device_info, | 
|  176       const blink::WebMediaConstraints& constraints); |  176       const blink::WebMediaConstraints& constraints, | 
 |  177       MediaStreamAudioSource* audio_source); | 
|  177  |  178  | 
|  178   // Adds the audio device as a sink to the audio track and starts the local |  179   // Adds the audio device as a sink to the audio track and starts the local | 
|  179   // audio track. This is virtual for test purposes since no real audio device |  180   // audio track. This is virtual for test purposes since no real audio device | 
|  180   // exist in unit tests. |  181   // exist in unit tests. | 
|  181   virtual void StartLocalAudioTrack(WebRtcLocalAudioTrack* audio_track); |  182   virtual void StartLocalAudioTrack(WebRtcLocalAudioTrack* audio_track); | 
|  182  |  183  | 
|  183  private: |  184  private: | 
|  184   // Creates |pc_factory_|, which in turn is used for |  185   // Creates |pc_factory_|, which in turn is used for | 
|  185   // creating PeerConnection objects. |  186   // creating PeerConnection objects. | 
|  186   void CreatePeerConnectionFactory(); |  187   void CreatePeerConnectionFactory(); | 
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  220   base::Thread chrome_worker_thread_; |  221   base::Thread chrome_worker_thread_; | 
|  221  |  222  | 
|  222   base::PlatformFile aec_dump_file_; |  223   base::PlatformFile aec_dump_file_; | 
|  223  |  224  | 
|  224   DISALLOW_COPY_AND_ASSIGN(MediaStreamDependencyFactory); |  225   DISALLOW_COPY_AND_ASSIGN(MediaStreamDependencyFactory); | 
|  225 }; |  226 }; | 
|  226  |  227  | 
|  227 }  // namespace content |  228 }  // namespace content | 
|  228  |  229  | 
|  229 #endif  // CONTENT_RENDERER_MEDIA_MEDIA_STREAM_DEPENDENCY_FACTORY_H_ |  230 #endif  // CONTENT_RENDERER_MEDIA_MEDIA_STREAM_DEPENDENCY_FACTORY_H_ | 
| OLD | NEW |