Index: webrtc/audio/conversion.h |
diff --git a/webrtc/modules/audio_device/android/ensure_initialized.h b/webrtc/audio/conversion.h |
similarity index 70% |
copy from webrtc/modules/audio_device/android/ensure_initialized.h |
copy to webrtc/audio/conversion.h |
index c1997b4acdf1484a41bffef16f66809e49fa6e90..4c0b7aab10864ac0ea75fa024ca7540e6f7373fb 100644 |
--- a/webrtc/modules/audio_device/android/ensure_initialized.h |
+++ b/webrtc/audio/conversion.h |
@@ -8,10 +8,14 @@ |
* be found in the AUTHORS file in the root of the source tree. |
*/ |
-namespace webrtc { |
-namespace audiodevicemodule { |
+#ifndef WEBRTC_AUDIO_CONVERSION_H_ |
+#define WEBRTC_AUDIO_CONVERSION_H_ |
-void EnsureInitialized(); |
+namespace webrtc { |
-} // namespace audiodevicemodule |
+inline float Q14ToFloat(uint16_t v) { |
hta-webrtc
2015/10/20 21:29:00
What is the derviation of Q14? Is it a well known
the sun
2015/10/20 22:44:16
https://en.wikipedia.org/wiki/Q_(number_format)
Andrew MacDonald
2015/10/20 22:59:57
Haven't looked at what you're using this for, but
the sun
2015/10/21 08:29:13
Since you had to ask, there is definitely a need f
the sun
2015/10/21 08:29:13
I looked at that but decided against, since pullin
Andrew MacDonald
2015/10/21 18:15:58
I think what you have is good. Thanks for the expl
|
+ return static_cast<float>(v) / (1 << 14); |
+} |
} // namespace webrtc |
+ |
+#endif // WEBRTC_AUDIO_CONVERSION_H_ |