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

Commit 10d525e7 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes from topic "64-bit cameraserver" 

* changes:
  Camera: Enable 64-bit cameraserver builds
  Camera: Update ZSL result container
parents 7f1e9e2e 642fc1d0

camera/cameraserver/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ cc_binary { 
        "android.hardware.camera.device@3.2",

        "android.hardware.camera.device@3.4",

    ],

    compile_multilib: "prefer32",

    compile_multilib: "first",

    cflags: [

        "-Wall",

        "-Wextra",

services/camera/libcameraservice/api1/client2/ZslProcessor.cpp

+3 −3
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ ZslProcessor::ZslProcessor( 
    mBufferQueueDepth = mFrameListDepth + 1;



    mZslQueue.insertAt(0, mBufferQueueDepth);

    mFrameList.insertAt(0, mFrameListDepth);

    mFrameList.resize(mFrameListDepth);

    sp<CaptureSequencer> captureSequencer = mSequencer.promote();

    if (captureSequencer != 0) captureSequencer->setZslProcessor(this);

}
@@ -208,7 +208,7 @@ void ZslProcessor::onResultAvailable(const CaptureResult &result) { 
    // Corresponding buffer has been cleared. No need to push into mFrameList

    if (timestamp <= mLatestClearedBufferTimestamp) return;



    mFrameList.editItemAt(mFrameListHead) = result.mMetadata;

    mFrameList[mFrameListHead] = result.mMetadata;

    mFrameListHead = (mFrameListHead + 1) % mFrameListDepth;

}
@@ -671,7 +671,7 @@ status_t ZslProcessor::clearZslQueueLocked() { 
void ZslProcessor::clearZslResultQueueLocked() {

    mFrameList.clear();

    mFrameListHead = 0;

    mFrameList.insertAt(0, mFrameListDepth);

    mFrameList.resize(mFrameListDepth);

}



void ZslProcessor::dump(int fd, const Vector<String16>& /*args*/) const {

services/camera/libcameraservice/api1/client2/ZslProcessor.h

+1 −1
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ class ZslProcessor : 
    static const int32_t kDefaultMaxPipelineDepth = 4;

    size_t mBufferQueueDepth;

    size_t mFrameListDepth;

    Vector<CameraMetadata> mFrameList;

    std::vector<CameraMetadata> mFrameList;

    size_t mFrameListHead;



    ZslPair mNextPair;