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

Commit 33142e1e authored by Chong Zhang's avatar Chong Zhang Committed by Android (Google) Code Review
Browse files

Merge "wifi-display: pass session info to wifi display settings" into klp-dev

parents 2484040e 87ecf194

include/media/IRemoteDisplayClient.h

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ public: 
    // Provides a surface texture that the client should use to stream buffers to

    // the remote display.

    virtual void onDisplayConnected(const sp<IGraphicBufferProducer>& bufferProducer,

            uint32_t width, uint32_t height, uint32_t flags) = 0; // one-way

            uint32_t width, uint32_t height, uint32_t flags, uint32_t session) = 0; // one-way



    // Indicates that the remote display has been disconnected normally.

    // This method should only be called once the client has called 'dispose()'

media/libmedia/IRemoteDisplayClient.cpp

+4 −2
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ public: 
    }



    void onDisplayConnected(const sp<IGraphicBufferProducer>& bufferProducer,

            uint32_t width, uint32_t height, uint32_t flags)

            uint32_t width, uint32_t height, uint32_t flags, uint32_t session)

    {

        Parcel data, reply;

        data.writeInterfaceToken(IRemoteDisplayClient::getInterfaceDescriptor());
@@ -46,6 +46,7 @@ public: 
        data.writeInt32(width);

        data.writeInt32(height);

        data.writeInt32(flags);

        data.writeInt32(session);

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

    }
@@ -80,7 +81,8 @@ status_t BnRemoteDisplayClient::onTransact( 
            uint32_t width = data.readInt32();

            uint32_t height = data.readInt32();

            uint32_t flags = data.readInt32();

            onDisplayConnected(surfaceTexture, width, height, flags);

            uint32_t session = data.readInt32();

            onDisplayConnected(surfaceTexture, width, height, flags, session);

            return NO_ERROR;

        }

        case ON_DISPLAY_DISCONNECTED: {

media/libstagefright/wifi-display/source/WifiDisplaySource.cpp

+4 −2
Original line number Diff line number Diff line
@@ -416,7 +416,8 @@ void WifiDisplaySource::onMessageReceived(const sp<AMessage> &msg) { 
                                0, // height,

                                mUsingHDCP

                                    ? IRemoteDisplayClient::kDisplayFlagSecure

                                    : 0);

                                    : 0,

                                0);

                    } else {

                        size_t width, height;
@@ -435,7 +436,8 @@ void WifiDisplaySource::onMessageReceived(const sp<AMessage> &msg) { 
                                height,

                                mUsingHDCP

                                    ? IRemoteDisplayClient::kDisplayFlagSecure

                                    : 0);

                                    : 0,

                                playbackSessionID);

                    }

                }

media/libstagefright/wifi-display/wfd.cpp

+6 −4
Original line number Diff line number Diff line
@@ -55,7 +55,8 @@ struct RemoteDisplayClient : public BnRemoteDisplayClient { 
            const sp<IGraphicBufferProducer> &bufferProducer,

            uint32_t width,

            uint32_t height,

            uint32_t flags);

            uint32_t flags,

            uint32_t session);



    virtual void onDisplayDisconnected();

    virtual void onDisplayError(int32_t error);
@@ -91,9 +92,10 @@ void RemoteDisplayClient::onDisplayConnected( 
        const sp<IGraphicBufferProducer> &bufferProducer,

        uint32_t width,

        uint32_t height,

        uint32_t flags) {

    ALOGI("onDisplayConnected width=%u, height=%u, flags = 0x%08x",

          width, height, flags);

        uint32_t flags,

        uint32_t session) {

    ALOGI("onDisplayConnected width=%u, height=%u, flags = 0x%08x, session = %d",

          width, height, flags, session);



    if (bufferProducer != NULL) {

        mSurfaceTexture = bufferProducer;