Abstracted some complexity related to WebcamStream.

Sming/Components/Network/src/Network/TcpConnection.cpp

@@ -247,6 +247,9 @@ int TcpConnection::write(IDataSourceStream* stream)
 		char buffer[NETWORK_SEND_BUFFER_SIZE];
 		auto bytesRead = stream->readMemoryBlock(buffer, std::min(sizeof(buffer), available));
 		if(bytesRead == 0) {
+			if(pushCount == 0 && stream->available() != 0) {
+				pushCount = 1; // the stream has data but it is not ready yet, wait for next poll to try again
+			}
 			break;
 		}
 

Sming/Libraries/WebCam/src/Camera/CameraInterface.h

@@ -45,7 +45,7 @@ class CameraInterface
 	}
 
 	/**
-	 * Prepare for the next picture
+	 * @brief Prepare for the next picture
 	 */
 	virtual void next()
 	{
@@ -60,19 +60,14 @@ class CameraInterface
 	virtual bool capture() = 0;
 
 	/**
-	 * Gets the size of the current picture
+	 * @brief Gets the frames per second the camera can capture
 	 */
-	virtual size_t getSize() = 0;
+	virtual uint8_t getFramesPerSecond() = 0;
 
-	/**
-	 * @brief Read picture data from the camera.
-	 * @param buffer the allocated data buffer to store the data
-	 * @param size the size of the allocated buffer
-	 * @param offset
-	 *
-	 * @retval bytes successfully read and stored in the buffer
+	/** @brief Create a new image stream. The stream is owned by the caller and must be deleted.
+	 *  @retval IDataSourceStream Pointer to the new image stream
 	 */
-	virtual size_t read(char* buffer, size_t size, size_t offset = 0) = 0;
+	virtual IDataSourceStream* newImageStream() = 0;
 
 protected:
 	CameraState state = eWCS_NOT_READY;

Sming/Libraries/WebCam/src/Camera/FakeCamera.h

@@ -15,16 +15,19 @@
 #include "CameraInterface.h"
 #include <Data/Stream/FileStream.h>
 
-class FakeCamera: public CameraInterface
+class FakeCamera : public CameraInterface
 {
 public:
-
 	/**
-	 * Sets the list of all images that should be used to roll over.
+	 * @brief Sets the list of all images that should be used to roll over.
 	 */
-	FakeCamera(const Vector<String>& files)
+	FakeCamera()
+	{
+	}
+
+	void addImage(const String& filename)
 	{
-		this->files = files;
+		files.add(filename);
 	}
 
 	const String getMimeType() const override
@@ -43,8 +46,6 @@ class FakeCamera: public CameraInterface
 			return true;
 		}
 
-		state = eWCS_INITIALISING;
-		spiffs_mount(); // Mount file system, in order to work with files
 		state = eWCS_READY;
 		index = 0;
 		return true;
@@ -59,40 +60,30 @@ class FakeCamera: public CameraInterface
 			return false;
 		}
 
+		if(files.count() == 0) {
+			debug_w("No images added to the fake camera");
+			return false;
+		}
+
 		// go to the next picture.
-		auto& filename = files[index++];
+		index++;
 		if(index == files.count()) {
 			index = 0;
 		}
-		if(!file.open(filename)) {
-			return false;
-		}
+
 		state = eWCS_HAS_PICTURE;
 
 		return true;
 	}
 
-	/**
-	 * Gets the size of the current picture
-	 */
-	size_t getSize() override
+	uint8_t getFramesPerSecond() override
 	{
-		return file.getSize();
+		return 10; // fake camera supports 10 fps
 	}
 
-	/**
-	 * @brief Read picture data from the camera.
-	 * @param buffer the allocated data buffer to store the data
-	 * @param size the size of the allocated buffer
-	 * @param offset
-	 *
-	 * @retval bytes successfully read and stored in the buffer
-	 */
-	size_t read(char* buffer, size_t size, size_t offset = 0) override
+	IDataSourceStream* newImageStream() override
 	{
-		// get the current picture and read the desired data from it.
-		file.seekFrom(offset, SeekOrigin::Start);
-		return file.readMemoryBlock(buffer, size);
+		return new FileStream(files[index]);
 	}
 
 private:

Sming/Libraries/WebCam/src/WebcamStream.h

@@ -12,68 +12,61 @@
 
 #pragma once
 
-#include <Data/Stream/DataSourceStream.h>
+#include <Data/Stream/MultipartStream.h>
 #include "Camera/CameraInterface.h"
+#include <Data/Range.h>
 
