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

Commit 09a5c6e3 authored by Ryan Prichard's avatar Ryan Prichard
Browse files

libcameraservice: avoid list<const T> 

A container of const T uses std::allocator<const T>, which was an
undocumented libc++ extension that has been removed.

See https://github.com/llvm/llvm-project/pull/96319.

Bug: 349681543
Test: m libcameraservice
Change-Id: Ib3ae6b55c4e95cd458e190511a59e8d0459cf16a
parent afc86da7

services/camera/libcameraservice/api2/CameraDeviceClient.cpp

+1 −1
Original line number Diff line number Diff line
@@ -292,7 +292,7 @@ binder::Status CameraDeviceClient::submitRequestList( 
    }



    List<const CameraDeviceBase::PhysicalCameraSettingsList> metadataRequestList;

    std::list<const SurfaceMap> surfaceMapList;

    std::list<SurfaceMap> surfaceMapList;

    submitInfo->mRequestId = mRequestIdCounter;

    uint32_t loopCounter = 0;

services/camera/libcameraservice/common/CameraDeviceBase.h

+2 −2
Original line number Diff line number Diff line
@@ -136,7 +136,7 @@ class CameraDeviceBase : public virtual FrameProducer { 
     * Output lastFrameNumber is the expected last frame number of the list of requests.

     */

    virtual status_t captureList(const List<const PhysicalCameraSettingsList> &requests,

                                 const std::list<const SurfaceMap> &surfaceMaps,

                                 const std::list<SurfaceMap> &surfaceMaps,

                                 int64_t *lastFrameNumber = NULL) = 0;



    /**
@@ -152,7 +152,7 @@ class CameraDeviceBase : public virtual FrameProducer { 
     * Output lastFrameNumber is the last frame number of the previous streaming request.

     */

    virtual status_t setStreamingRequestList(const List<const PhysicalCameraSettingsList> &requests,

                                             const std::list<const SurfaceMap> &surfaceMaps,

                                             const std::list<SurfaceMap> &surfaceMaps,

                                             int64_t *lastFrameNumber = NULL) = 0;



    /**

services/camera/libcameraservice/device3/Camera3Device.cpp

+8 −8
Original line number Diff line number Diff line
@@ -718,7 +718,7 @@ status_t Camera3Device::checkStatusOkToCaptureLocked() { 


status_t Camera3Device::convertMetadataListToRequestListLocked(

        const List<const PhysicalCameraSettingsList> &metadataList,

        const std::list<const SurfaceMap> &surfaceMaps,

        const std::list<SurfaceMap> &surfaceMaps,

        bool repeating, nsecs_t requestTimeNs,

        RequestList *requestList) {

    if (requestList == NULL) {
@@ -728,7 +728,7 @@ status_t Camera3Device::convertMetadataListToRequestListLocked( 


    int32_t burstId = 0;

    List<const PhysicalCameraSettingsList>::const_iterator metadataIt = metadataList.begin();

    std::list<const SurfaceMap>::const_iterator surfaceMapIt = surfaceMaps.begin();

    std::list<SurfaceMap>::const_iterator surfaceMapIt = surfaceMaps.begin();

    for (; metadataIt != metadataList.end() && surfaceMapIt != surfaceMaps.end();

            ++metadataIt, ++surfaceMapIt) {

        sp<CaptureRequest> newRequest = setUpRequestLocked(*metadataIt, *surfaceMapIt);
@@ -776,14 +776,14 @@ status_t Camera3Device::capture(CameraMetadata &request, int64_t* lastFrameNumbe 
    ATRACE_CALL();



    List<const PhysicalCameraSettingsList> requestsList;

    std::list<const SurfaceMap> surfaceMaps;

    std::list<SurfaceMap> surfaceMaps;

    convertToRequestList(requestsList, surfaceMaps, request);



    return captureList(requestsList, surfaceMaps, lastFrameNumber);

}



void Camera3Device::convertToRequestList(List<const PhysicalCameraSettingsList>& requestsList,

        std::list<const SurfaceMap>& surfaceMaps,

        std::list<SurfaceMap>& surfaceMaps,

        const CameraMetadata& request) {

    PhysicalCameraSettingsList requestList;

    requestList.push_back({getId(), request});
@@ -801,7 +801,7 @@ void Camera3Device::convertToRequestList(List<const PhysicalCameraSettingsList>& 


status_t Camera3Device::submitRequestsHelper(

        const List<const PhysicalCameraSettingsList> &requests,

        const std::list<const SurfaceMap> &surfaceMaps,

        const std::list<SurfaceMap> &surfaceMaps,

        bool repeating,

        /*out*/

        int64_t *lastFrameNumber) {
@@ -849,7 +849,7 @@ status_t Camera3Device::submitRequestsHelper( 
}



status_t Camera3Device::captureList(const List<const PhysicalCameraSettingsList> &requestsList,

                                    const std::list<const SurfaceMap> &surfaceMaps,

                                    const std::list<SurfaceMap> &surfaceMaps,

                                    int64_t *lastFrameNumber) {

    ATRACE_CALL();
@@ -861,7 +861,7 @@ status_t Camera3Device::setStreamingRequest(const CameraMetadata &request, 
    ATRACE_CALL();



    List<const PhysicalCameraSettingsList> requestsList;

    std::list<const SurfaceMap> surfaceMaps;

    std::list<SurfaceMap> surfaceMaps;

    convertToRequestList(requestsList, surfaceMaps, request);



    return setStreamingRequestList(requestsList, /*surfaceMap*/surfaceMaps,
@@ -870,7 +870,7 @@ status_t Camera3Device::setStreamingRequest(const CameraMetadata &request, 


status_t Camera3Device::setStreamingRequestList(

        const List<const PhysicalCameraSettingsList> &requestsList,

        const std::list<const SurfaceMap> &surfaceMaps, int64_t *lastFrameNumber) {

        const std::list<SurfaceMap> &surfaceMaps, int64_t *lastFrameNumber) {

    ATRACE_CALL();



    return submitRequestsHelper(requestsList, surfaceMaps, /*repeating*/true, lastFrameNumber);

services/camera/libcameraservice/device3/Camera3Device.h

+5 −5
Original line number Diff line number Diff line
@@ -129,12 +129,12 @@ class Camera3Device : 
    // idle state

    status_t capture(CameraMetadata &request, int64_t *lastFrameNumber = NULL) override;

    status_t captureList(const List<const PhysicalCameraSettingsList> &requestsList,

            const std::list<const SurfaceMap> &surfaceMaps,

            const std::list<SurfaceMap> &surfaceMaps,

            int64_t *lastFrameNumber = NULL) override;

    status_t setStreamingRequest(const CameraMetadata &request,

            int64_t *lastFrameNumber = NULL) override;

    status_t setStreamingRequestList(const List<const PhysicalCameraSettingsList> &requestsList,

            const std::list<const SurfaceMap> &surfaceMaps,

            const std::list<SurfaceMap> &surfaceMaps,

            int64_t *lastFrameNumber = NULL) override;

    status_t clearStreamingRequest(int64_t *lastFrameNumber = NULL) override;
@@ -702,17 +702,17 @@ class Camera3Device : 


    status_t convertMetadataListToRequestListLocked(

            const List<const PhysicalCameraSettingsList> &metadataList,

            const std::list<const SurfaceMap> &surfaceMaps,

            const std::list<SurfaceMap> &surfaceMaps,

            bool repeating, nsecs_t requestTimeNs,

            /*out*/

            RequestList *requestList);



    void convertToRequestList(List<const PhysicalCameraSettingsList>& requestsList,

            std::list<const SurfaceMap>& surfaceMaps,

            std::list<SurfaceMap>& surfaceMaps,

            const CameraMetadata& request);



    status_t submitRequestsHelper(const List<const PhysicalCameraSettingsList> &requestsList,

                                  const std::list<const SurfaceMap> &surfaceMaps,

                                  const std::list<SurfaceMap> &surfaceMaps,

                                  bool repeating,

                                  int64_t *lastFrameNumber = NULL);