ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed SSSE3 detection and changed few text strings.

This commit is contained in:
Kfir Itzhak 2011-08-21 01:43:30 +03:00
parent f266fd1f34
commit b3a1dcf032
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/zm_image.cpp
View File

@ -141,14 +141,14 @@ void Image::Initialise()
if(config.fast_image_blends) { if(config.fast_image_blends) {
if(config.cpu_extensions && sseversion >= 20) { if(config.cpu_extensions && sseversion >= 20) {
fptr_blend = &sse2_fastblend; /* SSE2 fast blend */ fptr_blend = &sse2_fastblend; /* SSE2 fast blend */
Debug(2,"Blend: using SSE2 fast blending"); Debug(2,"Blend: Using SSE2 fast blend function");
} else { } else {
fptr_blend = &std_fastblend; /* standard fast blend */ fptr_blend = &std_fastblend; /* standard fast blend */
Debug(2,"Blend: using standard fast blending"); Debug(2,"Blend: Using fast blend function");
} }
} else { } else {
fptr_blend = &std_blend; fptr_blend = &std_blend;
Debug(2,"Blend: using standard blending"); Debug(2,"Blend: Using standard blend function");
} }
__attribute__((aligned(16))) uint8_t blend1[16] = {142,255,159,91,88,227,0,52,37,80,152,97,104,252,90,82}; __attribute__((aligned(16))) uint8_t blend1[16] = {142,255,159,91,88,227,0,52,37,80,152,97,104,252,90,82};
@ -3547,7 +3547,6 @@ __attribute__ ((noinline)) void std_convert_abgr_gray8(const uint8_t* col1, uint
/* Converts a YUYV image into grayscale by extracting the Y channel */ /* Converts a YUYV image into grayscale by extracting the Y channel */
__attribute__ ((noinline)) void std_convert_yuyv_gray8(const uint8_t* col1, uint8_t* result, unsigned long count) { __attribute__ ((noinline)) void std_convert_yuyv_gray8(const uint8_t* col1, uint8_t* result, unsigned long count) {
const uint16_t* yuvbuf = (const uint16_t*)col1; const uint16_t* yuvbuf = (const uint16_t*)col1;
const uint8_t* const max_ptr = result + count; const uint8_t* const max_ptr = result + count;
while(result < max_ptr) { while(result < max_ptr) {

2
src/zm_utils.cpp
View File

@ -166,7 +166,7 @@ void ssedetect() {
: "%eax", "%ebx" : "%eax", "%ebx"
); );
if (r_ecx & 0x00000100) { if (r_ecx & 0x00000200) {
sseversion = 35; /* SSSE3 */ sseversion = 35; /* SSSE3 */
Debug(1,"Detected a x86\\x86-64 processor with SSSE3"); Debug(1,"Detected a x86\\x86-64 processor with SSSE3");
} else if (r_ecx & 0x00000001) { } else if (r_ecx & 0x00000001) {