| 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 #include "content/renderer/media/media_stream_impl.h" | 5 #include "content/renderer/media/media_stream_impl.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "base/logging.h" | 9 #include "base/logging.h" |
| 10 #include "base/strings/string_number_conversions.h" | 10 #include "base/strings/string_number_conversions.h" |
| (...skipping 709 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 720 return true; | 720 return true; |
| 721 } | 721 } |
| 722 | 722 |
| 723 MediaStreamSourceExtraData::MediaStreamSourceExtraData( | 723 MediaStreamSourceExtraData::MediaStreamSourceExtraData( |
| 724 const StreamDeviceInfo& device_info, | 724 const StreamDeviceInfo& device_info, |
| 725 const WebKit::WebMediaStreamSource& webkit_source) | 725 const WebKit::WebMediaStreamSource& webkit_source) |
| 726 : device_info_(device_info), | 726 : device_info_(device_info), |
| 727 webkit_source_(webkit_source) { | 727 webkit_source_(webkit_source) { |
| 728 } | 728 } |
| 729 | 729 |
| 730 MediaStreamSourceExtraData::MediaStreamSourceExtraData( | 730 MediaStreamSourceExtraData::MediaStreamSourceExtraData() { |
| 731 media::AudioCapturerSource* source) | |
| 732 : audio_source_(source) { | |
| 733 } | 731 } |
| 734 | 732 |
| 735 MediaStreamSourceExtraData::~MediaStreamSourceExtraData() {} | 733 MediaStreamSourceExtraData::~MediaStreamSourceExtraData() {} |
| 736 | 734 |
| 737 MediaStreamExtraData::MediaStreamExtraData( | 735 MediaStreamExtraData::MediaStreamExtraData( |
| 738 webrtc::MediaStreamInterface* stream, bool is_local) | 736 webrtc::MediaStreamInterface* stream, bool is_local) |
| 739 : stream_(stream), | 737 : stream_(stream), |
| 740 is_local_(is_local) { | 738 is_local_(is_local) { |
| 741 } | 739 } |
| 742 | 740 |
| (...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 779 } | 777 } |
| 780 | 778 |
| 781 for (size_t i = 0; i < video_sources.size(); ++i) { | 779 for (size_t i = 0; i < video_sources.size(); ++i) { |
| 782 video_sources[i].setReadyState( | 780 video_sources[i].setReadyState( |
| 783 WebKit::WebMediaStreamSource::ReadyStateEnded); | 781 WebKit::WebMediaStreamSource::ReadyStateEnded); |
| 784 video_sources[i].setExtraData(NULL); | 782 video_sources[i].setExtraData(NULL); |
| 785 } | 783 } |
| 786 } | 784 } |
| 787 | 785 |
| 788 } // namespace content | 786 } // namespace content |
| OLD | NEW |