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

Commit 99c2f923 authored by Mathias Agopian's avatar Mathias Agopian Committed by Android (Google) Code Review
Browse files

Merge "replace getISurfaceTexture by getIGraphicBufferProducer"

parents e2fb1474 9e1cdea4

cmds/stagefright/stream.cpp

+1 −1
Original line number Diff line number Diff line
@@ -374,7 +374,7 @@ int main(int argc, char **argv) { 
        service->create(client, 0);



    if (player != NULL && player->setDataSource(source) == NO_ERROR) {

        player->setVideoSurfaceTexture(surface->getISurfaceTexture());

        player->setVideoSurfaceTexture(surface->getIGraphicBufferProducer());

        player->start();



        client->waitForEOS();

services/camera/libcameraservice/Camera2Client.cpp

+1 −1
Original line number Diff line number Diff line
@@ -488,7 +488,7 @@ status_t Camera2Client::setPreviewDisplay( 
    sp<IBinder> binder;

    sp<ANativeWindow> window;

    if (surface != 0) {

        binder = surface->getISurfaceTexture()->asBinder();

        binder = surface->getIGraphicBufferProducer()->asBinder();

        window = surface;

    }

services/camera/libcameraservice/CameraClient.cpp

+1 −1
Original line number Diff line number Diff line
@@ -301,7 +301,7 @@ status_t CameraClient::setPreviewWindow(const sp<IBinder>& binder, 
status_t CameraClient::setPreviewDisplay(const sp<Surface>& surface) {

    LOG1("setPreviewDisplay(%p) (pid %d)", surface.get(), getCallingPid());



    sp<IBinder> binder(surface != 0 ? surface->getISurfaceTexture()->asBinder() : 0);

    sp<IBinder> binder(surface != 0 ? surface->getIGraphicBufferProducer()->asBinder() : 0);

    sp<ANativeWindow> window(surface);

    return setPreviewWindow(binder, window);

}