diff --git a/camera.py b/camera.py index 7f30692..f70338e 100644 --- a/camera.py +++ b/camera.py @@ -11,7 +11,8 @@ import numpy as np class VideoCamera(object): def __init__(self, flip = False, file_type = ".jpg", photo_string= "stream_photo"): - self.vs = PiVideoStream(resolution=(1920, 1080), framerate=30).start() + # self.vs = PiVideoStream(resolution=(1920, 1080), framerate=30).start() + self.vs = PiVideoStream().start() self.flip = flip # Flip frame vertically self.file_type = file_type # image type i.e. .jpg self.photo_string = photo_string # Name to save the photo diff --git a/main.py b/main.py index 5ccfe87..603aa34 100644 --- a/main.py +++ b/main.py @@ -3,7 +3,7 @@ #Desc: This web application serves a motion JPEG stream # main.py # import the necessary packages -from flask import Flask, render_template, Response, request +from flask import Flask, render_template, Response, request, send_from_directory from camera import VideoCamera import os diff --git a/static/favicon.ico b/static/favicon.ico new file mode 100644 index 0000000..dcdebc4 Binary files /dev/null and b/static/favicon.ico differ diff --git a/templates/index.html b/templates/index.html index b7dc167..07bc3e7 100644 --- a/templates/index.html +++ b/templates/index.html @@ -1,6 +1,7 @@ +