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

Commit 51e8a49b authored by Avichal Rakesh's avatar Avichal Rakesh Committed by Automerger Merge Worker
Browse files

Merge "cameraservice: Log session index" into udc-dev am: aa415dc2 

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



Change-Id: I0f97aa2f7436628672d153b7708d98bc451f72b2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 11cb8753 aa415dc2

camera/CameraSessionStats.cpp

+16 −2
Original line number Diff line number Diff line
@@ -278,7 +278,8 @@ CameraSessionStats::CameraSessionStats() : 
        mRequestCount(0),

        mResultErrorCount(0),

        mDeviceError(false),

        mVideoStabilizationMode(-1) {}

        mVideoStabilizationMode(-1),

        mSessionIndex(0) {}



CameraSessionStats::CameraSessionStats(const String16& cameraId,

        int facing, int newCameraState, const String16& clientName,
@@ -297,7 +298,8 @@ CameraSessionStats::CameraSessionStats(const String16& cameraId, 
                mRequestCount(0),

                mResultErrorCount(0),

                mDeviceError(0),

                mVideoStabilizationMode(-1) {}

                mVideoStabilizationMode(-1),

                mSessionIndex(0) {}



status_t CameraSessionStats::readFromParcel(const android::Parcel* parcel) {

    if (parcel == NULL) {
@@ -409,6 +411,12 @@ status_t CameraSessionStats::readFromParcel(const android::Parcel* parcel) { 
        return err;

    }



    int32_t sessionIdx;

    if ((err = parcel->readInt32(&sessionIdx)) != OK) {

        ALOGE("%s: Failed to read session index from parcel", __FUNCTION__);

        return err;

    }



    mCameraId = id;

    mFacing = facing;

    mNewCameraState = newCameraState;
@@ -426,6 +434,7 @@ status_t CameraSessionStats::readFromParcel(const android::Parcel* parcel) { 
    mStreamStats = std::move(streamStats);

    mUserTag = userTag;

    mVideoStabilizationMode = videoStabilizationMode;

    mSessionIndex = sessionIdx;



    return OK;

}
@@ -523,6 +532,11 @@ status_t CameraSessionStats::writeToParcel(android::Parcel* parcel) const { 
        return err;

    }



    if ((err = parcel->writeInt32(mSessionIndex)) != OK) {

        ALOGE("%s: Failed to write session index!", __FUNCTION__);

        return err;

    }



    return OK;

}

camera/include/camera/CameraSessionStats.h

+1 −0
Original line number Diff line number Diff line
@@ -158,6 +158,7 @@ public: 
    std::vector<CameraStreamStats> mStreamStats;

    String16 mUserTag;

    int mVideoStabilizationMode;

    int mSessionIndex;



    // Constructors

    CameraSessionStats();

services/camera/libcameraservice/utils/CameraServiceProxyWrapper.cpp

+2 −0
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ void CameraServiceProxyWrapper::CameraSessionStatsWrapper::onClose( 
    mSessionStats.mNewCameraState = CameraSessionStats::CAMERA_STATE_CLOSED;

    mSessionStats.mLatencyMs = latencyMs;

    mSessionStats.mDeviceError = deviceError;

    mSessionStats.mSessionIndex = 0;

    updateProxyDeviceState(proxyBinder);

}
@@ -74,6 +75,7 @@ void CameraServiceProxyWrapper::CameraSessionStatsWrapper::onActive( 


    mSessionStats.mNewCameraState = CameraSessionStats::CAMERA_STATE_ACTIVE;

    mSessionStats.mMaxPreviewFps = maxPreviewFps;

    mSessionStats.mSessionIndex++;

    updateProxyDeviceState(proxyBinder);



    // Reset mCreationDuration to -1 to distinguish between 1st session