Skip to content

Commit 6117f71

Browse files
committed
Merge branch 'main' into dev
2 parents ddef1d0 + 8eb7692 commit 6117f71

File tree

4 files changed

+4
-1
lines changed

4 files changed

+4
-1
lines changed
1.37 MB
Binary file not shown.

docs/doc/en/video/uvc_streaming.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ Otherwise, the entire `USB` functionality will pause and wait, affecting other s
3535
Therefore, for users who also need other `USB` functionalities, it is recommended to use the `UvcStreamer` method when developing UVC display functionality based on `MaixPy`.
3636
Otherwise, ensure that the `MaixCAM` device has other network access methods, such as `WIFI`, to ensure proper development and debugging.
3737

38+
<video controls autoplay src="../../assets/maixcam-pro_uvcdemo.mp4" type="video/mp4"> Your browser does not support video playback. </video>
3839

3940
### UvcStreamer
4041

docs/doc/zh/video/uvc_streaming.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ update:
3030
故对于其它 `USB` 功能有需求的用户,在基于 `MaixPy` 开发 UVC 显示功能时建议采用 `UvcStreamer` 的实现。
3131
否则请保证 `MaixCAM` 设备有其它联网途径如 `WIFI` 以确保能正常开发调试。
3232

33+
<video controls autoplay src="../../assets/maixcam-pro_uvcdemo.mp4" type="video/mp4"> 您的浏览器不支持视频播放 </video>
34+
3335
### UvcStreamer
3436

3537
该方法不影响常态下 USB 功能,原理是分了两个进程。官方默认实现了一个 `server` 进程进行`UVC` 设备的事件处理,并封装了易用统一的刷图接口 `show(img)` 供用户使用,当成一个 `display` 线性逻辑操作即可。

docs/doc/zh/vision/find_blobs.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ while 1:
8080

8181
- `img`是通过`cam.read()`读取到的摄像头图像,当初始化的方式为`cam = camera.Camera(320, 240)`时,`img`对象是一张分辨率为320x240的RGB图。
8282
- `img.find_blobs`用来寻找色块, `thresholds` 是一个颜色阈值列表,每个元素是一个颜色阈值,同时找到多个阈值就传入多个,每个颜色阈值的格式为 `[L_MIN, L_MAX, A_MIN, A_MAX, B_MIN, B_MAX]`,这里的 `L``A``B``LAB`颜色空间的三个通道,`L` 通道是亮度,`A` 通道是红绿通道,`B` 通道是蓝黄通道。`pixels_threshold`是一个像素点数量的阈值,用来过滤一些不需要的小色块。
83-
- `img.draw_rect`用来画色块框,`blob[0]``blob[1]``blob[1]``blob[1]`分别代表色块左上角坐标x,色块左上角坐标y,色块宽度w和色块高度h
83+
- `img.draw_rect`用来画色块框,`blob[0]``blob[1]``blob[2]``blob[3]`分别代表色块左上角坐标x,色块左上角坐标y,色块宽度w和色块高度h
8484

8585
### 常用参数说明
8686

0 commit comments

Comments
 (0)