commit ec4a4d8d7ca53c217918514a758869fdc97a3af5
author Changyeon Jo <changyeon@google.com> Wed Jun 10 04:50:37 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jun 10 04:50:37 2020 +0000
tree e5dc4e0560b9ad81b6f03c433f83cfd4919b7150
parent 6793f85c1cafba6f1d4554c6a2ed63be4f7437a0
parent d24fcb2af082ff5ebf83f4d3e1f94769a8534d85

Merge "Modifies HalCamera::clientStreamEnding() method" into rvc-dev

evs/manager/1.1/HalCamera.cpp

diff --git a/evs/manager/1.1/HalCamera.cpp b/evs/manager/1.1/HalCamera.cpp
index 6e6f77d..38297bb 100644
--- a/evs/manager/1.1/HalCamera.cpp
+++ b/evs/manager/1.1/HalCamera.cpp
@@ -257,7 +257,7 @@
 }
 
 
-void HalCamera::clientStreamEnding(sp<VirtualCamera> client) {
+void HalCamera::clientStreamEnding(const VirtualCamera* client) {
     {
         std::lock_guard<std::mutex> lock(mFrameMutex);
         auto itReq = mNextRequests->begin();
@@ -269,7 +269,7 @@
             }
         }
 
-        const uint64_t clientId = reinterpret_cast<const uint64_t>(client.get());
+        const uint64_t clientId = reinterpret_cast<const uint64_t>(client);
         if (itReq != mNextRequests->end()) {
             mNextRequests->erase(itReq);
 
@@ -282,7 +282,7 @@
 
         auto itCam = mClients.begin();
         while (itCam != mClients.end()) {
-            if (itCam->promote() == client.get()) {
+            if (itCam->promote() == client) {
                 break;
             } else {
                 ++itCam;

evs/manager/1.1/HalCamera.h

diff --git a/evs/manager/1.1/HalCamera.h b/evs/manager/1.1/HalCamera.h
index 7e010a6..efc5c25 100644
--- a/evs/manager/1.1/HalCamera.h
+++ b/evs/manager/1.1/HalCamera.h
@@ -94,7 +94,7 @@
                                         const int64_t timestamp);
 
     Return<EvsResult>   clientStreamStarting();
-    void                clientStreamEnding(sp<VirtualCamera> client);
+    void                clientStreamEnding(const VirtualCamera* client);
     Return<void>        doneWithFrame(const BufferDesc_1_0& buffer);
     Return<void>        doneWithFrame(const BufferDesc_1_1& buffer);
     Return<EvsResult>   setMaster(sp<VirtualCamera> virtualCamera);

evs/manager/1.1/VirtualCamera.cpp

diff --git a/evs/manager/1.1/VirtualCamera.cpp b/evs/manager/1.1/VirtualCamera.cpp
index 8b94a15..6204a78 100644
--- a/evs/manager/1.1/VirtualCamera.cpp
+++ b/evs/manager/1.1/VirtualCamera.cpp
@@ -90,10 +90,10 @@
         }
 
         mFramesHeld.clear();
-    }
 
-    // Drop our reference to our associated hardware camera
-    mHalCamera.clear();
+        // Drop our reference to our associated hardware camera
+        mHalCamera.clear();
+    }
 }