Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion examples/camera/camera_bkgd.c
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
#include <semaphore.h>
#include <errno.h>
#include <debug.h>
#include <sys/boardctl.h>

#include <arch/board/board.h>
#include <nuttx/nx/nx.h>
Expand Down Expand Up @@ -248,7 +249,7 @@ int nximage_initialize(void)
}

/* Start a separate thread to listen for server events.
* For simplicity, use defaul thread attribute.
* For simplicity, use default thread attribute.
*/

ret = pthread_create(&thread, NULL, nximage_listener, NULL);
Expand Down
10 changes: 5 additions & 5 deletions examples/camera/camera_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -534,10 +534,10 @@ int main(int argc, FAR char *argv[])
* Set FULLHD size in ISX012 case, QUADVGA size in ISX019 case or other
* image sensors,
* Number of frame buffers is defined as STILL_BUFNUM(1).
* And all allocated memorys are VIDIOC_QBUFed.
* And all allocated memories are VIDIOC_QBUFed.
*/

if (capture_num != 0)
if (capture_num != 0 && capture_type == V4L2_BUF_TYPE_STILL_CAPTURE)
{
/* Determine image size from connected image sensor name,
* because video driver does not support VIDIOC_ENUM_FRAMESIZES
Expand Down Expand Up @@ -580,9 +580,9 @@ int main(int argc, FAR char *argv[])
* order from the captured frame buffer and a new camera image is
* recaptured.
*
* Allocate freame buffers for QVGA RGB565 size (320x240x2=150KB).
* Allocate frame buffers for QVGA RGB565 size (320x240x2=150KB).
* Number of frame buffers is defined as VIDEO_BUFNUM(3).
* And all allocated memorys are VIDIOC_QBUFed.
* And all allocated memories are VIDIOC_QBUFed.
*/

ret = camera_prepare(v_fd, V4L2_BUF_TYPE_VIDEO_CAPTURE,
Expand All @@ -603,7 +603,7 @@ int main(int argc, FAR char *argv[])
*
* APP_STATE_UNDER_CAPTURE:
* This state will start taking picture and store the image into files.
* Number of taking pictures is set capture_num valiable.
* Number of taking pictures is set capture_num variable.
* It can be changed by command line argument.
* After finishing taking pictures, the state will be changed to
* APP_STATE_AFTER_CAPTURE.
Expand Down
Loading