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

Commit 57c86189 authored by Wu-cheng Li's avatar Wu-cheng Li
Browse files

Pass camera frame metadata from camera service to Java. 

bug:4460717
Change-Id: I2fae6e1dfca6b8f3a5ee5716fc7817f5417bf657
parent 40cdc56e

camera/Camera.cpp

+3 −2
Original line number Diff line number Diff line
@@ -360,7 +360,8 @@ void Camera::notifyCallback(int32_t msgType, int32_t ext1, int32_t ext2) 
}



// callback from camera service when frame or image is ready

void Camera::dataCallback(int32_t msgType, const sp<IMemory>& dataPtr)

void Camera::dataCallback(int32_t msgType, const sp<IMemory>& dataPtr,

                          camera_frame_metadata_t *metadata)

{

    sp<CameraListener> listener;

    {
@@ -368,7 +369,7 @@ void Camera::dataCallback(int32_t msgType, const sp<IMemory>& dataPtr) 
        listener = mListener;

    }

    if (listener != NULL) {

        listener->postData(msgType, dataPtr);

        listener->postData(msgType, dataPtr, metadata);

    }

}

camera/ICameraClient.cpp

+15 −2
Original line number Diff line number Diff line
@@ -51,13 +51,18 @@ public: 
    }



    // generic data callback from camera service to app with image data

    void dataCallback(int32_t msgType, const sp<IMemory>& imageData)

    void dataCallback(int32_t msgType, const sp<IMemory>& imageData,

                      camera_frame_metadata_t *metadata)

    {

        LOGV("dataCallback");

        Parcel data, reply;

        data.writeInterfaceToken(ICameraClient::getInterfaceDescriptor());

        data.writeInt32(msgType);

        data.writeStrongBinder(imageData->asBinder());

        if (metadata) {

            data.writeInt32(metadata->number_of_faces);

            data.write(metadata->faces, sizeof(camera_face_t) * metadata->number_of_faces);

        }

        remote()->transact(DATA_CALLBACK, data, &reply, IBinder::FLAG_ONEWAY);

    }
@@ -96,7 +101,15 @@ status_t BnCameraClient::onTransact( 
            CHECK_INTERFACE(ICameraClient, data, reply);

            int32_t msgType = data.readInt32();

            sp<IMemory> imageData = interface_cast<IMemory>(data.readStrongBinder());

            dataCallback(msgType, imageData);

            camera_frame_metadata_t *metadata = NULL;

            if (data.dataAvail() > 0) {

                metadata = new camera_frame_metadata_t;

                metadata->number_of_faces = data.readInt32();

                metadata->faces = (camera_face_t *) data.readInplace(

                        sizeof(camera_face_t) * metadata->number_of_faces);

            }

            dataCallback(msgType, imageData, metadata);

            if (metadata) delete metadata;

            return NO_ERROR;

        } break;

        case DATA_CALLBACK_TIMESTAMP: {

include/camera/Camera.h

+4 −2
Original line number Diff line number Diff line
@@ -59,7 +59,8 @@ class CameraListener: virtual public RefBase 
{

public:

    virtual void notify(int32_t msgType, int32_t ext1, int32_t ext2) = 0;

    virtual void postData(int32_t msgType, const sp<IMemory>& dataPtr) = 0;

    virtual void postData(int32_t msgType, const sp<IMemory>& dataPtr,

                          camera_frame_metadata_t *metadata) = 0;

    virtual void postDataTimestamp(nsecs_t timestamp, int32_t msgType, const sp<IMemory>& dataPtr) = 0;

};
@@ -138,7 +139,8 @@ public: 


    // ICameraClient interface

    virtual void        notifyCallback(int32_t msgType, int32_t ext, int32_t ext2);

    virtual void        dataCallback(int32_t msgType, const sp<IMemory>& dataPtr);

    virtual void        dataCallback(int32_t msgType, const sp<IMemory>& dataPtr,

                                     camera_frame_metadata_t *metadata);

    virtual void        dataCallbackTimestamp(nsecs_t timestamp, int32_t msgType, const sp<IMemory>& dataPtr);



    sp<ICamera>         remote();

include/camera/ICameraClient.h

+3 −1
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include <binder/Parcel.h>

#include <binder/IMemory.h>

#include <utils/Timers.h>

#include <system/camera.h>



namespace android {
@@ -31,7 +32,8 @@ public: 
    DECLARE_META_INTERFACE(CameraClient);



    virtual void            notifyCallback(int32_t msgType, int32_t ext1, int32_t ext2) = 0;

    virtual void            dataCallback(int32_t msgType, const sp<IMemory>& data) = 0;

    virtual void            dataCallback(int32_t msgType, const sp<IMemory>& data,

                                         camera_frame_metadata_t *metadata) = 0;

    virtual void            dataCallbackTimestamp(nsecs_t timestamp, int32_t msgType, const sp<IMemory>& data) = 0;

};

media/libstagefright/CameraSource.cpp

+4 −2
Original line number Diff line number Diff line
@@ -37,7 +37,8 @@ struct CameraSourceListener : public CameraListener { 
    CameraSourceListener(const sp<CameraSource> &source);



    virtual void notify(int32_t msgType, int32_t ext1, int32_t ext2);

    virtual void postData(int32_t msgType, const sp<IMemory> &dataPtr);

    virtual void postData(int32_t msgType, const sp<IMemory> &dataPtr,

                          camera_frame_metadata_t *metadata);



    virtual void postDataTimestamp(

            nsecs_t timestamp, int32_t msgType, const sp<IMemory>& dataPtr);
@@ -63,7 +64,8 @@ void CameraSourceListener::notify(int32_t msgType, int32_t ext1, int32_t ext2) { 
    LOGV("notify(%d, %d, %d)", msgType, ext1, ext2);

}



void CameraSourceListener::postData(int32_t msgType, const sp<IMemory> &dataPtr) {

void CameraSourceListener::postData(int32_t msgType, const sp<IMemory> &dataPtr,

                                    camera_frame_metadata_t *metadata) {

    LOGV("postData(%d, ptr:%p, size:%d)",

         msgType, dataPtr->pointer(), dataPtr->size());