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

Commit 2352a815 authored by Jeff Brown's avatar Jeff Brown Committed by Android (Google) Code Review
Browse files

Merge "Use new surface flinger API." into jb-mr1-dev

parents 68536901 a6195dec

cmds/stagefright/codec.cpp

+4 −2
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ 
#include <media/stagefright/MediaCodecList.h>

#include <media/stagefright/MediaDefs.h>

#include <media/stagefright/NuMediaExtractor.h>

#include <gui/ISurfaceComposer.h>

#include <gui/SurfaceComposerClient.h>

#include <ui/DisplayInfo.h>
@@ -379,8 +380,10 @@ int main(int argc, char **argv) { 
        composerClient = new SurfaceComposerClient;

        CHECK_EQ(composerClient->initCheck(), (status_t)OK);



        sp<IBinder> display(SurfaceComposerClient::getBuiltInDisplay(

                ISurfaceComposer::eDisplayIdMain));

        DisplayInfo info;

        SurfaceComposerClient::getDisplayInfo(0, &info);

        SurfaceComposerClient::getDisplayInfo(display, &info);

        ssize_t displayWidth = info.w;

        ssize_t displayHeight = info.h;
@@ -388,7 +391,6 @@ int main(int argc, char **argv) { 


        control = composerClient->createSurface(

                String8("A Surface"),

                0,

                displayWidth,

                displayHeight,

                PIXEL_FORMAT_RGB_565,

cmds/stagefright/sf2.cpp

+0 −1
Original line number Diff line number Diff line
@@ -612,7 +612,6 @@ int main(int argc, char **argv) { 


        control = composerClient->createSurface(

                String8("A Surface"),

                0,

                1280,

                800,

                PIXEL_FORMAT_RGB_565,

cmds/stagefright/stagefright.cpp

+0 −1
Original line number Diff line number Diff line
@@ -922,7 +922,6 @@ int main(int argc, char **argv) { 


            control = composerClient->createSurface(

                    String8("A Surface"),

                    0,

                    1280,

                    800,

                    PIXEL_FORMAT_RGB_565,

cmds/stagefright/stream.cpp

+4 −2
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 


#include <binder/IServiceManager.h>

#include <media/IMediaPlayerService.h>

#include <gui/ISurfaceComposer.h>

#include <gui/SurfaceComposerClient.h>



#include <fcntl.h>
@@ -306,8 +307,10 @@ int main(int argc, char **argv) { 
    sp<SurfaceComposerClient> composerClient = new SurfaceComposerClient;

    CHECK_EQ(composerClient->initCheck(), (status_t)OK);



    sp<IBinder> display(SurfaceComposerClient::getBuiltInDisplay(

            ISurfaceComposer::eDisplayIdMain));

    DisplayInfo info;

    SurfaceComposerClient::getDisplayInfo(0, &info);

    SurfaceComposerClient::getDisplayInfo(display, &info);

    ssize_t displayWidth = info.w;

    ssize_t displayHeight = info.h;
@@ -316,7 +319,6 @@ int main(int argc, char **argv) { 
    sp<SurfaceControl> control =

        composerClient->createSurface(

                String8("A Surface"),

                0,

                displayWidth,

                displayHeight,

                PIXEL_FORMAT_RGB_565,

media/libstagefright/tests/SurfaceMediaSource_test.cpp

+1 −1
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ protected: 
            ASSERT_EQ(NO_ERROR, mComposerClient->initCheck());



            mSurfaceControl = mComposerClient->createSurface(

                    String8("Test Surface"), 0,

                    String8("Test Surface"),

                    getSurfaceWidth(), getSurfaceHeight(),

                    PIXEL_FORMAT_RGB_888, 0);