-class WebcamStream: public IDataSourceStream
+/**
+ * @brief Webcam stream producer for multipart streaming
+ */
+class WebcamStream : public MultipartStream
 {
 public:
-	/**
-	 * @param camera pointer to the camera object.
-	 */
-	WebcamStream(CameraInterface* camera, size_t blockSize = 512): camera(camera), blockSize(blockSize)
+	WebcamStream(CameraInterface& camera) : MultipartStream(std::bind(&WebcamStream::produce, this)), camera(camera)
 	{
-		assert(camera != nullptr);
 	}
 
-	uint16_t readMemoryBlock(char* data, int bufSize)
+	MultipartStream::BodyPart produce()
 	{
-		if(camera->getState() == eWCS_HAS_PICTURE) {
-			if(!size) {
-				size = camera->getSize();
-				offset = 0;
-			}
+		MultipartStream::BodyPart result;
 
-			return camera->read(data, bufSize, offset);
-		}
+		camera.capture();
+		result.stream = camera.newImageStream();
 
-		if(camera->getState() != eWCS_WORKING) {
-			if(camera->capture()) {
-				size = 0;
-				offset = 0;
-			}
-		}
+		result.headers = new HttpHeaders();
+		(*result.headers)[HTTP_HEADER_CONTENT_TYPE] = camera.getMimeType();
+		(*result.headers)[HTTP_HEADER_CONTENT_LENGTH] = result.stream->available();
 
-		return 0;
-	}
-
-	int available()
-	{
-		return size;
-	}
+		// Don't count first image
+		if(started) {
+			newImage = true;
+		} else {
+			// Note: This won't take into account changes of camera frame rate
+			int fps = TRange(1, 100).clip(camera.getFramesPerSecond());
+			frameTimer.reset(1000 / fps);
+			started = true;
+		}
 
-	bool seek(int len)
-	{
-		offset += len; // TODO: check for invalid offsets
-		return true;
+		return result;
 	}
 
-	bool isFinished()
+	uint16_t readMemoryBlock(char* data, int bufSize) override
 	{
-		bool finished = (size && offset >= size);
-		if(finished) {
-			camera->next();
+		if(newImage) {
+			if(!frameTimer.expired()) {
+				debug_d("Defer read to maintain fps");
+				return 0;
+			}
+			newImage = false;
+			frameTimer.start();
 		}
-		return finished;
-	}
 
-	~WebcamStream()
-	{
-		camera = nullptr;
+		return MultipartStream::readMemoryBlock(data, bufSize);
 	}
+
 private:
-	CameraInterface* camera = nullptr;
-	size_t blockSize;
-	size_t size = 0;
-	size_t offset = 0;
+	CameraInterface& camera;
+	OneShotFastMs frameTimer;
+	bool started{false};
+	bool newImage{false};
 };

samples/WebcamServer/app/application.cpp

@@ -1,6 +1,5 @@
 #include <SmingCore.h>
 
-#include <Data/Stream/MultipartStream.h>
 #include <WebcamStream.h>
 #include <Camera/FakeCamera.h>
 
@@ -13,7 +12,7 @@
 namespace
 {
 HttpServer server;
-FakeCamera* camera;
+FakeCamera camera;
 
 /*
  * default http handler to check if server is up and running
@@ -36,24 +35,11 @@ void onFile(HttpRequest& request, HttpResponse& response)
 	}
 }
 
-MultipartStream::BodyPart snapshotProducer()
-{
-	MultipartStream::BodyPart result;
-
-	WebcamStream* webcamStream = new WebcamStream(camera);
-	result.stream = webcamStream;
-
-	result.headers = new HttpHeaders();
-	(*result.headers)[HTTP_HEADER_CONTENT_TYPE] = camera->getMimeType();
-
-	return result;
-}
-
 void onStream(HttpRequest& request, HttpResponse& response)
 {
 	Serial.println(_F("perform onCapture()"));
 
-	MultipartStream* stream = new MultipartStream(snapshotProducer);
+	WebcamStream* stream = new WebcamStream(camera);
 	response.sendDataStream(stream, F("multipart/x-mixed-replace; boundary=") + stream->getBoundary());
 }
 
@@ -66,15 +52,15 @@ void onFavicon(HttpRequest& request, HttpResponse& response)
 void startWebServer()
 {
 	// Initialize the camera
-	Vector<String> images;
 	for(unsigned int i = 1; i < 6; i++) {
 		String s = "img";
 		s.concat(i, DEC, 2);
 		s += ".jpeg";
-		images.add(s);
+		camera.addImage(s);
 	}
-	camera = new FakeCamera(images);
-	camera->init();
+
+	spiffs_mount(); // Mount file system, in order to work with files
+	camera.init();
 
 	// .. and run the HTTP server
 	server.listen(80);
@@ -94,6 +80,8 @@ void init()
 	spiffs_mount();
 
 	WifiStation.enable(true);
+	WifiStation.config(WIFI_SSID, WIFI_PWD);
+	WifiAccessPoint.enable(false);
 
 	System.onReady(startWebServer);
 }