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

Side by Side Diff: content/renderer/media/media_stream_impl.cc

Issue 23691038: Switch LiveAudio to source provider solution. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: addressed Tommi's comments and added unittest Created 7 years, 3 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 #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 702 matching lines...) Expand 10 before | Expand all | Expand 10 after
713 return true; 713 return true;
714 } 714 }
715 715
716 MediaStreamSourceExtraData::MediaStreamSourceExtraData( 716 MediaStreamSourceExtraData::MediaStreamSourceExtraData(
717 const StreamDeviceInfo& device_info, 717 const StreamDeviceInfo& device_info,
718 const WebKit::WebMediaStreamSource& webkit_source) 718 const WebKit::WebMediaStreamSource& webkit_source)
719 : device_info_(device_info), 719 : device_info_(device_info),
720 webkit_source_(webkit_source) { 720 webkit_source_(webkit_source) {
721 } 721 }
722 722
723 MediaStreamSourceExtraData::MediaStreamSourceExtraData( 723 MediaStreamSourceExtraData::MediaStreamSourceExtraData() {
724 media::AudioCapturerSource* source)
725 : audio_source_(source) {
726 } 724 }
727 725
728 MediaStreamSourceExtraData::~MediaStreamSourceExtraData() {} 726 MediaStreamSourceExtraData::~MediaStreamSourceExtraData() {}
729 727
730 MediaStreamExtraData::MediaStreamExtraData( 728 MediaStreamExtraData::MediaStreamExtraData(
731 webrtc::MediaStreamInterface* stream, bool is_local) 729 webrtc::MediaStreamInterface* stream, bool is_local)
732 : stream_(stream), 730 : stream_(stream),
733 is_local_(is_local) { 731 is_local_(is_local) {
734 } 732 }
735 733
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
771 } 769 }
772 770
773 for (size_t i = 0; i < video_sources.size(); ++i) { 771 for (size_t i = 0; i < video_sources.size(); ++i) {
774 video_sources[i].setReadyState( 772 video_sources[i].setReadyState(
775 WebKit::WebMediaStreamSource::ReadyStateEnded); 773 WebKit::WebMediaStreamSource::ReadyStateEnded);
776 video_sources[i].setExtraData(NULL); 774 video_sources[i].setExtraData(NULL);
777 } 775 }
778 } 776 }
779 777
780 } // namespace content 778 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698