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

Side by Side Diff: third_party/WebKit/Source/platform/audio/HRTFDatabase.cpp

Issue 2050123002: Remove OwnPtr from Blink. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: First attempt to land. Created 4 years, 6 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 /* 1 /*
2 * Copyright (C) 2010 Google Inc. All rights reserved. 2 * Copyright (C) 2010 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 * 7 *
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 11 matching lines...) Expand all
22 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 22 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
23 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 23 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
24 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 24 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
25 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 25 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
26 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 26 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
27 */ 27 */
28 28
29 #include "platform/audio/HRTFDatabase.h" 29 #include "platform/audio/HRTFDatabase.h"
30 30
31 #include "wtf/MathExtras.h" 31 #include "wtf/MathExtras.h"
32 #include "wtf/PtrUtil.h"
33 #include <memory>
32 34
33 namespace blink { 35 namespace blink {
34 36
35 const int HRTFDatabase::MinElevation = -45; 37 const int HRTFDatabase::MinElevation = -45;
36 const int HRTFDatabase::MaxElevation = 90; 38 const int HRTFDatabase::MaxElevation = 90;
37 const unsigned HRTFDatabase::RawElevationAngleSpacing = 15; 39 const unsigned HRTFDatabase::RawElevationAngleSpacing = 15;
38 const unsigned HRTFDatabase::NumberOfRawElevations = 10; // -45 -> +90 (each 15 degrees) 40 const unsigned HRTFDatabase::NumberOfRawElevations = 10; // -45 -> +90 (each 15 degrees)
39 const unsigned HRTFDatabase::InterpolationFactor = 1; 41 const unsigned HRTFDatabase::InterpolationFactor = 1;
40 const unsigned HRTFDatabase::NumberOfTotalElevations = NumberOfRawElevations * I nterpolationFactor; 42 const unsigned HRTFDatabase::NumberOfTotalElevations = NumberOfRawElevations * I nterpolationFactor;
41 43
42 PassOwnPtr<HRTFDatabase> HRTFDatabase::create(float sampleRate) 44 std::unique_ptr<HRTFDatabase> HRTFDatabase::create(float sampleRate)
43 { 45 {
44 return adoptPtr(new HRTFDatabase(sampleRate)); 46 return wrapUnique(new HRTFDatabase(sampleRate));
45 } 47 }
46 48
47 HRTFDatabase::HRTFDatabase(float sampleRate) 49 HRTFDatabase::HRTFDatabase(float sampleRate)
48 : m_elevations(NumberOfTotalElevations) 50 : m_elevations(NumberOfTotalElevations)
49 , m_sampleRate(sampleRate) 51 , m_sampleRate(sampleRate)
50 { 52 {
51 unsigned elevationIndex = 0; 53 unsigned elevationIndex = 0;
52 for (int elevation = MinElevation; elevation <= MaxElevation; elevation += R awElevationAngleSpacing) { 54 for (int elevation = MinElevation; elevation <= MaxElevation; elevation += R awElevationAngleSpacing) {
53 OwnPtr<HRTFElevation> hrtfElevation = HRTFElevation::createForSubject("C omposite", elevation, sampleRate); 55 std::unique_ptr<HRTFElevation> hrtfElevation = HRTFElevation::createForS ubject("Composite", elevation, sampleRate);
54 ASSERT(hrtfElevation.get()); 56 ASSERT(hrtfElevation.get());
55 if (!hrtfElevation.get()) 57 if (!hrtfElevation.get())
56 return; 58 return;
57 59
58 m_elevations[elevationIndex] = std::move(hrtfElevation); 60 m_elevations[elevationIndex] = std::move(hrtfElevation);
59 elevationIndex += InterpolationFactor; 61 elevationIndex += InterpolationFactor;
60 } 62 }
61 63
62 // Now, go back and interpolate elevations. 64 // Now, go back and interpolate elevations.
63 if (InterpolationFactor > 1) { 65 if (InterpolationFactor > 1) {
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
106 { 108 {
107 // Clamp to allowed range. 109 // Clamp to allowed range.
108 elevationAngle = clampTo<double, double>(elevationAngle, MinElevation, MaxEl evation); 110 elevationAngle = clampTo<double, double>(elevationAngle, MinElevation, MaxEl evation);
109 111
110 unsigned elevationIndex = static_cast<int>(InterpolationFactor * (elevationA ngle - MinElevation) / RawElevationAngleSpacing); 112 unsigned elevationIndex = static_cast<int>(InterpolationFactor * (elevationA ngle - MinElevation) / RawElevationAngleSpacing);
111 return elevationIndex; 113 return elevationIndex;
112 } 114 }
113 115
114 } // namespace blink 116 } // namespace blink
115 117
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/platform/audio/HRTFDatabase.h ('k') | third_party/WebKit/Source/platform/audio/HRTFDatabaseLoader.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698