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

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

Issue 1981823002: Remove OwnPtr::release() calls in platform/ (part 1). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 /* 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 23 matching lines...) Expand all
34 34
35 const int HRTFDatabase::MinElevation = -45; 35 const int HRTFDatabase::MinElevation = -45;
36 const int HRTFDatabase::MaxElevation = 90; 36 const int HRTFDatabase::MaxElevation = 90;
37 const unsigned HRTFDatabase::RawElevationAngleSpacing = 15; 37 const unsigned HRTFDatabase::RawElevationAngleSpacing = 15;
38 const unsigned HRTFDatabase::NumberOfRawElevations = 10; // -45 -> +90 (each 15 degrees) 38 const unsigned HRTFDatabase::NumberOfRawElevations = 10; // -45 -> +90 (each 15 degrees)
39 const unsigned HRTFDatabase::InterpolationFactor = 1; 39 const unsigned HRTFDatabase::InterpolationFactor = 1;
40 const unsigned HRTFDatabase::NumberOfTotalElevations = NumberOfRawElevations * I nterpolationFactor; 40 const unsigned HRTFDatabase::NumberOfTotalElevations = NumberOfRawElevations * I nterpolationFactor;
41 41
42 PassOwnPtr<HRTFDatabase> HRTFDatabase::create(float sampleRate) 42 PassOwnPtr<HRTFDatabase> HRTFDatabase::create(float sampleRate)
43 { 43 {
44 OwnPtr<HRTFDatabase> hrtfDatabase = adoptPtr(new HRTFDatabase(sampleRate)); 44 return adoptPtr(new HRTFDatabase(sampleRate));
45 return hrtfDatabase.release();
46 } 45 }
47 46
48 HRTFDatabase::HRTFDatabase(float sampleRate) 47 HRTFDatabase::HRTFDatabase(float sampleRate)
49 : m_elevations(NumberOfTotalElevations) 48 : m_elevations(NumberOfTotalElevations)
50 , m_sampleRate(sampleRate) 49 , m_sampleRate(sampleRate)
51 { 50 {
52 unsigned elevationIndex = 0; 51 unsigned elevationIndex = 0;
53 for (int elevation = MinElevation; elevation <= MaxElevation; elevation += R awElevationAngleSpacing) { 52 for (int elevation = MinElevation; elevation <= MaxElevation; elevation += R awElevationAngleSpacing) {
54 OwnPtr<HRTFElevation> hrtfElevation = HRTFElevation::createForSubject("C omposite", elevation, sampleRate); 53 OwnPtr<HRTFElevation> hrtfElevation = HRTFElevation::createForSubject("C omposite", elevation, sampleRate);
55 ASSERT(hrtfElevation.get()); 54 ASSERT(hrtfElevation.get());
56 if (!hrtfElevation.get()) 55 if (!hrtfElevation.get())
57 return; 56 return;
58 57
59 m_elevations[elevationIndex] = hrtfElevation.release(); 58 m_elevations[elevationIndex] = std::move(hrtfElevation);
60 elevationIndex += InterpolationFactor; 59 elevationIndex += InterpolationFactor;
61 } 60 }
62 61
63 // Now, go back and interpolate elevations. 62 // Now, go back and interpolate elevations.
64 if (InterpolationFactor > 1) { 63 if (InterpolationFactor > 1) {
65 for (unsigned i = 0; i < NumberOfTotalElevations; i += InterpolationFact or) { 64 for (unsigned i = 0; i < NumberOfTotalElevations; i += InterpolationFact or) {
66 unsigned j = (i + InterpolationFactor); 65 unsigned j = (i + InterpolationFactor);
67 if (j >= NumberOfTotalElevations) 66 if (j >= NumberOfTotalElevations)
68 j = i; // for last elevation interpolate with itself 67 j = i; // for last elevation interpolate with itself
69 68
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
107 { 106 {
108 // Clamp to allowed range. 107 // Clamp to allowed range.
109 elevationAngle = clampTo<double, double>(elevationAngle, MinElevation, MaxEl evation); 108 elevationAngle = clampTo<double, double>(elevationAngle, MinElevation, MaxEl evation);
110 109
111 unsigned elevationIndex = static_cast<int>(InterpolationFactor * (elevationA ngle - MinElevation) / RawElevationAngleSpacing); 110 unsigned elevationIndex = static_cast<int>(InterpolationFactor * (elevationA ngle - MinElevation) / RawElevationAngleSpacing);
112 return elevationIndex; 111 return elevationIndex;
113 } 112 }
114 113
115 } // namespace blink 114 } // namespace blink
116 115
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/platform/audio/FFTFrame.cpp ('k') | third_party/WebKit/Source/platform/audio/HRTFElevation.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698