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

Unified Diff: media/audio/audio_manager_base.cc

Issue 2507643002: Removes tracking for fake audio streams. (Closed)
Patch Set: Created 4 years, 1 month 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | media/audio/audio_output_proxy_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/audio/audio_manager_base.cc
diff --git a/media/audio/audio_manager_base.cc b/media/audio/audio_manager_base.cc
index 944156c66c6f8e9eb1e561ea1896b01a9c05a083..ed0af0c5532493f5b1b7048731bd9c7dc613d655 100644
--- a/media/audio/audio_manager_base.cc
+++ b/media/audio/audio_manager_base.cc
@@ -137,14 +137,17 @@ AudioOutputStream* AudioManagerBase::MakeAudioOutputStream(
stream = MakeLowLatencyOutputStream(params, device_id, log_callback);
break;
case AudioParameters::AUDIO_FAKE:
- stream = FakeAudioOutputStream::MakeFakeStream(this, params);
+ stream = FakeAudioOutputStream::MakeFakeStream(
+ GetTaskRunner(), GetWorkerTaskRunner(), params);
break;
default:
stream = NULL;
break;
}
- if (stream) {
+ // Only count real physical streams. Fake streams do not hold reference to
+ // AudioManager and they do not need to be released.
+ if (stream && params.format() != AudioParameters::AUDIO_FAKE) {
++num_output_streams_;
}
@@ -182,14 +185,17 @@ AudioInputStream* AudioManagerBase::MakeAudioInputStream(
stream = MakeLowLatencyInputStream(params, device_id, log_callback);
break;
case AudioParameters::AUDIO_FAKE:
- stream = FakeAudioInputStream::MakeFakeStream(this, params);
+ stream = FakeAudioInputStream::MakeFakeStream(
+ GetTaskRunner(), GetWorkerTaskRunner(), params);
break;
default:
stream = NULL;
break;
}
- if (stream) {
+ // Only count real physical streams. Fake streams do not hold reference to
+ // AudioManager and they do not need to be released.
+ if (stream && params.format() != AudioParameters::AUDIO_FAKE) {
++num_input_streams_;
}
« no previous file with comments | « no previous file | media/audio/audio_output_proxy_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698