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

Commit 018107a8 authored by Zhijun He's avatar Zhijun He
Browse files

camera: Add surface set ID to OutputConfiguration 

Bug: 25088440
Change-Id: I95153522b8b1f3ec4c98800b94a95fe7782c9205
parent 97385561

camera/camera2/OutputConfiguration.cpp

+18 −1
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ namespace android { 




const int OutputConfiguration::INVALID_ROTATION = -1;

const int OutputConfiguration::INVALID_SET_ID = -1;



// Read empty strings without printing a false error message.

String16 OutputConfiguration::readMaybeEmptyString16(const Parcel& parcel) {
@@ -45,6 +46,10 @@ int OutputConfiguration::getRotation() const { 
    return mRotation;

}



int OutputConfiguration::getSurfaceSetID() const {

    return mSurfaceSetID;

}



OutputConfiguration::OutputConfiguration(const Parcel& parcel) {

    status_t err;

    int rotation = 0;
@@ -55,24 +60,36 @@ OutputConfiguration::OutputConfiguration(const Parcel& parcel) { 
        return;

    }



    int setID = INVALID_SET_ID;

    if ((err = parcel.readInt32(&setID)) != OK) {

        ALOGE("%s: Failed to read surface set ID from parcel", __FUNCTION__);

        mGbp = NULL;

        mSurfaceSetID = INVALID_SET_ID;

        return;

    }



    String16 name = readMaybeEmptyString16(parcel);

    const sp<IGraphicBufferProducer>& gbp =

            interface_cast<IGraphicBufferProducer>(parcel.readStrongBinder());

    mGbp = gbp;

    mRotation = rotation;

    mSurfaceSetID = setID;



    ALOGV("%s: OutputConfiguration: bp = %p, name = %s", __FUNCTION__,

          gbp.get(), String8(name).string());

}



OutputConfiguration::OutputConfiguration(sp<IGraphicBufferProducer>& gbp, int rotation) {

OutputConfiguration::OutputConfiguration(sp<IGraphicBufferProducer>& gbp, int rotation,

        int surfaceSetID) {

    mGbp = gbp;

    mRotation = rotation;

    mSurfaceSetID = surfaceSetID;

}



status_t OutputConfiguration::writeToParcel(Parcel& parcel) const {



    parcel.writeInt32(mRotation);

    parcel.writeInt32(mSurfaceSetID);

    parcel.writeString16(String16("unknown_name")); // name of surface

    sp<IBinder> b(IInterface::asBinder(mGbp));

    parcel.writeStrongBinder(b);

include/camera/camera2/OutputConfiguration.h

+5 −2
Original line number Diff line number Diff line
@@ -28,8 +28,10 @@ class OutputConfiguration : public virtual RefBase { 
public:



    static const int INVALID_ROTATION;

    static const int INVALID_SET_ID;

    sp<IGraphicBufferProducer> getGraphicBufferProducer() const;

    int                        getRotation() const;

    int                        getSurfaceSetID() const;



    /**

     * Keep impl up-to-date with OutputConfiguration.java in frameworks/base
@@ -39,12 +41,13 @@ public: 
    // getRotation will be INVALID_ROTATION if error occurred

    OutputConfiguration(const Parcel& parcel);



    OutputConfiguration(sp<IGraphicBufferProducer>& gbp, int rotation);

    OutputConfiguration(sp<IGraphicBufferProducer>& gbp, int rotation,

            int surfaceSetID = INVALID_SET_ID);



private:

    sp<IGraphicBufferProducer> mGbp;

    int                        mRotation;



    int                        mSurfaceSetID;

    // helper function

    static String16 readMaybeEmptyString16(const Parcel& parcel);

};