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

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

Issue 2080623002: Revert "Remove OwnPtr from Blink." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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>
34 32
35 namespace blink { 33 namespace blink {
36 34
37 const int HRTFDatabase::MinElevation = -45; 35 const int HRTFDatabase::MinElevation = -45;
38 const int HRTFDatabase::MaxElevation = 90; 36 const int HRTFDatabase::MaxElevation = 90;
39 const unsigned HRTFDatabase::RawElevationAngleSpacing = 15; 37 const unsigned HRTFDatabase::RawElevationAngleSpacing = 15;
40 const unsigned HRTFDatabase::NumberOfRawElevations = 10; // -45 -> +90 (each 15 degrees) 38 const unsigned HRTFDatabase::NumberOfRawElevations = 10; // -45 -> +90 (each 15 degrees)
41 const unsigned HRTFDatabase::InterpolationFactor = 1; 39 const unsigned HRTFDatabase::InterpolationFactor = 1;
42 const unsigned HRTFDatabase::NumberOfTotalElevations = NumberOfRawElevations * I nterpolationFactor; 40 const unsigned HRTFDatabase::NumberOfTotalElevations = NumberOfRawElevations * I nterpolationFactor;
43 41
44 std::unique_ptr<HRTFDatabase> HRTFDatabase::create(float sampleRate) 42 PassOwnPtr<HRTFDatabase> HRTFDatabase::create(float sampleRate)
45 { 43 {
46 return wrapUnique(new HRTFDatabase(sampleRate)); 44 return adoptPtr(new HRTFDatabase(sampleRate));
47 } 45 }
48 46
49 HRTFDatabase::HRTFDatabase(float sampleRate) 47 HRTFDatabase::HRTFDatabase(float sampleRate)
50 : m_elevations(NumberOfTotalElevations) 48 : m_elevations(NumberOfTotalElevations)
51 , m_sampleRate(sampleRate) 49 , m_sampleRate(sampleRate)
52 { 50 {
53 unsigned elevationIndex = 0; 51 unsigned elevationIndex = 0;
54 for (int elevation = MinElevation; elevation <= MaxElevation; elevation += R awElevationAngleSpacing) { 52 for (int elevation = MinElevation; elevation <= MaxElevation; elevation += R awElevationAngleSpacing) {
55 std::unique_ptr<HRTFElevation> hrtfElevation = HRTFElevation::createForS ubject("Composite", elevation, sampleRate); 53 OwnPtr<HRTFElevation> hrtfElevation = HRTFElevation::createForSubject("C omposite", elevation, sampleRate);
56 ASSERT(hrtfElevation.get()); 54 ASSERT(hrtfElevation.get());
57 if (!hrtfElevation.get()) 55 if (!hrtfElevation.get())
58 return; 56 return;
59 57
60 m_elevations[elevationIndex] = std::move(hrtfElevation); 58 m_elevations[elevationIndex] = std::move(hrtfElevation);
61 elevationIndex += InterpolationFactor; 59 elevationIndex += InterpolationFactor;
62 } 60 }
63 61
64 // Now, go back and interpolate elevations. 62 // Now, go back and interpolate elevations.
65 if (InterpolationFactor > 1) { 63 if (InterpolationFactor > 1) {
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
108 { 106 {
109 // Clamp to allowed range. 107 // Clamp to allowed range.
110 elevationAngle = clampTo<double, double>(elevationAngle, MinElevation, MaxEl evation); 108 elevationAngle = clampTo<double, double>(elevationAngle, MinElevation, MaxEl evation);
111 109
112 unsigned elevationIndex = static_cast<int>(InterpolationFactor * (elevationA ngle - MinElevation) / RawElevationAngleSpacing); 110 unsigned elevationIndex = static_cast<int>(InterpolationFactor * (elevationA ngle - MinElevation) / RawElevationAngleSpacing);
113 return elevationIndex; 111 return elevationIndex;
114 } 112 }
115 113
116 } // namespace blink 114 } // namespace blink
117 115
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