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

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: rebased and fixed some unittests 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 628 matching lines...) Expand 10 before | Expand all | Expand 10 after
639 } 639 }
640 } 640 }
641 641
642 MediaStreamSourceExtraData::MediaStreamSourceExtraData( 642 MediaStreamSourceExtraData::MediaStreamSourceExtraData(
643 const StreamDeviceInfo& device_info, 643 const StreamDeviceInfo& device_info,
644 const WebKit::WebMediaStreamSource& webkit_source) 644 const WebKit::WebMediaStreamSource& webkit_source)
645 : device_info_(device_info), 645 : device_info_(device_info),
646 webkit_source_(webkit_source) { 646 webkit_source_(webkit_source) {
647 } 647 }
648 648
649 MediaStreamSourceExtraData::MediaStreamSourceExtraData( 649 MediaStreamSourceExtraData::MediaStreamSourceExtraData() {
650 media::AudioCapturerSource* source)
651 : audio_source_(source) {
652 } 650 }
653 651
654 MediaStreamSourceExtraData::~MediaStreamSourceExtraData() {} 652 MediaStreamSourceExtraData::~MediaStreamSourceExtraData() {}
655 653
656 MediaStreamExtraData::MediaStreamExtraData( 654 MediaStreamExtraData::MediaStreamExtraData(
657 webrtc::MediaStreamInterface* stream, bool is_local) 655 webrtc::MediaStreamInterface* stream, bool is_local)
658 : stream_(stream), 656 : stream_(stream),
659 is_local_(is_local) { 657 is_local_(is_local) {
660 } 658 }
661 659
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
697 } 695 }
698 696
699 for (size_t i = 0; i < video_sources.size(); ++i) { 697 for (size_t i = 0; i < video_sources.size(); ++i) {
700 video_sources[i].setReadyState( 698 video_sources[i].setReadyState(
701 WebKit::WebMediaStreamSource::ReadyStateEnded); 699 WebKit::WebMediaStreamSource::ReadyStateEnded);
702 video_sources[i].setExtraData(NULL); 700 video_sources[i].setExtraData(NULL);
703 } 701 }
704 } 702 }
705 703
706 } // namespace content 704 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698