add functions to set new sensor features

- white pixel correction
- black pixel correction
- denoise control
- lens correction
- raw gamma
- changeFrequence of Cam Sensor from 10 to 20 mhz
- AutoExposurecontrol
- Dcw
- AsyncClient: Handle Client Disconnect from Outside
- fix merge conflicts

Author: alorbach

src/esp32cam.cpp

@@ -42,6 +42,25 @@ CameraClass::changeResolution(const Resolution& resolution, int sleepFor)
   return true;
 }
 
+bool
+CameraClass::changeFrequence(int iMhz)
+{
+  sensor_t* sensor = esp_camera_sensor_get();
+  if (sensor == nullptr) {
+    return false;
+  }
+  
+  int iLedTimer = 0;
+  int ret = 0;
+  sensor->xclk_freq_hz = iMhz * 1000000U;
+//  ret = xclk_timer_conf(iLedTimer, sensor->xclk_freq_hz);
+  // if (sensor->set_xclk(sensor, iLedTimer, iMhz) != 0) {
+  if (ret  != 0) {
+    return false;
+  } else 
+	return true;
+}
+
 bool
 CameraClass::changeContrast(int ilevel)
 {
@@ -158,7 +177,7 @@ CameraClass::changGainceilingSensor(int iGainCeiling)
   } else
     return false;
 }
-
+   
 bool
 CameraClass::changeAwbGainControl(int iEnable)
 {
@@ -262,7 +281,7 @@ CameraClass::changeAecValue(int iValue)
     return false;
   }
 
-  if (sensor->set_agc_gain(sensor, iValue) == 0) {
+  if (sensor->set_aec_value(sensor, iValue) == 0) {
     return true;
   } else
     return false;
@@ -296,6 +315,105 @@ CameraClass::changVFlip(int iEnable)
     return false;
 }
 
