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

Commit 8ac75d31 authored by Jamie Gennis's avatar Jamie Gennis Committed by Android (Google) Code Review
Browse files

Merge "Change the framework to use the new camera preview path."

parents 87d35257 89c2dd2c

include/surfaceflinger/Surface.h

+2 −3
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ private: 
    friend class SurfaceComposerClient;



    // camera and camcorder need access to the ISurface binder interface for preview

    friend class Camera;

    friend class CameraService;

    friend class MediaRecorder;

    // mediaplayer needs access to ISurface for display

    friend class MediaPlayer;
@@ -173,7 +173,7 @@ private: 
     * (eventually this should go away and be replaced by proper APIs)

     */

    // camera and camcorder need access to the ISurface binder interface for preview

    friend class Camera;

    friend class CameraService;

    friend class MediaRecorder;

    // MediaPlayer needs access to ISurface for display

    friend class MediaPlayer;
@@ -310,4 +310,3 @@ private: 
}; // namespace android



#endif // ANDROID_SF_SURFACE_H

libs/surfaceflinger_client/SharedBufferStack.cpp

+0 −5
Original line number Diff line number Diff line
@@ -344,11 +344,6 @@ ssize_t SharedBufferClient::dequeue() 
{

    SharedBufferStack& stack( *mSharedStack );



    if (stack.head == tail && stack.available == mNumBuffers) {

        LOGW("dequeue: tail=%d, head=%d, avail=%d, queued=%d",

                tail, stack.head, stack.available, stack.queued);

    }



    RWLock::AutoRLock _rd(mLock);



    const nsecs_t dequeueTime = systemTime(SYSTEM_TIME_THREAD);

libs/surfaceflinger_client/Surface.cpp

+10 −0
Original line number Diff line number Diff line
@@ -363,6 +363,13 @@ status_t Surface::writeToParcel( 
        height   = surface->mHeight;

        format   = surface->mFormat;

        flags    = surface->mFlags;

    } else if (surface != 0 && surface->mSurface != 0) {

        LOGW("Parceling invalid surface with non-NULL ISurface as NULL: "

             "mSurface = %p, mIdentity = %d, mWidth = %d, mHeight = %d, "

             "mFormat = %d, mFlags = 0x%08x, mInitCheck = %d",

             surface->mSurface.get(), surface->mIdentity, surface->mWidth,

             surface->mHeight, surface->mFormat, surface->mFlags,

             surface->mInitCheck);

    }

    parcel->writeStrongBinder(sur!=0 ? sur->asBinder() : NULL);

    parcel->writeInt32(identity);
@@ -434,6 +441,9 @@ void Surface::init() 
            mSharedBufferClient = new SharedBufferClient(

                    mClient.getSharedClient(), token, 2, mIdentity);

            mInitCheck = mClient.getSharedClient()->validate(token);

        } else {

            LOGW("Not initializing the shared buffer client because token = %d",

                    token);

        }

    }

}

services/surfaceflinger/SurfaceFlinger.cpp

+5 −2
Original line number Diff line number Diff line
@@ -1745,12 +1745,15 @@ ssize_t UserClient::getTokenForSurface(const sp<ISurface>& sur) const 
{

    int32_t name = NAME_NOT_FOUND;

    sp<Layer> layer(mFlinger->getLayer(sur));

    if (layer == 0) return name;

    if (layer == 0) {

        return name;

    }



    // if this layer already has a token, just return it

    name = layer->getToken();

    if ((name >= 0) && (layer->getClient() == this))

    if ((name >= 0) && (layer->getClient() == this)) {

        return name;

    }



    name = 0;

    do {