Merge whoosinn:sandbox/ZoneMinder into ai_server

Author: connortechnology

src/zm_ffmpeg.cpp

@@ -56,7 +56,7 @@ static CodecData dec_codecs[] = {
   { AV_CODEC_ID_AV1, "av1", "av1_vaapi", AV_PIX_FMT_YUV420P, AV_PIX_FMT_VAAPI, AV_HWDEVICE_TYPE_VAAPI, nullptr, nullptr },
   { AV_CODEC_ID_MJPEG, "mjpeg", "mjpeg", AV_PIX_FMT_YUVJ422P, AV_PIX_FMT_YUVJ422P, AV_HWDEVICE_TYPE_NONE, nullptr, nullptr },
   { AV_CODEC_ID_H264, "h264", "h264", AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV420P, AV_HWDEVICE_TYPE_NONE, nullptr, nullptr },
-  { AV_CODEC_ID_H264, "h264", "h264_v4lm2m", AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV420P, AV_HWDEVICE_TYPE_NONE, nullptr, nullptr },
+  { AV_CODEC_ID_H264, "h264", "h264_v4l2m2m", AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV420P, AV_HWDEVICE_TYPE_NONE, nullptr, nullptr },
   { AV_CODEC_ID_H264, "h264", "h264_qsv", AV_PIX_FMT_YUV420P, AV_PIX_FMT_QSV, AV_HWDEVICE_TYPE_QSV, nullptr, nullptr },
 };
 

src/zm_image.cpp