+bool
+CameraClass::changBPC(int iEnable)
+{
+  sensor_t* sensor = esp_camera_sensor_get();
+  if (sensor == nullptr) {
+    return false;
+  }
+
+  if (sensor->set_bpc(sensor, iEnable) == 0) {
+    return true;
+  } else
+    return false;
+}
+
+bool
+CameraClass::changWPC(int iEnable)
+{
+  sensor_t* sensor = esp_camera_sensor_get();
+  if (sensor == nullptr) {
+    return false;
+  }
+
+  if (sensor->set_wpc(sensor, iEnable) == 0) {
+    return true;
+  } else
+    return false;
+}
+
+bool
+CameraClass::changDenoise(int iEnable)
+{
+  sensor_t* sensor = esp_camera_sensor_get();
+  if (sensor == nullptr) {
+    return false;
+  }
+
+  if (sensor->set_denoise(sensor, iEnable) == 0) {
+    return true;
+  } else
+    return false;
+}
+
+bool
+CameraClass::changLenc(int iEnable)
+{
+  sensor_t* sensor = esp_camera_sensor_get();
+  if (sensor == nullptr) {
+    return false;
+  }
+
+  if (sensor->set_lenc(sensor, iEnable) == 0) {
+    return true;
+  } else
+    return false;
+}
+
+bool
+CameraClass::changRawGMA(int iEnable)
+{
+  sensor_t* sensor = esp_camera_sensor_get();
+  if (sensor == nullptr) {
+    return false;
+  }
+
+  if (sensor->set_raw_gma(sensor, iEnable) == 0) {
+    return true;
+  } else
+    return false;
+}
+
+bool
+CameraClass::changAutoExposurecontrol(int iEnable)
+{
+  sensor_t* sensor = esp_camera_sensor_get();
+  if (sensor == nullptr) {
+    return false;
+  }
+
+  if (sensor->set_exposure_ctrl(sensor, iEnable) == 0) {
+    return true;
+  } else
+    return false;
+}
+
+bool
+CameraClass::changDcw(int iEnable)
+{
+  sensor_t* sensor = esp_camera_sensor_get();
+  if (sensor == nullptr) {
+    return false;
+  }
+
+  if (sensor->set_dcw(sensor, iEnable) == 0) {
+    return true;
+  } else
+    return false;
+}
+
+
 std::unique_ptr<Frame>
 CameraClass::capture()
 {
@@ -346,6 +464,7 @@ CameraClass::streamMjpeg(AsyncClient& client, const StreamMjpegConfig& cfg) {
                "\r\n");
   auto lastCapture = millis();
   int nFrames;
+  int nNullFrames = 0;
   for (nFrames = 0; cfg.maxFrames < 0 || nFrames < cfg.maxFrames; ++nFrames) {
     auto now = millis();
     auto sinceLastCapture = now - lastCapture;
@@ -356,19 +475,31 @@ CameraClass::streamMjpeg(AsyncClient& client, const StreamMjpegConfig& cfg) {
 
     auto frame = capture();
     if (frame == nullptr) {
-      break;
-    }
+	  nNullFrames++;
+	  if (nNullFrames > 10)
+		  break;
+	  else {
+		  // delay(100); // Delay short period!
+		  continue;
+	  }
+    } else {
+		nNullFrames = 0;
+	}
 
     char szTmp[256];
     size_t stLen = snprintf_P(szTmp, 256, PSTR(
 	"Content-Type: image/jpeg\r\n"
 	"Content-Length: %d\r\n"
 	"\r\n"), static_cast<int>(frame->size())
 	);
-    client.write((const char*) szTmp, stLen);
-    if (!frame->writeTo(client, cfg.frameTimeout)) {
-      break;
-    }
+	if (!client.disconnected()) {
+		client.write((const char*) szTmp, stLen);
+		if (!frame->writeTo(client, cfg.frameTimeout)) {
+		  break;
+		}
+	} else {
+	  break;
+	}
     client.write("\r\n--" BOUNDARY "\r\n");
     yield();
   }

src/esp32cam.h

@@ -8,6 +8,16 @@
 
 namespace esp32cam {
 
+struct StreamMjpegConfig
+{
+/// minimum interval between frame captures.
+int minInterval = 0;
+/// maximum number of frames before disconnecting.
+int maxFrames = -1;
+/// time limit of writing one frame in millis.
+int frameTimeout = 10000;
+};
+
 class CameraClass
 {
 public:
@@ -29,6 +39,13 @@ class CameraClass
   bool
   changeResolution(const Resolution& resolution, int sleepFor = 500);
 
+  /** \brief Change camera resolution.
+   *  \pre Change Camera Frequence Clock
+   *  \param iMhz new Frequence, must be in MHZ
+   */
+  bool
+  changeFrequence(int iMhz);
+
   /** \brief Change Sensor Contrast level
   * must be -2 to +2, default 0
   */
@@ -76,6 +93,12 @@ class CameraClass
    */
   bool
   changeAeLevels(int ilevel);
+  
+  /** \brief Enable/Disable  AEC (Auto Exposure Control)
+   *  \param iEnable must be 0(disable) or 1 (enable)
+   */
+  bool
+  changAutoExposurecontrol(int iEnable);
 
   /** \brief Change AGC Gain
    *  \param ilevel must be >= 0 and <= 30, default 30
@@ -141,22 +164,48 @@ class CameraClass
   */
   bool
   changVFlip(int iEnable);
+
+  /** \brief Enable/Disable black pixel correction
+   *  \param iEnable must be 0(disable) or 1 (enable)
+  */
+  bool
+  changBPC(int iEnable);
+
+  /** \brief Enable/Disable white pixel correction
+   *  \param iEnable must be 0(disable) or 1 (enable)
+  */
+  bool
+  changWPC(int iEnable);
+
+  /** \brief Enable/Disable Denoise Control
+   *  \param iEnable must be 0(disable) or 1 (enable)
+  */
+  bool
+  changDenoise(int iEnable);
+
+  /** \brief Enable/Disable Lenc Correction
+   *  \param iEnable must be 0(disable) or 1 (enable)
+  */
+  bool
+  changLenc(int iEnable);
+
+  /** \brief Enable/Disable RAW Gamma
+   *  \param iEnable must be 0(disable) or 1 (enable)
+  */
+  bool
+  changRawGMA(int iEnable);
+  
+  /** \brief Enable/Disable DCW
+   *  \param iEnable must be 0(disable) or 1 (enable)
+  */
+  bool
+  changDcw(int iEnable);
 
   /** \brief Capture a frame of picture.
    */
   std::unique_ptr<Frame>
   capture();
 
-  struct StreamMjpegConfig
-  {
-    /// minimum interval between frame captures.
-    int minInterval = 0;
-    /// maximum number of frames before disconnecting.
-    int maxFrames = -1;
-    /// time limit of writing one frame in millis.
-    int frameTimeout = 10000;
-  };
-
   /** \brief Stream Motion JPEG.
    *  \pre The camera has been initialized to JPEG mode.
    *  \return number of frames streamed.

src/internal/frame.hpp

@@ -93,11 +93,7 @@ class Frame
   /** \brief Convert frame to BMP.
    */
   bool toBmp();
-/** \we converted the buffer ourself outside the lib and need to set it!
-   */
-  void 
-  setData(uint8_t* newdata, size_t newsize, bool bIsBmp);
-
+  
   /** \we converted the buffer ourself outside the lib and need to set it!
    */
   void 

src/internal/resolution.cpp

@@ -40,4 +40,4 @@ Resolution::find(int minWidth, int minHeight)
   return res;
 }
 
-} // namespace esp32cam
+} // namespace esp32cam

src/internal/resolution.hpp

@@ -35,4 +35,4 @@ class Resolution
 
 } // namespace esp32cam
 
-#endif // ESP32CAM_RESOLUTION_HPP
+#endif // ESP32CAM_RESOLUTION_HPP