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

Commit 99eeeb8d authored by Chavi Weingarten's avatar Chavi Weingarten
Browse files

Revert "Update screen capture functions to accept a ScreenCaptur..." 

Revert submission 12404049-async_screencapture

Reason for revert: 168149157, 168154840
Reverted Changes:
I54c34003c:Send ScreenCaptureListener to native screen captur...
I9cbc833f8:Update screen capture functions to accept a Screen...

Change-Id: Ib5eacad84b794897173516e7d29b9af1eecace60
Bug: 168149157
Bug: 168154840
parent dcafa8d5

libs/gui/SurfaceComposerClient.cpp

+34 −6
Original line number Diff line number Diff line
@@ -1921,29 +1921,57 @@ status_t SurfaceComposerClient::setGlobalShadowSettings(const half4& ambientColo 
}



// ----------------------------------------------------------------------------

status_t SyncScreenCaptureListener::onScreenCaptureComplete(

        const ScreenCaptureResults& captureResults) {

    resultsPromise.set_value(captureResults);

    return NO_ERROR;

}



ScreenCaptureResults SyncScreenCaptureListener::waitForResults() {

    std::future<ScreenCaptureResults> resultsFuture = resultsPromise.get_future();

    return resultsFuture.get();

}



status_t ScreenshotClient::captureDisplay(const DisplayCaptureArgs& captureArgs,

                                          const sp<IScreenCaptureListener>& captureListener) {

                                          ScreenCaptureResults& captureResults) {

    sp<ISurfaceComposer> s(ComposerService::getComposerService());

    if (s == nullptr) return NO_INIT;



    return s->captureDisplay(captureArgs, captureListener);

    sp<SyncScreenCaptureListener> captureListener = new SyncScreenCaptureListener();

    status_t status = s->captureDisplay(captureArgs, captureListener);

    if (status != NO_ERROR) {

        return status;

    }

    captureResults = captureListener->waitForResults();

    return captureResults.result;

}



status_t ScreenshotClient::captureDisplay(uint64_t displayOrLayerStack,

                                          const sp<IScreenCaptureListener>& captureListener) {

                                          ScreenCaptureResults& captureResults) {

    sp<ISurfaceComposer> s(ComposerService::getComposerService());

    if (s == nullptr) return NO_INIT;



    return s->captureDisplay(displayOrLayerStack, captureListener);

    sp<SyncScreenCaptureListener> captureListener = new SyncScreenCaptureListener();

    status_t status = s->captureDisplay(displayOrLayerStack, captureListener);

    if (status != NO_ERROR) {

        return status;

    }

    captureResults = captureListener->waitForResults();

    return captureResults.result;

}



status_t ScreenshotClient::captureLayers(const LayerCaptureArgs& captureArgs,

                                         const sp<IScreenCaptureListener>& captureListener) {

                                         ScreenCaptureResults& captureResults) {

    sp<ISurfaceComposer> s(ComposerService::getComposerService());

    if (s == nullptr) return NO_INIT;



    return s->captureLayers(captureArgs, captureListener);

    sp<SyncScreenCaptureListener> captureListener = new SyncScreenCaptureListener();

    status_t status = s->captureLayers(captureArgs, captureListener);

    if (status != NO_ERROR) {

        return status;

    }

    captureResults = captureListener->waitForResults();

    return captureResults.result;

}



} // namespace android

libs/gui/include/gui/SurfaceComposerClient.h

+13 −3
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 


#include <stdint.h>

#include <sys/types.h>

#include <future>

#include <set>

#include <unordered_map>

#include <unordered_set>
@@ -593,14 +594,23 @@ private: 


// ---------------------------------------------------------------------------



class SyncScreenCaptureListener : public BnScreenCaptureListener {

public:

    status_t onScreenCaptureComplete(const ScreenCaptureResults& captureResults) override;

    ScreenCaptureResults waitForResults();



private:

    std::promise<ScreenCaptureResults> resultsPromise;

};



class ScreenshotClient {

public:

    static status_t captureDisplay(const DisplayCaptureArgs& captureArgs,

                                   const sp<IScreenCaptureListener>& captureListener);

                                   ScreenCaptureResults& captureResults);

    static status_t captureDisplay(uint64_t displayOrLayerStack,

                                   const sp<IScreenCaptureListener>& captureListener);

                                   ScreenCaptureResults& captureResults);

    static status_t captureLayers(const LayerCaptureArgs& captureArgs,

                                  const sp<IScreenCaptureListener>& captureListener);

                                  ScreenCaptureResults& captureResults);

};



// ---------------------------------------------------------------------------

libs/gui/include/gui/SyncScreenCaptureListener.h

deleted100644 → 0
+0 −40
Original line number Diff line number Diff line 
/*

 * Copyright 2020 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



#pragma once



#include <gui/SurfaceComposerClient.h>

#include <future>



namespace android {



class SyncScreenCaptureListener : public BnScreenCaptureListener {

public:

    status_t onScreenCaptureComplete(const ScreenCaptureResults& captureResults) override {

        resultsPromise.set_value(captureResults);

        return NO_ERROR;

    }



    ScreenCaptureResults waitForResults() {

        std::future<ScreenCaptureResults> resultsFuture = resultsPromise.get_future();

        return resultsFuture.get();

    }



private:

    std::promise<ScreenCaptureResults> resultsPromise;

};



} // namespace android
 
 No newline at end of file

libs/gui/tests/BLASTBufferQueue_test.cpp

+0 −1
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ 
#include <gui/IGraphicBufferProducer.h>

#include <gui/IProducerListener.h>

#include <gui/SurfaceComposerClient.h>

#include <gui/SyncScreenCaptureListener.h>

#include <private/gui/ComposerService.h>

#include <ui/DisplayConfig.h>

#include <ui/GraphicBuffer.h>

libs/gui/tests/Surface_test.cpp

+0 −1
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ 
#include <gui/ISurfaceComposer.h>

#include <gui/Surface.h>

#include <gui/SurfaceComposerClient.h>

#include <gui/SyncScreenCaptureListener.h>

#include <inttypes.h>

#include <private/gui/ComposerService.h>

#include <ui/BufferQueueDefs.h>