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

Unified Diff: webrtc/audio/conversion.h

Issue 1390753002: Implement AudioReceiveStream::GetStats(). (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: merge master Created 5 years, 2 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webrtc/audio/audio_receive_stream_unittest.cc ('k') | webrtc/audio/scoped_voe_interface.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/audio/conversion.h
diff --git a/webrtc/modules/audio_coding/codecs/isac/main/source/audio_decoder_isac.cc b/webrtc/audio/conversion.h
similarity index 62%
copy from webrtc/modules/audio_coding/codecs/isac/main/source/audio_decoder_isac.cc
copy to webrtc/audio/conversion.h
index 89879adafba17f6f31bc393074bd6c8ccf0a0b37..c1cf9b632e87432f8d172e2edd1fa164365e5eeb 100644
--- a/webrtc/modules/audio_coding/codecs/isac/main/source/audio_decoder_isac.cc
+++ b/webrtc/audio/conversion.h
@@ -8,13 +8,15 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#include "webrtc/modules/audio_coding/codecs/isac/main/interface/audio_decoder_isac.h"
-
-#include "webrtc/modules/audio_coding/codecs/isac/audio_decoder_isac_t_impl.h"
+#ifndef WEBRTC_AUDIO_CONVERSION_H_
+#define WEBRTC_AUDIO_CONVERSION_H_
namespace webrtc {
-// Explicit instantiation:
-template class AudioDecoderIsacT<IsacFloat>;
-
+// Convert fixed point number with 14 bit fractional part, to floating point.
+inline float Q14ToFloat(uint16_t v) {
+ return static_cast<float>(v) / (1 << 14);
+}
} // namespace webrtc
+
+#endif // WEBRTC_AUDIO_CONVERSION_H_
« no previous file with comments | « webrtc/audio/audio_receive_stream_unittest.cc ('k') | webrtc/audio/scoped_voe_interface.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698