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

small code cleanup, add Warnings when using slow blend functions.

This commit is contained in:
Isaac Connor 2022-02-11 12:43:10 -05:00
parent 94bc40a6cf
commit 6e7e6d9e8e
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/zm_image.cpp
View File

@ -95,6 +95,7 @@ void Image::update_function_pointers() {
delta8_abgr = &std_delta8_abgr; delta8_abgr = &std_delta8_abgr;
delta8_gray8 = &std_delta8_gray8; delta8_gray8 = &std_delta8_gray8;
blend = &std_blend; blend = &std_blend;
Warning("Using slow std functions");
} else { } else {
// Use either sse or neon, or loop unrolled version // Use either sse or neon, or loop unrolled version
delta8_rgb = fptr_delta8_rgb; delta8_rgb = fptr_delta8_rgb;
@ -1737,7 +1738,6 @@ void Image::Overlay( const Image &image, const unsigned int lo_x, const unsigned
} // end void Image::Overlay( const Image &image, unsigned int x, unsigned int y ) } // end void Image::Overlay( const Image &image, unsigned int x, unsigned int y )
void Image::Blend( const Image &image, int transparency ) { void Image::Blend( const Image &image, int transparency ) {
uint8_t* new_buffer;
if ( !( if ( !(
width == image.width && height == image.height width == image.width && height == image.height
@ -1751,7 +1751,7 @@ void Image::Blend( const Image &image, int transparency ) {
if ( transparency <= 0 ) if ( transparency <= 0 )
return; return;
new_buffer = AllocBuffer(size); uint8_t* new_buffer = AllocBuffer(size);
#ifdef ZM_IMAGE_PROFILING #ifdef ZM_IMAGE_PROFILING
TimePoint start = std::chrono::steady_clock::now(); TimePoint start = std::chrono::steady_clock::now();
@ -3397,6 +3397,7 @@ __attribute__((noinline)) void neon64_armv8_fastblend(const uint8_t* col1, const
} }
__attribute__((noinline)) void std_blend(const uint8_t* col1, const uint8_t* col2, uint8_t* result, unsigned long count, double blendpercent) { __attribute__((noinline)) void std_blend(const uint8_t* col1, const uint8_t* col2, uint8_t* result, unsigned long count, double blendpercent) {
Warning("Using slow std_blend");
double divide = blendpercent / 100.0; double divide = blendpercent / 100.0;
double opacity = 1.0 - divide; double opacity = 1.0 - divide;
const uint8_t* const max_ptr = result + count; const uint8_t* const max_ptr = result + count;