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

fix use of uint32_t for buffer indexes

This commit is contained in:
Isaac Connor 2021-02-17 13:38:52 -05:00
parent 1f2c7d3f98
commit 33b9dae0f2
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/zm_monitor.cpp
View File

@ -954,7 +954,7 @@ bool Monitor::connect() {
Debug(3, "Allocating %d image buffers", image_buffer_count); Debug(3, "Allocating %d image buffers", image_buffer_count);
image_buffer = new ZMPacket[image_buffer_count]; image_buffer = new ZMPacket[image_buffer_count];
for ( uint32_t i = 0; i < image_buffer_count; i++ ) { for ( int32_t i = 0; i < image_buffer_count; i++ ) {
image_buffer[i].image_index = i; image_buffer[i].image_index = i;
image_buffer[i].timestamp = &(shared_timestamps[i]); image_buffer[i].timestamp = &(shared_timestamps[i]);
image_buffer[i].image = new Image(width, height, camera->Colours(), camera->SubpixelOrder(), &(shared_images[i*camera->ImageSize()])); image_buffer[i].image = new Image(width, height, camera->Colours(), camera->SubpixelOrder(), &(shared_images[i*camera->ImageSize()]));
@ -1062,7 +1062,7 @@ bool Monitor::disconnect() {
#endif // ZM_MEM_MAPPED #endif // ZM_MEM_MAPPED
if (image_buffer) { if (image_buffer) {
for ( uint32_t i = 0; i < image_buffer_count; i++ ) { for ( int32_t i = 0; i < image_buffer_count; i++ ) {
// We delete the image because it is an object pointing to space that won't be free'd. // We delete the image because it is an object pointing to space that won't be free'd.
delete image_buffer[i].image; delete image_buffer[i].image;
image_buffer[i].image = nullptr; image_buffer[i].image = nullptr;
@ -1200,11 +1200,11 @@ struct timeval Monitor::GetTimestamp(int index) const {
} }
unsigned int Monitor::GetLastReadIndex() const { unsigned int Monitor::GetLastReadIndex() const {
return( shared_data->last_read_index!=(unsigned int)image_buffer_count?shared_data->last_read_index:-1 ); return ( shared_data->last_read_index != image_buffer_count ? shared_data->last_read_index : -1 );
} }
unsigned int Monitor::GetLastWriteIndex() const { unsigned int Monitor::GetLastWriteIndex() const {
return( shared_data->last_write_index!=(unsigned int)image_buffer_count?shared_data->last_write_index:-1 ); return ( shared_data->last_write_index != image_buffer_count ? shared_data->last_write_index : -1 );
} }
uint64_t Monitor::GetLastEventId() const { uint64_t Monitor::GetLastEventId() const {
@ -1215,7 +1215,7 @@ uint64_t Monitor::GetLastEventId() const {
double Monitor::GetFPS() const { double Monitor::GetFPS() const {
return get_capture_fps(); return get_capture_fps();
// last_write_index is the last capture index. It starts as == image_buffer_count so that the first asignment % image_buffer_count = 0; // last_write_index is the last capture index. It starts as == image_buffer_count so that the first asignment % image_buffer_count = 0;
uint32_t index1 = shared_data->last_write_index; int32_t index1 = shared_data->last_write_index;
if ( index1 >= image_buffer_count ) { if ( index1 >= image_buffer_count ) {
// last_write_index only has this value on startup before capturing anything. // last_write_index only has this value on startup before capturing anything.
return 0.0; return 0.0;
@ -1229,9 +1229,9 @@ double Monitor::GetFPS() const {
} }
struct timeval time1 = *snap1->timestamp; struct timeval time1 = *snap1->timestamp;
uint32_t fps_image_count = image_buffer_count; int32_t fps_image_count = image_buffer_count;
uint32_t index2 = (index1+1)%image_buffer_count; int32_t index2 = (index1+1)%image_buffer_count;
Debug(2, "index2(%d)", index2); Debug(2, "index2(%d)", index2);
ZMPacket *snap2 = &image_buffer[index2]; ZMPacket *snap2 = &image_buffer[index2];
// the timestamp pointers are initialized on connection, so that's redundant // the timestamp pointers are initialized on connection, so that's redundant