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

Commit 73bbd1f1 authored by Eino-Ville Talvala's avatar Eino-Ville Talvala
Browse files

Camera2: Refactor preview/recording management to separate class. 

Untangle preview/recording management from main class to simplify
callpaths; in preparation for fixing several HAL/app interactions
bugs.

Bug: 7172543
Bug: 7159577
Bug: 7107220
Change-Id: Iab5503f66b35d88a1524111536a484c9e33fd934
parent 0517e304

services/camera/libcameraservice/Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ LOCAL_SRC_FILES:= \ 
    camera2/CameraMetadata.cpp \

    camera2/Parameters.cpp \

    camera2/FrameProcessor.cpp \

    camera2/StreamingProcessor.cpp \

    camera2/JpegProcessor.cpp \

    camera2/CallbackProcessor.cpp \

    camera2/ZslProcessor.cpp \

services/camera/libcameraservice/Camera2Client.cpp

+74 −492

File changed.

Preview size limit exceeded, changes collapsed.

services/camera/libcameraservice/Camera2Client.h

+4 −40
Original line number Diff line number Diff line
@@ -21,17 +21,15 @@ 
#include "CameraService.h"

#include "camera2/Parameters.h"

#include "camera2/FrameProcessor.h"

#include "camera2/StreamingProcessor.h"

#include "camera2/JpegProcessor.h"

#include "camera2/ZslProcessor.h"

#include "camera2/CaptureSequencer.h"

#include "camera2/CallbackProcessor.h"

#include <binder/MemoryBase.h>

#include <binder/MemoryHeapBase.h>

#include <gui/CpuConsumer.h>

#include <gui/BufferItemConsumer.h>



namespace android {



class IMemory;

/**

 * Implements the android.hardware.camera API on top of

 * camera device HAL version 2.
@@ -184,15 +182,10 @@ private: 


    sp<camera2::FrameProcessor> mFrameProcessor;



    /* Preview related members */

    /* Preview/Recording related members */



    int mPreviewStreamId;

    CameraMetadata mPreviewRequest;

    sp<IBinder> mPreviewSurface;

    sp<ANativeWindow> mPreviewWindow;



    status_t updatePreviewRequest(const Parameters &params);

    status_t updatePreviewStream(const Parameters &params);

    sp<camera2::StreamingProcessor> mStreamingProcessor;



    /** Preview callback related members */
@@ -204,35 +197,6 @@ private: 
    sp<camera2::JpegProcessor> mJpegProcessor;

    sp<camera2::ZslProcessor> mZslProcessor;



    /* Recording related members */



    int mRecordingStreamId;

    int mRecordingFrameCount;

    sp<BufferItemConsumer>    mRecordingConsumer;

    sp<ANativeWindow>  mRecordingWindow;

    // Simple listener that forwards frame available notifications from

    // a CPU consumer to the recording notification

    class RecordingWaiter: public BufferItemConsumer::FrameAvailableListener {

      public:

        RecordingWaiter(Camera2Client *parent) : mParent(parent) {}

        void onFrameAvailable() { mParent->onRecordingFrameAvailable(); }

      private:

        Camera2Client *mParent;

    };

    sp<RecordingWaiter>  mRecordingWaiter;

    CameraMetadata mRecordingRequest;

    sp<camera2::Camera2Heap> mRecordingHeap;



    static const size_t kDefaultRecordingHeapCount = 8;

    size_t mRecordingHeapCount;

    Vector<BufferItemConsumer::BufferItem> mRecordingBuffers;

    size_t mRecordingHeapHead, mRecordingHeapFree;

    // Handle new recording image buffers

    void onRecordingFrameAvailable();



    status_t updateRecordingRequest(const Parameters &params);

    status_t updateRecordingStream(const Parameters &params);



    /** Notification-related members */



    bool mAfInMotion;

services/camera/libcameraservice/camera2/JpegProcessor.cpp

+2 −0
Original line number Diff line number Diff line
@@ -20,6 +20,8 @@ 


#include <netinet/in.h>



#include <binder/MemoryBase.h>

#include <binder/MemoryHeapBase.h>

#include <utils/Log.h>

#include <utils/Trace.h>

services/camera/libcameraservice/camera2/JpegProcessor.h

+1 −1
Original line number Diff line number Diff line
@@ -25,11 +25,11 @@ 
#include <gui/CpuConsumer.h>

#include "Parameters.h"

#include "CameraMetadata.h"

#include "Camera2Heap.h"



namespace android {



class Camera2Client;

class MemoryHeapBase;



namespace camera2 {