commit ca7719a4b7248a6965131474b6bb8dedb786bc19
author Haoxiang Li <haoxiangl@google.com> Wed Jun 03 20:51:11 2020 -0700
committer Haoxiang Li <haoxiangl@google.com> Tue Jun 09 21:52:30 2020 -0700
tree dff78615576214dade8a49bfc9cbbe74ddedef79
parent 70f9e0b6761cb4446f934f7e8943bed5558865b6

Create a thread to handle frames for 2d session

Create a process thread to handle all core lib related method, so the
capture thread won't potentially be blocked.

Bug: 157133689
Test: Manually launched SV service and app on Osprey
Change-Id: I8e0873a819d95b41452b3f16c9466956275c9a14

surround_view/service-impl/SurroundView2dSession.h

diff --git a/surround_view/service-impl/SurroundView2dSession.h b/surround_view/service-impl/SurroundView2dSession.h
index c9591f1..b0dcec7 100644
--- a/surround_view/service-impl/SurroundView2dSession.h
+++ b/surround_view/service-impl/SurroundView2dSession.h
@@ -31,6 +31,7 @@
 using ::android::hardware::Return;
 using ::android::hardware::hidl_vec;
 using ::android::sp;
+using ::std::condition_variable;
 
 using namespace android_auto::surround_view;
 
@@ -61,25 +62,32 @@
         projectCameraPoints_cb _hidl_cb) override;
 
 private:
-    void generateFrames();
     bool initialize();
 
+    void generateFrames();
+    void processFrames();
+
+    bool handleFrames(int sequenceId);
+
     enum StreamStateValues {
         STOPPED,
         RUNNING,
         STOPPING,
         DEAD,
     };
-    StreamStateValues mStreamState GUARDED_BY(mAccessLock);
 
     // Stream subscribed for the session.
     sp<ISurroundViewStream> mStream GUARDED_BY(mAccessLock);
+    StreamStateValues mStreamState GUARDED_BY(mAccessLock);
 
-    Sv2dConfig mConfig GUARDED_BY(mAccessLock);
-    int mHeight GUARDED_BY(mAccessLock);
-    Sv2dMappingInfo mInfo GUARDED_BY(mAccessLock);
+    thread mCaptureThread; // The thread we'll use to synthesize frames
+    thread mProcessThread; // The thread we'll use to process frames
 
-    thread mCaptureThread GUARDED_BY(mAccessLock);
+    // Used to signal a set of frames is ready
+    condition_variable mSignal GUARDED_BY(mAccessLock);
+    bool mFramesAvailable GUARDED_BY(mAccessLock);
+
+    int mSequenceId;
 
     struct FramesRecord {
         SvFramesDesc frames;
@@ -99,6 +107,12 @@
     vector<SurroundViewInputBufferPointers>
         mInputPointers GUARDED_BY(mAccessLock);
     SurroundViewResultPointer mOutputPointer GUARDED_BY(mAccessLock);
+
+    Sv2dConfig mConfig GUARDED_BY(mAccessLock);
+    int mHeight GUARDED_BY(mAccessLock);
+
+    // TODO(b/158479099): Rename it to mMappingInfo
+    Sv2dMappingInfo mInfo GUARDED_BY(mAccessLock);
     int mOutputWidth, mOutputHeight GUARDED_BY(mAccessLock);
 
     sp<GraphicBuffer> mSvTexture GUARDED_BY(mAccessLock);