@@ -1853,7 +1853,7 @@ bool Image::EncodeJpeg(JOCTET *outbuffer, size_t *outbuffer_size, AVCodecContext
 	  ret = avcodec_receive_packet(p_jpegcodeccontext, pkt);
   }
   if (ret == 0) {
-    Debug(1, "receive_packet success");
+    Debug(1, "receive_packet success, pkt size is %u", pkt->size);
     memcpy(outbuffer, pkt->data, pkt->size);
     *outbuffer_size = pkt->size;
   } else {

src/zm_monitor.cpp

@@ -897,12 +897,6 @@ std::shared_ptr<Monitor> Monitor::Load(unsigned int p_id, bool load_zones,
 }
 
 bool Monitor::connect() {
-  ReloadZones();
-  if (zones.size() != zone_count) {
-    Warning("Monitor %d has incorrect zone_count %d != %zu", id, zone_count,
-            zones.size());
-    zone_count = zones.size();
-  }
   if (mem_ptr != nullptr) {
     Warning("Already connected. Please call disconnect first.");
   }
@@ -1136,6 +1130,12 @@ bool Monitor::connect() {
 
     ReloadLinkedMonitors();
 
+    // Normally we trust ZoneCount in the monitor field.  In a healthy db it should be correct. 
+    ReloadZones();
+    if (zones.size() != zone_count) {
+      Warning("Monitor %d has incorrect zone_count %d != %zu", id, zone_count, zones.size());
+      zone_count = zones.size();
+    }
 
     if (RTSP2Web_enabled) {
       RTSP2Web_Manager = new RTSP2WebManager(this);
@@ -2441,7 +2441,7 @@ int Monitor::Analyse() {
         shared_data->last_read_index = index;
         shared_data->analysis_image_count = analysis_image_count;
       } else if (objectdetection == OBJECT_DETECTION_NONE) {
-        if (1 and packet->analysis_image) {
+        if (packet->analysis_image) {
           analysis_image_buffer[index]->Assign(*packet->analysis_image);
           analysis_image_pixelformats[index] = packet->analysis_image->AVPixFormat();
           Debug(1, "image format %d, for index %d", analysis_image_pixelformats[index], index);
@@ -2456,7 +2456,7 @@ int Monitor::Analyse() {
           analysis_image_buffer[index]->Assign(packet->out_frame.get());
           analysis_image_pixelformats[index] = static_cast<AVPixelFormat>(packet->out_frame->format);
         } else {
-          Error( "Unable to find an image to assign for index %d packet %d", index, packet->image_index);
+          Debug(1, "Unable to find an image to assign for index %d packet %d", index, packet->image_index);
         }
         shared_analysis_timestamps[index] = zm::chrono::duration_cast<timeval>(packet->timestamp.time_since_epoch());
         shared_data->last_analysis_index = index;
@@ -2643,49 +2643,56 @@ std::pair<int, std::string> Monitor::Analyse_UVICORN(std::shared_ptr<ZMPacket> p
 
   //Image img(packet->in_frame.get(), 640, 640); // copy, since we are scaling, maybe better to take from in_frame
 
-  uint8_t *img_buffer = new uint8_t[img.Size()];
-  img.EncodeJpeg(static_cast<JOCTET *>(img_buffer), &img_buffer_size);
+  std::vector<uint8_t> img_buffer;
+  img_buffer.reserve(img.Size());
+
+  img.EncodeJpeg(static_cast<JOCTET *>(img_buffer.data()), &img_buffer_size);
 
   endtime = std::chrono::system_clock::now();
   Debug(1, "UVICORN took: %.3f seconds to scale file size is %zu.", FPSeconds(endtime - partial_starttime).count(), img_buffer_size);
   partial_starttime = endtime;
   //
   std::string response;
   response.reserve(4096);
+
   std::string endpoint = stringtf("http://127.0.0.1:8000/predict/?camera_id=%d", id);
-  curl_easy_setopt(curl, CURLOPT_FAILONERROR, 1);
-  //curl_easy_setopt(curl, CURLOPT_VERBOSE, 1L);
-  curl_easy_setopt(curl, CURLOPT_URL, endpoint.c_str());
-
-  curl_mime *mime = nullptr;
-  curl_mimepart *part = nullptr;
-  mime = curl_mime_init(curl);
-  part = curl_mime_addpart(mime);
-
-  struct transfer tr = {img_buffer, img_buffer_size, 0};
-  curl_mime_data_cb(part, (size_t)img_buffer_size, ReadCallback, NULL, NULL, &tr);
-  //curl_mime_data(part, (const char *)img_buffer, img_buffer_size);
-  curl_mime_name(part, "file");
-  curl_mime_filename(part, stringtf("camera%d.jpg", id).c_str());
-  
-  curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, WriteCallback);
-  curl_easy_setopt(curl, CURLOPT_WRITEDATA, &response);
-  curl_easy_setopt(curl, CURLOPT_MIMEPOST, mime);
-  curl_easy_setopt(curl, CURLOPT_SSL_VERIFYHOST, 0);
-  curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, 0);
-  curl_easy_setopt(curl, CURLOPT_TIMEOUT, 10); //timeout in seconds
-  CURLcode res = curl_easy_perform(curl);
-
-  if (res != CURLE_OK) {
-    Warning("CURL: Attempted to send to %s and got %s", endpoint.c_str(), curl_easy_strerror(res));
-    return std::make_pair(motion_score, cause);
+  if (endpoint.find("http") != std::string::npos) {
+    curl_easy_setopt(curl, CURLOPT_FAILONERROR, 1);
+    //curl_easy_setopt(curl, CURLOPT_VERBOSE, 1L);
+    curl_easy_setopt(curl, CURLOPT_URL, endpoint.c_str());
+
+    curl_mime *mime = nullptr;
+    curl_mimepart *part = nullptr;
+    mime = curl_mime_init(curl);
+    part = curl_mime_addpart(mime);
+
+    struct transfer tr = {img_buffer.data(), img_buffer_size, 0};
+    curl_mime_data_cb(part, (size_t)img_buffer_size, ReadCallback, NULL, NULL, &tr);
+    //curl_mime_data(part, (const char *)img_buffer, img_buffer_size);
+    curl_mime_name(part, "file");
+    curl_mime_filename(part, stringtf("camera%d.jpg", id).c_str());
+    
+    curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, WriteCallback);
+    curl_easy_setopt(curl, CURLOPT_WRITEDATA, &response);
+    curl_easy_setopt(curl, CURLOPT_MIMEPOST, mime);
+    curl_easy_setopt(curl, CURLOPT_SSL_VERIFYHOST, 0);
+    curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, 0);
+    curl_easy_setopt(curl, CURLOPT_TIMEOUT, 10); //timeout in seconds
+    CURLcode res = curl_easy_perform(curl);
+    curl_mime_free(mime);
+
+    if (res != CURLE_OK) {
+      Warning("CURL: Attempted to send to %s and got %s", endpoint.c_str(), curl_easy_strerror(res));
+      return std::make_pair(motion_score, cause);
+    }
+  } else {
+    // Write to local hotfolder
+    img.WriteJpeg(endpoint + stringtf("/camera%d.jpg", id));
   }
   endtime = std::chrono::system_clock::now();
   Debug(1, "UVICORN took: %.3f seconds to send.", FPSeconds(endtime - partial_starttime).count());
   partial_starttime = endtime;
   //Debug(1, "CURL: Success sending to %s, response is %s", endpoint.c_str(), response.c_str());
-  curl_mime_free(mime);
-  delete[] img_buffer;
 
   nlohmann::json detections = nlohmann::json::parse(response);
   Debug(1, "CURL detections %s", detections.dump().c_str());
@@ -2722,7 +2729,7 @@ std::pair<int, std::string> Monitor::Analyse_MotionDetection(std::shared_ptr<ZMP
   std::string cause = "";
 
   if (!(packet->in_frame or packet->image)) {
-    Error("no image so skipping motion detection");
+    Debug(1, "no image so skipping motion detection");
     return std::make_pair(motion_score, cause);
   }  // end if has image
 

src/zm_monitorstream.cpp

@@ -408,7 +408,7 @@ bool MonitorStream::sendFrame(Image *image, SystemTimePoint timestamp) {
       float factor = 128.0/l_height;
       l_height = 128;
       l_width = floor(l_width * factor);
-      Debug(1, "Adjust height to 128 using factor %.2f", factor);
+      Debug(1, "Adjust height to min 128, width to %d using factor %.2f", l_width, factor);
     }
     l_width += (2-l_width)%2;
 
@@ -929,6 +929,10 @@ void MonitorStream::runStream() {
       continue;
     } // end if ( (unsigned int)last_read_index != monitor->shared_data->last_decoder_index )
 
+    if (frames_to_send > 0 && frame_count >= frames_to_send) {
+      break;
+    }
+
     FPSeconds sleep_time;
     if (now >= when_to_send_next_frame) {
       // sent a frame, so update
@@ -982,9 +986,6 @@ void MonitorStream::runStream() {
             static_cast<int64>(std::chrono::duration_cast<Microseconds>(ttl).count()));
       break;
     }
-    if (frames_to_send > 0 && frame_count >= frames_to_send) {
-      break;
-    }
   } // end while ! zm_terminate
 
   if (buffered_playback) {

src/zm_videostore.cpp

@@ -824,7 +824,6 @@ bool VideoStore::setup_resampler() {
     for (i = 0; i < num_samplerates; i++)
       if (audio_out_ctx->sample_rate == supported_samplerates[i])
         break;
-
     if (i == num_samplerates) {
       Debug(1, "Specified sample rate %d is not supported by the %s encoder", audio_out_ctx->sample_rate, audio_out_codec->name);
 

web/skins/classic/views/js/watch.js

@@ -1110,6 +1110,15 @@ function initPage() {
   } else {
     alert("No monitor found for id "+monitorId);
   }
+
+  // If you click on the navigation links, shut down streaming so the browser can process it
+  document.querySelectorAll('#main-header-nav a').forEach(function(el) {
+    el.onclick = function() {
+      if (monitorStream) monitorStream.kill();
+    };
+  });
+
+  manageRTSP2WebChannelStream();
 } // initPage
 
 function watchFullscreen() {