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

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

Merge "Camera: add webcam offline processing support"

parents 1bdaf3cc 7f2ce25f
Loading
Loading
Loading
Loading
+102 −494

File changed.

Preview size limit exceeded, changes collapsed.

+545 −2

File changed.

Preview size limit exceeded, changes collapsed.

+100 −125

File changed.

Preview size limit exceeded, changes collapsed.

+136 −11

File changed.

Preview size limit exceeded, changes collapsed.

+6 −4
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ Status ExternalCameraDeviceSession::importRequestLocked(


ExternalCameraDeviceSession::BufferRequestThread::BufferRequestThread(
        wp<ExternalCameraDeviceSession> parent,
        wp<OutputThreadInterface> parent,
        sp<V3_5::ICameraDeviceCallback> callbacks) :
        mParent(parent),
        mCallbacks(callbacks) {}
@@ -254,7 +254,8 @@ void ExternalCameraDeviceSession::initOutputThread() {
        mBufferRequestThread = new BufferRequestThread(this, mCallback_3_5);
        mBufferRequestThread->run("ExtCamBufReq", PRIORITY_DISPLAY);
    }
    mOutputThread = new OutputThread(this, mCroppingType, mBufferRequestThread);
    mOutputThread = new OutputThread(
            this, mCroppingType, mCameraCharacteristics, mBufferRequestThread);
}

void ExternalCameraDeviceSession::closeOutputThreadImpl() {
@@ -271,10 +272,11 @@ void ExternalCameraDeviceSession::closeOutputThread() {
}

ExternalCameraDeviceSession::OutputThread::OutputThread(
        wp<ExternalCameraDeviceSession> parent,
        wp<OutputThreadInterface> parent,
        CroppingType ct,
        const common::V1_0::helper::CameraMetadata& chars,
        sp<BufferRequestThread> bufReqThread) :
        V3_4::implementation::ExternalCameraDeviceSession::OutputThread(parent, ct),
        V3_4::implementation::ExternalCameraDeviceSession::OutputThread(parent, ct, chars),
        mBufferRequestThread(bufReqThread) {}

ExternalCameraDeviceSession::OutputThread::~OutputThread() {}
Loading