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/string_number_conversions.h" | 10 #include "base/string_number_conversions.h" |
(...skipping 536 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
547 } | 547 } |
548 | 548 |
549 scoped_refptr<WebRtcAudioRenderer> MediaStreamImpl::CreateRemoteAudioRenderer( | 549 scoped_refptr<WebRtcAudioRenderer> MediaStreamImpl::CreateRemoteAudioRenderer( |
550 webrtc::MediaStreamInterface* stream) { | 550 webrtc::MediaStreamInterface* stream) { |
551 if (!stream->audio_tracks() || stream->audio_tracks()->count() == 0) | 551 if (!stream->audio_tracks() || stream->audio_tracks()->count() == 0) |
552 return NULL; | 552 return NULL; |
553 | 553 |
554 DVLOG(1) << "MediaStreamImpl::CreateRemoteAudioRenderer label:" | 554 DVLOG(1) << "MediaStreamImpl::CreateRemoteAudioRenderer label:" |
555 << stream->label(); | 555 << stream->label(); |
556 | 556 |
557 return new WebRtcAudioRenderer(); | 557 return new WebRtcAudioRenderer(RenderViewObserver::routing_id()); |
558 } | 558 } |
559 | 559 |
560 MediaStreamSourceExtraData::MediaStreamSourceExtraData( | 560 MediaStreamSourceExtraData::MediaStreamSourceExtraData( |
561 const StreamDeviceInfo& device_info) | 561 const StreamDeviceInfo& device_info) |
562 : device_info_(device_info) { | 562 : device_info_(device_info) { |
563 } | 563 } |
564 | 564 |
565 MediaStreamSourceExtraData::~MediaStreamSourceExtraData() {} | 565 MediaStreamSourceExtraData::~MediaStreamSourceExtraData() {} |
566 | 566 |
567 MediaStreamExtraData::MediaStreamExtraData( | 567 MediaStreamExtraData::MediaStreamExtraData( |
(...skipping 13 matching lines...) Expand all Loading... |
581 const StreamStopCallback& stop_callback) { | 581 const StreamStopCallback& stop_callback) { |
582 stream_stop_callback_ = stop_callback; | 582 stream_stop_callback_ = stop_callback; |
583 } | 583 } |
584 | 584 |
585 void MediaStreamExtraData::OnLocalStreamStop() { | 585 void MediaStreamExtraData::OnLocalStreamStop() { |
586 if (!stream_stop_callback_.is_null()) | 586 if (!stream_stop_callback_.is_null()) |
587 stream_stop_callback_.Run(local_stream_->label()); | 587 stream_stop_callback_.Run(local_stream_->label()); |
588 } | 588 } |
589 | 589 |
590 } // namespace content | 590 } // namespace content |
OLD | NEW |