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

Commit f27976c2 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Camera: Adjust documentation and comments for insensitive language."... 

Merge "Camera: Adjust documentation and comments for insensitive language." into rvc-dev am: 4a29ff50

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/11936451

Change-Id: I6c1c761b2ee7fe4c57d31714c4ff032c37cdfb81
parents 0ab3f6cf 4a29ff50

camera/ndk/include/camera/NdkCameraMetadataTags.h

+5 −4
Original line number Diff line number Diff line
@@ -6054,10 +6054,11 @@ typedef enum acamera_metadata_tag { 
     * </ul></p>

     *

     * <p>The accuracy of the frame timestamp synchronization determines the physical cameras'

     * ability to start exposure at the same time. If the sensorSyncType is CALIBRATED,

     * the physical camera sensors usually run in master-slave mode so that their shutter

     * time is synchronized. For APPROXIMATE sensorSyncType, the camera sensors usually run in

     * master-master mode, and there could be offset between their start of exposure.</p>

     * ability to start exposure at the same time. If the sensorSyncType is CALIBRATED, the

     * physical camera sensors usually run in leader/follower mode where one sensor generates a

     * timing signal for the other, so that their shutter time is synchronized. For APPROXIMATE

     * sensorSyncType, the camera sensors usually run in leader/leader mode, where both sensors

     * use their own timing generator, and there could be offset between their start of exposure.</p>

     * <p>In both cases, all images generated for a particular capture request still carry the same

     * timestamps, so that they can be used to look up the matching frame number and

     * onCaptureStarted callback.</p>

services/camera/libcameraservice/CameraService.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1640,7 +1640,7 @@ Status CameraService::connectHelper(const sp<CALLBACK>& cameraCb, const String8& 
                    cameraId.string(), clientName8.string(), clientPid);

        }



        // Enforce client permissions and do basic sanity checks

        // Enforce client permissions and do basic validity checks

        if(!(ret = validateConnectLocked(cameraId, clientName8,

                /*inout*/clientUid, /*inout*/clientPid, /*out*/originalClientPid)).isOk()) {

            return ret;

services/camera/libcameraservice/api1/client2/Parameters.cpp

+1 −1
Original line number Diff line number Diff line
@@ -230,7 +230,7 @@ status_t Parameters::initialize(CameraDeviceBase *device, int deviceVersion) { 
    previewFpsRange[1] = fastInfo.bestStillCaptureFpsRange[1];



    // PREVIEW_FRAME_RATE / SUPPORTED_PREVIEW_FRAME_RATES are deprecated, but

    // still have to do something sane for them

    // still have to do something reasonable for them



    // NOTE: Not scaled like FPS range values are.

    int previewFps = fpsFromRange(previewFpsRange[0], previewFpsRange[1]);

services/camera/libcameraservice/api2/CameraDeviceClient.h

+1 −1
Original line number Diff line number Diff line
@@ -205,7 +205,7 @@ public: 
    virtual void notifyRepeatingRequestError(long lastFrameNumber);



    // utility function to convert AIDL SessionConfiguration to HIDL

    // streamConfiguration. Also checks for sanity of SessionConfiguration and

    // streamConfiguration. Also checks for validity of SessionConfiguration and

    // returns a non-ok binder::Status if the passed in session configuration

    // isn't valid.

    static binder::Status

services/camera/libcameraservice/utils/SessionConfigurationUtils.h

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ typedef std::function<CameraMetadata (const String8 &)> metadataGetter; 
class SessionConfigurationUtils {

public:

    // utility function to convert AIDL SessionConfiguration to HIDL

    // streamConfiguration. Also checks for sanity of SessionConfiguration and

    // streamConfiguration. Also checks for validity of SessionConfiguration and

    // returns a non-ok binder::Status if the passed in session configuration

    // isn't valid.

    static binder::Status