[streaming_consumer] Default to pcm_s24le for containers supporting it instead of...

[casparcg] / common / memshfl.h

diff --git a/common/memshfl.h b/common/memshfl.h
index f4636adaa2746c6fe3a29ce8d95d916435fc36d7..de5c439a2aca3ccbcad4380b653fc2bf836c5974 100644 (file)
--- a/common/memshfl.h
+++ b/common/memshfl.h
@@ -1,54 +1,58 @@
-/*\r
-* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>\r
-*\r
-* This file is part of CasparCG (www.casparcg.com).\r
-*\r
-* CasparCG is free software: you can redistribute it and/or modify\r
-* it under the terms of the GNU General Public License as published by\r
-* the Free Software Foundation, either version 3 of the License, or\r
-* (at your option) any later version.\r
-*\r
-* CasparCG is distributed in the hope that it will be useful,\r
-* but WITHOUT ANY WARRANTY; without even the implied warranty of\r
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
-* GNU General Public License for more details.\r
-*\r
-* You should have received a copy of the GNU General Public License\r
-* along with CasparCG. If not, see <http://www.gnu.org/licenses/>.\r
-*\r
-* Author: Robert Nagy, ronag89@gmail.com\r
-*/\r
-\r
-#pragma once\r
-\r
-#include <intrin.h>\r
-\r
-namespace caspar {\r
-       \r
-static void* aligned_memshfl(void* dest, const void* source, size_t count, int m1, int m2, int m3, int m4)\r
-{    \r
-       __m128i*           dest128 = reinterpret_cast<__m128i*>(dest);  \r
-       const __m128i* source128 = reinterpret_cast<const __m128i*>(source);\r
-\r
-       count /= 16; // 128 bit\r
-\r
-       __m128i xmm0, xmm1, xmm2, xmm3;\r
-\r
-       const __m128i mask128 = _mm_set_epi32(m1, m2, m3, m4);\r
-       for(size_t n = 0; n < count/4; ++n)\r
-       {\r
-               xmm0 = _mm_load_si128(source128++);     \r
-               xmm1 = _mm_load_si128(source128++);     \r
-               xmm2 = _mm_load_si128(source128++);     \r
-               xmm3 = _mm_load_si128(source128++);     \r
-\r
-               _mm_stream_si128(dest128++, _mm_shuffle_epi8(xmm0, mask128));\r
-               _mm_stream_si128(dest128++, _mm_shuffle_epi8(xmm1, mask128));\r
-               _mm_stream_si128(dest128++, _mm_shuffle_epi8(xmm2, mask128));\r
-               _mm_stream_si128(dest128++, _mm_shuffle_epi8(xmm3, mask128));\r
-       }\r
-       return dest;\r
-}\r
-\r
-\r
-}
\ No newline at end of file
+/*
+* Copyright (c) 2011 Sveriges Television AB <info@casparcg.com>
+*
+* This file is part of CasparCG (www.casparcg.com).
+*
+* CasparCG is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+*
+* CasparCG is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with CasparCG. If not, see <http://www.gnu.org/licenses/>.
+*
+* Author: Robert Nagy, ronag89@gmail.com
+*/
+
+#pragma once
+
+#ifdef _MSC_VER
+#include <intrin.h>
+#else
+#include <tmmintrin.h>
+#endif
+
+namespace caspar {
+       
+static void* aligned_memshfl(void* dest, const void* source, size_t count, int m1, int m2, int m3, int m4)
+{    
+       __m128i*           dest128 = reinterpret_cast<__m128i*>(dest);  
+       const __m128i* source128 = reinterpret_cast<const __m128i*>(source);
+
+       count /= 16; // 128 bit
+
+       __m128i xmm0, xmm1, xmm2, xmm3;
+
+       const __m128i mask128 = _mm_set_epi32(m1, m2, m3, m4);
+       for(size_t n = 0; n < count/4; ++n)
+       {
+               xmm0 = _mm_load_si128(source128++);     
+               xmm1 = _mm_load_si128(source128++);     
+               xmm2 = _mm_load_si128(source128++);     
+               xmm3 = _mm_load_si128(source128++);     
+
+               _mm_stream_si128(dest128++, _mm_shuffle_epi8(xmm0, mask128));
+               _mm_stream_si128(dest128++, _mm_shuffle_epi8(xmm1, mask128));
+               _mm_stream_si128(dest128++, _mm_shuffle_epi8(xmm2, mask128));
+               _mm_stream_si128(dest128++, _mm_shuffle_epi8(xmm3, mask128));
+       }
+       return dest;
+}
+
+
+}