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

Commit fa28812e authored by Dominik Laskowski's avatar Dominik Laskowski Committed by Android (Google) Code Review
Browse files

Merge "cmds: Use getInternalDisplayToken API"

parents 7b6fe4db 8a1f5067

cmds/screenrecord/screenrecord.cpp

+7 −2
Original line number Diff line number Diff line
@@ -86,6 +86,7 @@ using android::DISPLAY_ORIENTATION_90; 
using android::INFO_FORMAT_CHANGED;

using android::INFO_OUTPUT_BUFFERS_CHANGED;

using android::INVALID_OPERATION;

using android::NAME_NOT_FOUND;

using android::NO_ERROR;

using android::UNKNOWN_ERROR;
@@ -585,8 +586,12 @@ static status_t recordScreen(const char* fileName) { 
    self->startThreadPool();



    // Get main display parameters.

    sp<IBinder> mainDpy = SurfaceComposerClient::getBuiltInDisplay(

            ISurfaceComposer::eDisplayIdMain);

    const sp<IBinder> mainDpy = SurfaceComposerClient::getInternalDisplayToken();

    if (mainDpy == nullptr) {

        fprintf(stderr, "ERROR: no display\n");

        return NAME_NOT_FOUND;

    }



    DisplayInfo mainDpyInfo;

    err = SurfaceComposerClient::getDisplayInfo(mainDpy, &mainDpyInfo);

    if (err != NO_ERROR) {

cmds/stagefright/codec.cpp

+5 −3
Original line number Diff line number Diff line
@@ -411,10 +411,12 @@ int main(int argc, char **argv) { 
        composerClient = new SurfaceComposerClient;

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



        sp<IBinder> display(SurfaceComposerClient::getBuiltInDisplay(

                ISurfaceComposer::eDisplayIdMain));

        const sp<IBinder> display = SurfaceComposerClient::getInternalDisplayToken();

        CHECK(display != nullptr);



        DisplayInfo info;

        SurfaceComposerClient::getDisplayInfo(display, &info);

        CHECK_EQ(SurfaceComposerClient::getDisplayInfo(display, &info), NO_ERROR);



        ssize_t displayWidth = info.w;

        ssize_t displayHeight = info.h;

cmds/stagefright/mediafilter.cpp

+5 −3
Original line number Diff line number Diff line
@@ -748,10 +748,12 @@ int main(int argc, char **argv) { 
        composerClient = new SurfaceComposerClient;

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



        android::sp<IBinder> display(SurfaceComposerClient::getBuiltInDisplay(

                ISurfaceComposer::eDisplayIdMain));

        const android::sp<IBinder> display = SurfaceComposerClient::getInternalDisplayToken();

        CHECK(display != nullptr);



        DisplayInfo info;

        SurfaceComposerClient::getDisplayInfo(display, &info);

        CHECK_EQ(SurfaceComposerClient::getDisplayInfo(display, &info), NO_ERROR);



        ssize_t displayWidth = info.w;

        ssize_t displayHeight = info.h;

cmds/stagefright/stream.cpp

+5 −3
Original line number Diff line number Diff line
@@ -318,10 +318,12 @@ 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));

    const sp<IBinder> display = SurfaceComposerClient::getInternalDisplayToken();

    CHECK(display != nullptr);



    DisplayInfo info;

    SurfaceComposerClient::getDisplayInfo(display, &info);

    CHECK_EQ(SurfaceComposerClient::getDisplayInfo(display, &info), NO_ERROR);



    ssize_t displayWidth = info.w;

    ssize_t displayHeight = info.h;