Index: content/renderer/media/media_stream_audio_track.cc |
diff --git a/content/renderer/media/media_stream_audio_track.cc b/content/renderer/media/media_stream_audio_track.cc |
index 278ab05bb107369cdd23614565470e40846a3518..717c71f3644725cd87366404fe9accd9ca789b2d 100644 |
--- a/content/renderer/media/media_stream_audio_track.cc |
+++ b/content/renderer/media/media_stream_audio_track.cc |
@@ -12,13 +12,19 @@ namespace content { |
MediaStreamAudioTrack::MediaStreamAudioTrack(bool is_local_track) |
: MediaStreamTrack(is_local_track) { |
+ DVLOG(1) << "MediaStreamAudioTrack::MediaStreamAudioTrack(is a " |
+ << (is_local_track ? "local" : "remote") << " track)"; |
} |
MediaStreamAudioTrack::~MediaStreamAudioTrack() { |
+ DCHECK(main_render_thread_checker_.CalledOnValidThread()); |
+ DVLOG(1) << "MediaStreamAudioTrack::~MediaStreamAudioTrack()"; |
+ DCHECK(stop_callback_.is_null()) |
+ << "BUG: Subclass must ensure Stop() is called."; |
} |
// static |
-MediaStreamAudioTrack* MediaStreamAudioTrack::GetTrack( |
+MediaStreamAudioTrack* MediaStreamAudioTrack::From( |
const blink::WebMediaStreamTrack& track) { |
if (track.isNull() || |
track.source().type() != blink::WebMediaStreamSource::TypeAudio) { |
@@ -27,6 +33,23 @@ MediaStreamAudioTrack* MediaStreamAudioTrack::GetTrack( |
return static_cast<MediaStreamAudioTrack*>(track.extraData()); |
} |
+void MediaStreamAudioTrack::Start(const base::Closure& stop_callback) { |
+ DCHECK(main_render_thread_checker_.CalledOnValidThread()); |
+ DCHECK(stop_callback_.is_null()); |
+ DVLOG(1) << "MediaStreamAudioTrack::Start()"; |
+ stop_callback_ = stop_callback; |
o1ka
2016/03/02 16:31:14
Do you intentionally allow passing null as stop_ca
miu
2016/03/02 23:38:10
Done. Added DCHECK.
|
+} |
+ |
+void MediaStreamAudioTrack::Stop() { |
+ DCHECK(main_render_thread_checker_.CalledOnValidThread()); |
+ DVLOG(1) << "MediaStreamAudioTrack::Stop()"; |
+ if (!stop_callback_.is_null()) |
+ stop_callback_.Run(); |
o1ka
2016/03/02 16:31:14
Do you want to reset the callback probably?
miu
2016/03/02 23:38:10
Good catch! Yes, I do. Done.
|
+ OnStop(); |
+} |
+ |
+void MediaStreamAudioTrack::OnStop() {} |
+ |
webrtc::AudioTrackInterface* MediaStreamAudioTrack::GetAudioAdapter() { |
NOTREACHED(); |
return nullptr; |