Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2b7ab9d3 authored by Emilian Peev's avatar Emilian Peev
Browse files

DO NOT MERGE: resolve merge conflicts of... 

DO NOT MERGE: resolve merge conflicts of 458d1544 to tm-dev-plus-aosp

Test: I solemnly swear I tested this conflict resolution.
Bug: None
Change-Id: I894fdac0d9a18be53560363123c3d504e2c4c701
parents 5293829e 458d1544

services/camera/libcameraservice/device3/Camera3Device.h

+22 −0
Original line number Diff line number Diff line
@@ -453,6 +453,28 @@ class Camera3Device : 
                // Verify buffer caches

                std::vector<uint64_t> bufIds(offlineStream.circulatingBufferIds.begin(),

                        offlineStream.circulatingBufferIds.end());

                {

                    // Due to timing it is possible that we may not have any remaining pending

                    // capture requests that can update the caches on Hal side. This can result in

                    // buffer cache mismatch between the service and the Hal and must be accounted

                    // for.

                    std::lock_guard<std::mutex> l(mFreedBuffersLock);

                    for (const auto& it : mFreedBuffers) {

                        if (it.first == id) {

                            ALOGV("%s: stream ID %d buffer id %" PRIu64 " cache removal still "

                                    "pending", __FUNCTION__, id, it.second);

                            const auto& cachedEntry = std::find(bufIds.begin(), bufIds.end(),

                                    it.second);

                            if (cachedEntry != bufIds.end()) {

                                bufIds.erase(cachedEntry);

                            } else {

                                ALOGE("%s: stream ID %d buffer id %" PRIu64 " cache removal still "

                                        "pending however buffer is no longer in the offline stream "

                                        "info!", __FUNCTION__, id, it.second);

                            }

                        }

                    }

                }

                if (!verifyBufferIds(id, bufIds)) {

                    ALOGE("%s: stream ID %d buffer cache records mismatch!", __FUNCTION__, id);

                    return UNKNOWN_ERROR;