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

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

Issue 1530723004: Use clampTo instead of chaining std::max(std::min(...)) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Handling that minimumThumbLength > trackLen. Created 5 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) 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 17 matching lines...) Expand all
28 28
29 #include "config.h" 29 #include "config.h"
30 30
31 #if ENABLE(WEB_AUDIO) 31 #if ENABLE(WEB_AUDIO)
32 32
33 #include "platform/audio/HRTFKernel.h" 33 #include "platform/audio/HRTFKernel.h"
34 34
35 #include "platform/audio/AudioChannel.h" 35 #include "platform/audio/AudioChannel.h"
36 #include "platform/FloatConversion.h" 36 #include "platform/FloatConversion.h"
37 #include "wtf/MathExtras.h" 37 #include "wtf/MathExtras.h"
38 #include <algorithm>
Raymond Toy 2015/12/17 19:45:55 Why is algorithm needed now?
Daniel Bratell 2015/12/17 22:56:16 The code still uses std::min in the HRTFKernel con
38 39
39 namespace blink { 40 namespace blink {
40 41
41 // Takes the input AudioChannel as an input impulse response and calculates the average group delay. 42 // Takes the input AudioChannel as an input impulse response and calculates the average group delay.
42 // This represents the initial delay before the most energetic part of the impul se response. 43 // This represents the initial delay before the most energetic part of the impul se response.
43 // The sample-frame delay is removed from the impulseP impulse response, and thi s value is returned. 44 // The sample-frame delay is removed from the impulseP impulse response, and thi s value is returned.
44 // the length of the passed in AudioChannel must be a power of 2. 45 // the length of the passed in AudioChannel must be a power of 2.
45 static float extractAverageGroupDelay(AudioChannel* channel, size_t analysisFFTS ize) 46 static float extractAverageGroupDelay(AudioChannel* channel, size_t analysisFFTS ize)
46 { 47 {
47 ASSERT(channel); 48 ASSERT(channel);
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
107 } 108 }
108 109
109 // Interpolates two kernels with x: 0 -> 1 and returns the result. 110 // Interpolates two kernels with x: 0 -> 1 and returns the result.
110 PassOwnPtr<HRTFKernel> HRTFKernel::createInterpolatedKernel(HRTFKernel* kernel1, HRTFKernel* kernel2, float x) 111 PassOwnPtr<HRTFKernel> HRTFKernel::createInterpolatedKernel(HRTFKernel* kernel1, HRTFKernel* kernel2, float x)
111 { 112 {
112 ASSERT(kernel1 && kernel2); 113 ASSERT(kernel1 && kernel2);
113 if (!kernel1 || !kernel2) 114 if (!kernel1 || !kernel2)
114 return nullptr; 115 return nullptr;
115 116
116 ASSERT(x >= 0.0 && x < 1.0); 117 ASSERT(x >= 0.0 && x < 1.0);
117 x = std::min(1.0f, std::max(0.0f, x)); 118 x = clampTo(x, 0.0f, 1.0f);
118 119
119 float sampleRate1 = kernel1->sampleRate(); 120 float sampleRate1 = kernel1->sampleRate();
120 float sampleRate2 = kernel2->sampleRate(); 121 float sampleRate2 = kernel2->sampleRate();
121 ASSERT(sampleRate1 == sampleRate2); 122 ASSERT(sampleRate1 == sampleRate2);
122 if (sampleRate1 != sampleRate2) 123 if (sampleRate1 != sampleRate2)
123 return nullptr; 124 return nullptr;
124 125
125 float frameDelay = (1 - x) * kernel1->frameDelay() + x * kernel2->frameDelay (); 126 float frameDelay = (1 - x) * kernel1->frameDelay() + x * kernel2->frameDelay ();
126 127
127 OwnPtr<FFTFrame> interpolatedFrame = FFTFrame::createInterpolatedFrame(*kern el1->fftFrame(), *kernel2->fftFrame(), x); 128 OwnPtr<FFTFrame> interpolatedFrame = FFTFrame::createInterpolatedFrame(*kern el1->fftFrame(), *kernel2->fftFrame(), x);
128 return HRTFKernel::create(interpolatedFrame.release(), frameDelay, sampleRat e1); 129 return HRTFKernel::create(interpolatedFrame.release(), frameDelay, sampleRat e1);
129 } 130 }
130 131
131 } // namespace blink 132 } // namespace blink
132 133
133 #endif // ENABLE(WEB_AUDIO) 134 #endif // ENABLE(WEB_AUDIO)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698