commit b7600231c30be94a6b2dbfae6c1c00c6abebfb2a
author Ravneet <rdhanjal@google.com> Thu Jul 13 19:07:15 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Jul 13 19:07:15 2023 +0000
tree 237cf505140bf27d1283399495143dd62da797ac
parent 3da570666e387ed69d761540aefe840cae4b6cce
parent 0765e02674f741c1c3b6fd5a514ad100cd4fb2f6

Camera: Fix FD leak am: 0765e02674

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/24040326

Change-Id: I82723af08de29ef3f805c60f825d6bd4bbd161c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

services/camera/libcameraservice/device3/Camera3OutputStream.cpp

diff --git a/services/camera/libcameraservice/device3/Camera3OutputStream.cpp b/services/camera/libcameraservice/device3/Camera3OutputStream.cpp
index a387064..aaf5d8d 100644
--- a/services/camera/libcameraservice/device3/Camera3OutputStream.cpp
+++ b/services/camera/libcameraservice/device3/Camera3OutputStream.cpp
@@ -486,7 +486,7 @@
             bufferDeferred = true;
         } else {
             nsecs_t presentTime = mSyncToDisplay ?
-                    syncTimestampToDisplayLocked(captureTime, releaseFence->dup()) : captureTime;
+                    syncTimestampToDisplayLocked(captureTime, releaseFence) : captureTime;
 
             setTransform(transform, true/*mayChangeMirror*/);
             res = native_window_set_buffers_timestamp(mConsumer.get(), presentTime);
@@ -1410,7 +1410,7 @@
     }
 }
 
-nsecs_t Camera3OutputStream::syncTimestampToDisplayLocked(nsecs_t t, int releaseFence) {
+nsecs_t Camera3OutputStream::syncTimestampToDisplayLocked(nsecs_t t, sp<Fence> releaseFence) {
     nsecs_t currentTime = systemTime();
     if (!mFixedFps) {
         mLastCaptureTime = t;
@@ -1458,8 +1458,8 @@
                 mRefVsyncData = vsyncEventData;
                 mReferenceCaptureTime = t;
                 mReferenceArrivalTime = currentTime;
-                if (releaseFence != -1) {
-                    mReferenceFrameFence = new Fence(releaseFence);
+                if (releaseFence->isValid()) {
+                    mReferenceFrameFence = new Fence(releaseFence->dup());
                 } else {
                     mFenceSignalOffset = 0;
                 }

services/camera/libcameraservice/device3/Camera3OutputStream.h

diff --git a/services/camera/libcameraservice/device3/Camera3OutputStream.h b/services/camera/libcameraservice/device3/Camera3OutputStream.h
index 1435081..ebd5797 100644
--- a/services/camera/libcameraservice/device3/Camera3OutputStream.h
+++ b/services/camera/libcameraservice/device3/Camera3OutputStream.h
@@ -446,7 +446,7 @@
     static constexpr nsecs_t kTimelineThresholdNs = 1000000LL; // 1 millisecond
     static constexpr float kMaxIntervalRatioDeviation = 0.05f;
     static constexpr int kMaxTimelines = 2;
-    nsecs_t syncTimestampToDisplayLocked(nsecs_t t, int releaseFence);
+    nsecs_t syncTimestampToDisplayLocked(nsecs_t t, sp<Fence> releaseFence);
 
     // In case of fence being used
     sp<Fence> mReferenceFrameFence;