-rw-r--r-- | v3/EmulatedBaseCamera.cpp | 9 | ||||
-rw-r--r-- | v3/EmulatedBaseCamera.h | 3 | ||||
-rw-r--r-- | v3/EmulatedCamera3.cpp | 9 | ||||
-rw-r--r-- | v3/EmulatedCamera3.h | 3 | ||||
-rw-r--r--[-rwxr-xr-x] | v3/EmulatedCameraFactory.cpp | 114 | ||||
-rw-r--r--[-rwxr-xr-x] | v3/EmulatedCameraFactory.h | 5 | ||||
-rw-r--r-- | v3/EmulatedFakeCamera3.cpp | 27 | ||||
-rw-r--r-- | v3/EmulatedFakeCamera3.h | 3 | ||||
-rw-r--r--[-rwxr-xr-x] | v3/fake-pipeline2/Sensor.cpp | 72 | ||||
-rw-r--r--[-rwxr-xr-x] | v3/fake-pipeline2/Sensor.h | 1 | ||||
-rw-r--r--[-rwxr-xr-x] | v3/fake-pipeline2/camera_hw.cpp | 5 | ||||
-rw-r--r--[-rwxr-xr-x] | v3/inc/DebugUtils.h | 5 |
12 files changed, 178 insertions, 78 deletions
diff --git a/v3/fake-pipeline2/camera_hw.cpp b/v3/fake-pipeline2/camera_hw.cpp index 67c5ece..ec74667 100755..100644 --- a/v3/fake-pipeline2/camera_hw.cpp +++ b/v3/fake-pipeline2/camera_hw.cpp @@ -276,14 +276,13 @@ void *get_frame(struct VideoInfo *vinfo) /* fall through */ default: - DBG_LOGB("VIDIOC_DQBUF failed, errno=%d\n", errno); + CAMHAL_LOGDB("VIDIOC_DQBUF failed, errno=%d\n", errno); //CAMHAL_LOGDB //exit(1); /*here will generate crash, so delete. when ocour error, should break while() loop*/ set_device_status(vinfo); + return NULL; } - DBG_LOGB("VIDIOC_DQBUF failed, errno=%d\n", errno); } //DBG_LOGA("get frame\n"); - return vinfo->mem[vinfo->preview.buf.index]; } |