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

Commit 17859d49 authored by Paul Chen's avatar Paul Chen Committed by Ian Zerny
Browse files

Revert "Camera: add webcam offline processing support" 

This reverts commit 7f2ce25f.

Reason for revert: aosp_x86-userdebug build break

Change-Id: Ie8ad10066ae5c473e183d930ab03e63b61a2dd75
parent cafc24b5

camera/device/3.4/default/ExternalCameraDeviceSession.cpp

+494 −102

File changed.

Preview size limit exceeded, changes collapsed.

camera/device/3.4/default/ExternalCameraUtils.cpp

+2 −545

File changed.

Preview size limit exceeded, changes collapsed.

camera/device/3.4/default/include/ext_device_v3_4_impl/ExternalCameraDeviceSession.h

+125 −100

File changed.

Preview size limit exceeded, changes collapsed.

camera/device/3.4/default/include/ext_device_v3_4_impl/ExternalCameraUtils.h

+11 −136

File changed.

Preview size limit exceeded, changes collapsed.

camera/device/3.5/default/ExternalCameraDeviceSession.cpp

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




ExternalCameraDeviceSession::BufferRequestThread::BufferRequestThread(

        wp<OutputThreadInterface> parent,

        wp<ExternalCameraDeviceSession> parent,

        sp<V3_5::ICameraDeviceCallback> callbacks) :

        mParent(parent),

        mCallbacks(callbacks) {}
@@ -254,8 +254,7 @@ void ExternalCameraDeviceSession::initOutputThread() { 
        mBufferRequestThread = new BufferRequestThread(this, mCallback_3_5);

        mBufferRequestThread->run("ExtCamBufReq", PRIORITY_DISPLAY);

    }

    mOutputThread = new OutputThread(

            this, mCroppingType, mCameraCharacteristics, mBufferRequestThread);

    mOutputThread = new OutputThread(this, mCroppingType, mBufferRequestThread);

}



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



ExternalCameraDeviceSession::OutputThread::OutputThread(

        wp<OutputThreadInterface> parent,

        wp<ExternalCameraDeviceSession> parent,

        CroppingType ct,

        const common::V1_0::helper::CameraMetadata& chars,

        sp<BufferRequestThread> bufReqThread) :

        V3_4::implementation::ExternalCameraDeviceSession::OutputThread(parent, ct, chars),

        V3_4::implementation::ExternalCameraDeviceSession::OutputThread(parent, ct),

        mBufferRequestThread(bufReqThread) {}



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