git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches...

diff --git a/core/mixer/audio/audio_util.h b/core/mixer/audio/audio_util.h
index d00faeb84faafad5063aea04b172c57fc48894fe..adb839a413d8eeb63ca355fe10b7aebcb0952187 100644 (file)
--- a/core/mixer/audio/audio_util.h
+++ b/core/mixer/audio/audio_util.h
@@ -33,39 +33,39 @@ static std::vector<int16_t, tbb::cache_aligned_allocator<int16_t>> audio_32_to_1
        return output16;\r
 }\r
 \r
-//template<typename T>\r
-//static std::vector<int8_t, tbb::cache_aligned_allocator<int8_t>> audio_32_to_24(const T& audio_data)\r
-//{    \r
-//     auto size                = std::distance(std::begin(audio_data), std::end(audio_data));\r
-//     auto input8              = reinterpret_cast<const int8_t*>(&(*std::begin(audio_data)));\r
-//     auto output8     = std::vector<int8_t, tbb::cache_aligned_allocator<int8_t>>();\r
-//                     \r
-//     output8.reserve(size*3);\r
-//     for(int n = 0; n < size; ++n)\r
-//     {\r
-//             output8.push_back(input8[n*4+1]);\r
-//             output8.push_back(input8[n*4+2]);\r
-//             output8.push_back(input8[n*4+3]);\r
-//     }\r
-//\r
-//     return output8;\r
-//}\r
-//\r
-//template<typename T>\r
-//static std::vector<int8_t, tbb::cache_aligned_allocator<int8_t>> audio_32_to_16(const T& audio_data)\r
-//{    \r
-//     auto size                = std::distance(std::begin(audio_data), std::end(audio_data));\r
-//     auto input8              = reinterpret_cast<const int8_t*>(&(*std::begin(audio_data)));\r
-//     auto output8     = std::vector<int8_t, tbb::cache_aligned_allocator<int8_t>>();\r
-//                     \r
-//     output8.reserve(size*2);\r
-//     for(int n = 0; n < size; ++n)\r
-//     {\r
-//             output8.push_back(input8[n*4+2]);\r
-//             output8.push_back(input8[n*4+3]);\r
-//     }\r
-//\r
-//     return output8;\r
-//}\r
+template<typename T>\r
+static std::vector<int8_t, tbb::cache_aligned_allocator<int8_t>> audio_32_to_24(const T& audio_data)\r
+{      \r
+       auto size                = std::distance(std::begin(audio_data), std::end(audio_data));\r
+       auto input8              = reinterpret_cast<const int8_t*>(&(*std::begin(audio_data)));\r
+       auto output8     = std::vector<int8_t, tbb::cache_aligned_allocator<int8_t>>();\r
+                       \r
+       output8.reserve(size*3);\r
+       for(int n = 0; n < size; ++n)\r
+       {\r
+               output8.push_back(input8[n*4+1]);\r
+               output8.push_back(input8[n*4+2]);\r
+               output8.push_back(input8[n*4+3]);\r
+       }\r
+\r
+       return output8;\r
+}\r
+\r
+template<typename T>\r
+static std::vector<int8_t, tbb::cache_aligned_allocator<int8_t>> audio_32_to_16(const T& audio_data)\r
+{      \r
+       auto size                = std::distance(std::begin(audio_data), std::end(audio_data));\r
+       auto input8              = reinterpret_cast<const int8_t*>(&(*std::begin(audio_data)));\r
+       auto output8     = std::vector<int8_t, tbb::cache_aligned_allocator<int8_t>>();\r
+                       \r
+       output8.reserve(size*2);\r
+       for(int n = 0; n < size; ++n)\r
+       {\r
+               output8.push_back(input8[n*4+2]);\r
+               output8.push_back(input8[n*4+3]);\r
+       }\r
+\r
+       return output8;\r
+}\r
 \r
 }}
\ No newline at end of file