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

Commit bd321b6e authored by Dan Stoza's avatar Dan Stoza Committed by Android (Google) Code Review
Browse files

Merge "libcameraservice: Stop using IGBC::BufferItem"

parents e5909807 549e735c

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

+5 −6
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 


#include <utils/Log.h>

#include <utils/Trace.h>

#include <gui/BufferItem.h>

#include <gui/Surface.h>

#include <media/hardware/MetadataBufferType.h>
@@ -679,7 +680,7 @@ status_t StreamingProcessor::processRecordingFrame() { 
    sp<Camera2Client> client = mClient.promote();

    if (client == 0) {

        // Discard frames during shutdown

        BufferItemConsumer::BufferItem imgBuffer;

        BufferItem imgBuffer;

        res = mRecordingConsumer->acquireBuffer(&imgBuffer, 0);

        if (res != OK) {

            if (res != BufferItemConsumer::NO_BUFFER_AVAILABLE) {
@@ -697,7 +698,7 @@ status_t StreamingProcessor::processRecordingFrame() { 
            with Camera2Client code calling into StreamingProcessor */

        SharedParameters::Lock l(client->getParameters());

        Mutex::Autolock m(mMutex);

        BufferItemConsumer::BufferItem imgBuffer;

        BufferItem imgBuffer;

        res = mRecordingConsumer->acquireBuffer(&imgBuffer, 0);

        if (res != OK) {

            if (res != BufferItemConsumer::NO_BUFFER_AVAILABLE) {
@@ -823,8 +824,7 @@ void StreamingProcessor::releaseRecordingFrame(const sp<IMemory>& mem) { 


    size_t itemIndex;

    for (itemIndex = 0; itemIndex < mRecordingBuffers.size(); itemIndex++) {

        const BufferItemConsumer::BufferItem item =

                mRecordingBuffers[itemIndex];

        const BufferItem item = mRecordingBuffers[itemIndex];

        if (item.mBuf != BufferItemConsumer::INVALID_BUFFER_SLOT &&

                item.mGraphicBuffer->handle == imgHandle) {

            break;
@@ -868,8 +868,7 @@ void StreamingProcessor::releaseAllRecordingFramesLocked() { 


    size_t releasedCount = 0;

    for (size_t itemIndex = 0; itemIndex < mRecordingBuffers.size(); itemIndex++) {

        const BufferItemConsumer::BufferItem item =

                mRecordingBuffers[itemIndex];

        const BufferItem item = mRecordingBuffers[itemIndex];

        if (item.mBuf != BufferItemConsumer::INVALID_BUFFER_SLOT) {

            res = mRecordingConsumer->releaseBuffer(mRecordingBuffers[itemIndex]);

            if (res != OK) {

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

+1 −1
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ class StreamingProcessor: 


    static const size_t kDefaultRecordingHeapCount = 8;

    size_t mRecordingHeapCount;

    Vector<BufferItemConsumer::BufferItem> mRecordingBuffers;

    Vector<BufferItem> mRecordingBuffers;

    size_t mRecordingHeapHead, mRecordingHeapFree;



    virtual bool threadLoop();

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

+1 −1
Original line number Diff line number Diff line
@@ -440,7 +440,7 @@ status_t ZslProcessor::processNewZslBuffer() { 
        zslConsumer = mZslConsumer;

    }

    ALOGVV("Trying to get next buffer");

    BufferItemConsumer::BufferItem item;

    BufferItem item;

    res = zslConsumer->acquireBuffer(&item, 0);

    if (res != OK) {

        if (res != BufferItemConsumer::NO_BUFFER_AVAILABLE) {

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

+2 −1
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include <utils/Vector.h>

#include <utils/Mutex.h>

#include <utils/Condition.h>

#include <gui/BufferItem.h>

#include <gui/BufferItemConsumer.h>

#include <camera/CameraMetadata.h>

#include <camera/CaptureResult.h>
@@ -103,7 +104,7 @@ class ZslProcessor: 
    sp<ANativeWindow>      mZslWindow;



    struct ZslPair {

        BufferItemConsumer::BufferItem buffer;

        BufferItem buffer;

        CameraMetadata frame;

    };

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

+2 −1
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include <utils/Vector.h>

#include <utils/Mutex.h>

#include <utils/Condition.h>

#include <gui/BufferItem.h>

#include <gui/BufferItemConsumer.h>

#include <camera/CameraMetadata.h>
@@ -104,7 +105,7 @@ class ZslProcessor3 : 
    sp<camera3::Camera3ZslStream> mZslStream;



    struct ZslPair {

        BufferItemConsumer::BufferItem buffer;

        BufferItem buffer;

        CameraMetadata frame;

    };