summaryrefslogtreecommitdiff
Diffstat
-rw-r--r--v3/EmulatedFakeCamera3.cpp51
-rw-r--r--v3/EmulatedFakeCamera3.h5
-rw-r--r--v3/fake-pipeline2/Sensor.cpp80
-rw-r--r--v3/fake-pipeline2/Sensor.h8
-rw-r--r--v3/fake-pipeline2/camera_hw.cpp14
-rw-r--r--[-rwxr-xr-x]v3/fake-pipeline2/camera_hw.h2
6 files changed, 122 insertions, 38 deletions
diff --git a/v3/EmulatedFakeCamera3.h b/v3/EmulatedFakeCamera3.h
index b98beb8..e984cc3 100644
--- a/v3/EmulatedFakeCamera3.h
+++ b/v3/EmulatedFakeCamera3.h
@@ -199,7 +199,7 @@ private:
static const uint64_t kAvailableJpegMinDurations[];
static const int64_t kSyncWaitTimeout = 10000000; // 10 ms
- static const int32_t kMaxSyncTimeoutCount = 1000; // 1000 kSyncWaitTimeouts
+ static const int32_t kMaxSyncTimeoutCount = 300; // 1000 kSyncWaitTimeouts
static const uint32_t kFenceTimeoutMs = 2000; // 2 s
/****************************************************************************
@@ -287,6 +287,7 @@ private:
status_t setJpegCompressorListener(EmulatedFakeCamera3 *parent);
status_t startJpegCompressor(EmulatedFakeCamera3 *parent);
status_t shutdownJpegCompressor(EmulatedFakeCamera3 * parent);
+ void sendExitReadoutThreadSignal(void);
private:
static const nsecs_t kWaitPerLoop = 10000000L; // 10 ms
@@ -307,7 +308,7 @@ private:
Request mCurrentRequest;
// Jpeg completion callbacks
-
+ bool mExitReadoutThread;
Mutex mJpegLock;
bool mJpegWaiting;
camera3_stream_buffer mJpegHalBuffer;