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

Side by Side Diff: third_party/WebKit/Source/modules/webaudio/MediaElementAudioSourceNode.cpp

Issue 2547053003: s/ passed(...) / WTF::passed(...) / to avoid future ambiguity w/ base::Passed. (Closed)
Patch Set: Rebasing... Created 4 years 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 /* 1 /*
2 * Copyright (C) 2011, Google Inc. All rights reserved. 2 * Copyright (C) 2011, Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 // Synchronize with process() to protect m_sourceNumberOfChannels, 94 // Synchronize with process() to protect m_sourceNumberOfChannels,
95 // m_sourceSampleRate, and m_multiChannelResampler. 95 // m_sourceSampleRate, and m_multiChannelResampler.
96 Locker<MediaElementAudioSourceHandler> locker(*this); 96 Locker<MediaElementAudioSourceHandler> locker(*this);
97 97
98 m_sourceNumberOfChannels = numberOfChannels; 98 m_sourceNumberOfChannels = numberOfChannels;
99 m_sourceSampleRate = sourceSampleRate; 99 m_sourceSampleRate = sourceSampleRate;
100 100
101 if (sourceSampleRate != sampleRate()) { 101 if (sourceSampleRate != sampleRate()) {
102 double scaleFactor = sourceSampleRate / sampleRate(); 102 double scaleFactor = sourceSampleRate / sampleRate();
103 m_multiChannelResampler = 103 m_multiChannelResampler =
104 makeUnique<MultiChannelResampler>(scaleFactor, numberOfChannels); 104 WTF::makeUnique<MultiChannelResampler>(scaleFactor, numberOfChannels);
105 } else { 105 } else {
106 // Bypass resampling. 106 // Bypass resampling.
107 m_multiChannelResampler.reset(); 107 m_multiChannelResampler.reset();
108 } 108 }
109 109
110 { 110 {
111 // The context must be locked when changing the number of output channels. 111 // The context must be locked when changing the number of output channels.
112 BaseAudioContext::AutoLocker contextLocker(context()); 112 BaseAudioContext::AutoLocker contextLocker(context());
113 113
114 // Do any necesssary re-configuration to the output's number of channels. 114 // Do any necesssary re-configuration to the output's number of channels.
(...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after
294 294
295 void MediaElementAudioSourceNode::lock() { 295 void MediaElementAudioSourceNode::lock() {
296 mediaElementAudioSourceHandler().lock(); 296 mediaElementAudioSourceHandler().lock();
297 } 297 }
298 298
299 void MediaElementAudioSourceNode::unlock() { 299 void MediaElementAudioSourceNode::unlock() {
300 mediaElementAudioSourceHandler().unlock(); 300 mediaElementAudioSourceHandler().unlock();
301 } 301 }
302 302
303 } // namespace blink 303 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698