steveyin commited on
Commit
b270af1
·
verified ·
1 Parent(s): 9ea09d3

Update webapp.py

Browse files
Files changed (1) hide show
  1. webapp.py +8 -14
webapp.py CHANGED
@@ -281,13 +281,11 @@ class DemoCase:
281
  if self._is_running:
282
  if self.stream0 is None:
283
  # Start the stream, set desired resolution to be 720p
284
- # options = {"STREAM_RESOLUTION": self.STREAM_RESOLUTION}
285
  self.stream0 = CamGear(
286
  source=self.url_dict[self.cam_loc],
287
  colorspace=None,
288
  stream_mode=True,
289
  logging=True,
290
- # **options
291
  ).start()
292
 
293
  try:
@@ -298,6 +296,8 @@ class DemoCase:
298
  frame = (np.random.standard_normal([
299
  self.FRAME_HEIGHT, self.FRAME_WIDTH, 3
300
  ]) * 255).astype(np.uint8)
 
 
301
 
302
  # do something with your OpenCV frame here
303
  draw_text(
@@ -315,7 +315,7 @@ class DemoCase:
315
  )
316
  # reducer frame size for performance, percentage int
317
  frame = await reducer(
318
- frame, percentage=self.frame_reduction*frame.shape[0]/720
319
  )
320
  # handle JPEG encoding & yield frame in byte format
321
  img_encoded = cv2.imencode(".jpg", frame)[1].tobytes()
@@ -387,14 +387,11 @@ class DemoCase:
387
  if self._is_running:
388
  if self.stream1 is None:
389
  # Start the stream, set desired quality as 720p
390
- # options = {"STREAM_RESOLUTION": self.STREAM_RESOLUTION}
391
  self.stream1 = CamGear(
392
  source=self.url_dict[self.cam_loc],
393
  colorspace=None,
394
  stream_mode=True,
395
- backend=cv2.CAP_GSTREAMER,
396
- logging=True,
397
- # **options
398
  ).start()
399
 
400
  if (self._is_tracking and self.stream1 is not None):
@@ -481,8 +478,9 @@ class DemoCase:
481
  frame = (np.random.standard_normal([
482
  self.FRAME_HEIGHT, self.FRAME_WIDTH, 3
483
  ]) * 255).astype(np.uint8)
484
- # break
485
-
 
486
  # do something with your OpenCV frame here
487
  draw_text(
488
  img=frame,
@@ -530,7 +528,7 @@ class DemoCase:
530
  # reducer frames size for performance, int percentage
531
  frame_tagged = await reducer(
532
  frame=frame_tagged,
533
- percentage=self.frame_reduction * (frame_tagged.shape[0] / 720) # noqa
534
  )
535
 
536
  # handle JPEG encoding & yield frame in byte format
@@ -1228,10 +1226,6 @@ logging.info(f"obj_class_id: {demo_case.obj_class_id}")
1228
  # setup webgear server
1229
  options = {
1230
  "custom_data_location": "./",
1231
- "enable_infinite_frames": True,
1232
- # "jpeg_compression_quality": 90,
1233
- # "jpeg_compression_fastdct": True,
1234
- # "jpeg_compression_fastupsample": True,
1235
  }
1236
 
1237
  web = WebGear(
 
281
  if self._is_running:
282
  if self.stream0 is None:
283
  # Start the stream, set desired resolution to be 720p
 
284
  self.stream0 = CamGear(
285
  source=self.url_dict[self.cam_loc],
286
  colorspace=None,
287
  stream_mode=True,
288
  logging=True,
 
289
  ).start()
290
 
291
  try:
 
296
  frame = (np.random.standard_normal([
297
  self.FRAME_HEIGHT, self.FRAME_WIDTH, 3
298
  ]) * 255).astype(np.uint8)
299
+ elif frame.shape != (self.FRAME_HEIGHT, self.FRAME_WIDTH, 3):
300
+ frame = cv2.resize(frame, (self.FRAME_HEIGHT, self.FRAME_WIDTH))
301
 
302
  # do something with your OpenCV frame here
303
  draw_text(
 
315
  )
316
  # reducer frame size for performance, percentage int
317
  frame = await reducer(
318
+ frame, percentage=self.frame_reduction
319
  )
320
  # handle JPEG encoding & yield frame in byte format
321
  img_encoded = cv2.imencode(".jpg", frame)[1].tobytes()
 
387
  if self._is_running:
388
  if self.stream1 is None:
389
  # Start the stream, set desired quality as 720p
 
390
  self.stream1 = CamGear(
391
  source=self.url_dict[self.cam_loc],
392
  colorspace=None,
393
  stream_mode=True,
394
+ logging=True
 
 
395
  ).start()
396
 
397
  if (self._is_tracking and self.stream1 is not None):
 
478
  frame = (np.random.standard_normal([
479
  self.FRAME_HEIGHT, self.FRAME_WIDTH, 3
480
  ]) * 255).astype(np.uint8)
481
+ elif frame.shape != (self.FRAME_HEIGHT, self.FRAME_WIDTH, 3):
482
+ frame = cv2.resize(frame, (self.FRAME_HEIGHT, self.FRAME_WIDTH))
483
+
484
  # do something with your OpenCV frame here
485
  draw_text(
486
  img=frame,
 
528
  # reducer frames size for performance, int percentage
529
  frame_tagged = await reducer(
530
  frame=frame_tagged,
531
+ percentage=self.frame_reduction
532
  )
533
 
534
  # handle JPEG encoding & yield frame in byte format
 
1226
  # setup webgear server
1227
  options = {
1228
  "custom_data_location": "./",
 
 
 
 
1229
  }
1230
 
1231
  web = WebGear(