2.0. bluefish_consumer: 24 bit audio.

[casparcg] / core / mixer / audio / audio_util.h

diff --git a/core/mixer/audio/audio_util.h b/core/mixer/audio/audio_util.h
index ff756cb7cd525450acd731a7a2762518920bc0ba..0cbebc3d1dbfc27158b33c3ce63eb9e00e9f427e 100644 (file)
--- a/core/mixer/audio/audio_util.h
+++ b/core/mixer/audio/audio_util.h
@@ -13,10 +13,22 @@ static std::vector<int16_t> audio_32_to_16(const boost::iterator_range<int32_t*>
        std::vector<int16_t> audio16(input.size());\r
        auto audio32_ptr = reinterpret_cast<const uint32_t*>(input.begin());\r
        auto audio16_ptr = reinterpret_cast<uint32_t*>(audio16.data());\r
-       auto size                = input.size();\r
+       auto size                = input.size()/2;\r
        for(int n = 0; n < size; ++n)           \r
-               audio16_ptr[n] = (audio32_ptr[n*2+1] & 0xffff0000) | ((audio32_ptr[n*2+0] >> 16) & 0x0000ffff); \r
+               audio16_ptr[n] = (audio32_ptr[n*2+1] & 0xffff0000) | (audio32_ptr[n*2+0] >> 16);        \r
        return audio16;\r
 }\r
 \r
+static std::vector<int8_t> audio_32_to_24(const boost::iterator_range<int32_t*>& input)\r
+{      \r
+       std::vector<int8_t> audio24(input.size()*3+16);\r
+       auto audio32_ptr = reinterpret_cast<const uint32_t*>(input.begin());\r
+       auto audio24_ptr = reinterpret_cast<uint8_t*>(audio24.data());\r
+       auto size                = input.size();\r
+       for(int n = 0; n < size; ++n)           \r
+               *reinterpret_cast<uint32_t*>(audio24_ptr + n*3) = *(audio32_ptr + n) >> 8;      \r
+       audio24.resize(input.size());\r
+       return audio24;\r
+}\r
+\r
 }}
\ No newline at end of file