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

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

Issue 1834323002: MediaStream audio: Refactor 3 separate "glue" implementations into one. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed tommi's comments on PS6. Created 4 years, 7 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_audio_track.h" 5 #include "content/renderer/media/media_stream_audio_track.h"
6 6
7 #include "base/callback_helpers.h" 7 #include "base/callback_helpers.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "content/public/renderer/media_stream_audio_sink.h"
10 #include "media/base/audio_bus.h"
9 #include "third_party/WebKit/public/platform/WebMediaStreamSource.h" 11 #include "third_party/WebKit/public/platform/WebMediaStreamSource.h"
10 #include "third_party/webrtc/api/mediastreaminterface.h"
11 12
12 namespace content { 13 namespace content {
13 14
14 MediaStreamAudioTrack::MediaStreamAudioTrack(bool is_local_track) 15 MediaStreamAudioTrack::MediaStreamAudioTrack(bool is_local_track)
15 : MediaStreamTrack(is_local_track) { 16 : MediaStreamTrack(is_local_track), is_enabled_(1), weak_factory_(this) {
16 DVLOG(1) << "MediaStreamAudioTrack::MediaStreamAudioTrack(is a " 17 DVLOG(1) << "MediaStreamAudioTrack@" << this << "::MediaStreamAudioTrack("
17 << (is_local_track ? "local" : "remote") << " track)"; 18 << (is_local_track ? "local" : "remote") << " track)";
18 } 19 }
19 20
20 MediaStreamAudioTrack::~MediaStreamAudioTrack() { 21 MediaStreamAudioTrack::~MediaStreamAudioTrack() {
21 DCHECK(main_render_thread_checker_.CalledOnValidThread()); 22 DCHECK(thread_checker_.CalledOnValidThread());
22 DVLOG(1) << "MediaStreamAudioTrack::~MediaStreamAudioTrack()"; 23 DVLOG(1) << "MediaStreamAudioTrack@" << this << " is being destroyed.";
23 DCHECK(stop_callback_.is_null()) 24 DCHECK(stop_callback_.is_null())
24 << "BUG: Subclass must ensure Stop() is called."; 25 << "BUG: Subclass must ensure Stop() is called.";
25 } 26 }
26 27
27 // static 28 // static
28 MediaStreamAudioTrack* MediaStreamAudioTrack::From( 29 MediaStreamAudioTrack* MediaStreamAudioTrack::From(
29 const blink::WebMediaStreamTrack& track) { 30 const blink::WebMediaStreamTrack& track) {
30 if (track.isNull() || 31 if (track.isNull() ||
31 track.source().getType() != blink::WebMediaStreamSource::TypeAudio) { 32 track.source().getType() != blink::WebMediaStreamSource::TypeAudio) {
32 return nullptr; 33 return nullptr;
33 } 34 }
34 return static_cast<MediaStreamAudioTrack*>(track.getExtraData()); 35 return static_cast<MediaStreamAudioTrack*>(track.getExtraData());
35 } 36 }
36 37
38 void MediaStreamAudioTrack::AddSink(MediaStreamAudioSink* sink) {
39 DCHECK(thread_checker_.CalledOnValidThread());
40
41 // If the track has already stopped, just notify the sink of this fact without
42 // adding it.
43 if (stop_callback_.is_null()) {
44 sink->OnReadyStateChanged(blink::WebMediaStreamSource::ReadyStateEnded);
45 return;
46 }
47
48 DVLOG(1) << "Adding MediaStreamAudioSink@" << sink
49 << " to MediaStreamAudioTrack@" << this << '.';
50 deliverer_.AddConsumer(sink);
51 }
52
53 void MediaStreamAudioTrack::RemoveSink(MediaStreamAudioSink* sink) {
54 DCHECK(thread_checker_.CalledOnValidThread());
55 deliverer_.RemoveConsumer(sink);
56 DVLOG(1) << "Removed MediaStreamAudioSink@" << sink
57 << " from MediaStreamAudioTrack@" << this << '.';
58 }
59
60 media::AudioParameters MediaStreamAudioTrack::GetOutputFormat() const {
61 return deliverer_.GetAudioParameters();
62 }
63
64 void MediaStreamAudioTrack::SetEnabled(bool enabled) {
65 DCHECK(thread_checker_.CalledOnValidThread());
66 DVLOG(1) << "MediaStreamAudioTrack@" << this << "::SetEnabled("
67 << (enabled ? 'Y' : 'N') << ')';
68
69 const bool previously_enabled =
70 !!base::subtle::NoBarrier_AtomicExchange(&is_enabled_, enabled ? 1 : 0);
71 if (enabled == previously_enabled)
72 return;
73
74 std::vector<MediaStreamAudioSink*> sinks_to_notify;
75 deliverer_.GetConsumerList(&sinks_to_notify);
76 for (MediaStreamAudioSink* sink : sinks_to_notify)
77 sink->OnEnabledChanged(enabled);
78 }
79
80 void* MediaStreamAudioTrack::GetClassIdentifier() const {
81 return nullptr;
82 }
83
37 void MediaStreamAudioTrack::Start(const base::Closure& stop_callback) { 84 void MediaStreamAudioTrack::Start(const base::Closure& stop_callback) {
38 DCHECK(main_render_thread_checker_.CalledOnValidThread()); 85 DCHECK(thread_checker_.CalledOnValidThread());
39 DCHECK(!stop_callback.is_null()); 86 DCHECK(!stop_callback.is_null());
40 DCHECK(stop_callback_.is_null()); 87 DCHECK(stop_callback_.is_null());
41 DVLOG(1) << "MediaStreamAudioTrack::Start()"; 88 DVLOG(1) << "Starting MediaStreamAudioTrack@" << this << '.';
42 stop_callback_ = stop_callback; 89 stop_callback_ = stop_callback;
43 } 90 }
44 91
45 void MediaStreamAudioTrack::Stop() { 92 void MediaStreamAudioTrack::Stop() {
46 DCHECK(main_render_thread_checker_.CalledOnValidThread()); 93 DCHECK(thread_checker_.CalledOnValidThread());
47 DVLOG(1) << "MediaStreamAudioTrack::Stop()"; 94 DVLOG(1) << "Stopping MediaStreamAudioTrack@" << this << '.';
95
48 if (!stop_callback_.is_null()) 96 if (!stop_callback_.is_null())
49 base::ResetAndReturn(&stop_callback_).Run(); 97 base::ResetAndReturn(&stop_callback_).Run();
98
50 OnStop(); 99 OnStop();
100
101 std::vector<MediaStreamAudioSink*> sinks_to_end;
102 deliverer_.GetConsumerList(&sinks_to_end);
103 for (MediaStreamAudioSink* sink : sinks_to_end) {
104 deliverer_.RemoveConsumer(sink);
105 sink->OnReadyStateChanged(blink::WebMediaStreamSource::ReadyStateEnded);
106 }
107
108 weak_factory_.InvalidateWeakPtrs();
51 } 109 }
52 110
53 void MediaStreamAudioTrack::OnStop() {} 111 void MediaStreamAudioTrack::OnStop() {}
54 112
55 webrtc::AudioTrackInterface* MediaStreamAudioTrack::GetAudioAdapter() { 113 void MediaStreamAudioTrack::OnSetFormat(const media::AudioParameters& params) {
56 NOTREACHED(); 114 deliverer_.OnSetFormat(params);
57 return nullptr; 115 }
116
117 void MediaStreamAudioTrack::OnData(const media::AudioBus& audio_bus,
118 base::TimeTicks reference_time) {
119 if (base::subtle::NoBarrier_Load(&is_enabled_)) {
120 deliverer_.OnData(audio_bus, reference_time);
121 } else {
122 // The W3C spec requires silent audio to flow while a track is disabled.
123 if (!silent_bus_ || silent_bus_->channels() != audio_bus.channels() ||
124 silent_bus_->frames() != audio_bus.frames()) {
125 silent_bus_ = media::AudioBus::Create(audio_bus.channels(),
126 audio_bus.frames());
127 silent_bus_->Zero();
128 }
129 deliverer_.OnData(*silent_bus_, reference_time);
130 }
58 } 131 }
59 132
60 } // namespace content 133 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698