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

Commit 7bc98ce6 authored by Changyeon Jo's avatar Changyeon Jo
Browse files

Update VtsHalEvsV1_*TargetTest

- Removes a requirement of the landscape aspect ratio of the captured
  frames because the Extended View System now allows the video streams
  in any aspect ratio
- Increases the maximum latency of the video stream start request from
  500 ms to 1 second to accommodate the camera system design with the
  additional processing units outside of the head unit
- Reduces a number of additional buffers to allocate from 6 to 2 in
  CameraStreamBuffering test, to be consistent with comments

Bug: 204835095
Test: atest VtsHalEvsV1_0TargetTest and
      atest VtsHalEvsV1_1TargetTest
Change-Id: Id41bde10964b650f78e76d4f97a4588367f7c7fc
parent 6c1a0a6b
Loading
Loading
Loading
Loading
+2 −7
Original line number Original line Diff line number Diff line
@@ -18,7 +18,7 @@




// These values are called out in the EVS design doc (as of Mar 8, 2017)
// These values are called out in the EVS design doc (as of Mar 8, 2017)
static const int kMaxStreamStartMilliseconds = 500;
static const int kMaxStreamStartMilliseconds = 1000;
static const int kMinimumFramesPerSecond = 10;
static const int kMinimumFramesPerSecond = 10;


static const int kSecondsToMilliseconds = 1000;
static const int kSecondsToMilliseconds = 1000;
@@ -332,11 +332,6 @@ TEST_P(EvsHidlTest, CameraStreamPerformance) {
        printf("Measured time to first frame %0.2f ms\n", timeToFirstFrame * kNanoToMilliseconds);
        printf("Measured time to first frame %0.2f ms\n", timeToFirstFrame * kNanoToMilliseconds);
        ALOGI("Measured time to first frame %0.2f ms", timeToFirstFrame * kNanoToMilliseconds);
        ALOGI("Measured time to first frame %0.2f ms", timeToFirstFrame * kNanoToMilliseconds);


        // Check aspect ratio
        unsigned width = 0, height = 0;
        frameHandler->getFrameDimension(&width, &height);
        EXPECT_GE(width, height);

        // Wait a bit, then ensure we get at least the required minimum number of frames
        // Wait a bit, then ensure we get at least the required minimum number of frames
        sleep(5);
        sleep(5);
        nsecs_t end = systemTime(SYSTEM_TIME_MONOTONIC);
        nsecs_t end = systemTime(SYSTEM_TIME_MONOTONIC);
@@ -370,7 +365,7 @@ TEST_P(EvsHidlTest, CameraStreamBuffering) {
    ALOGI("Starting CameraStreamBuffering test");
    ALOGI("Starting CameraStreamBuffering test");


    // Arbitrary constant (should be > 1 and less than crazy)
    // Arbitrary constant (should be > 1 and less than crazy)
    static const unsigned int kBuffersToHold = 6;
    static const unsigned int kBuffersToHold = 2;


    // Get the camera list
    // Get the camera list
    loadCameraList();
    loadCameraList();
+1 −6
Original line number Original line Diff line number Diff line
@@ -459,11 +459,6 @@ TEST_P(EvsHidlTest, CameraStreamPerformance) {
                  << std::scientific << timeToFirstFrame * kNanoToMilliseconds
                  << std::scientific << timeToFirstFrame * kNanoToMilliseconds
                  << " ms.";
                  << " ms.";


        // Check aspect ratio
        unsigned width = 0, height = 0;
        frameHandler->getFrameDimension(&width, &height);
        EXPECT_GE(width, height);

        // Wait a bit, then ensure we get at least the required minimum number of frames
        // Wait a bit, then ensure we get at least the required minimum number of frames
        sleep(5);
        sleep(5);
        nsecs_t end = systemTime(SYSTEM_TIME_MONOTONIC);
        nsecs_t end = systemTime(SYSTEM_TIME_MONOTONIC);
@@ -501,7 +496,7 @@ TEST_P(EvsHidlTest, CameraStreamBuffering) {
    LOG(INFO) << "Starting CameraStreamBuffering test";
    LOG(INFO) << "Starting CameraStreamBuffering test";


    // Arbitrary constant (should be > 1 and less than crazy)
    // Arbitrary constant (should be > 1 and less than crazy)
    static const unsigned int kBuffersToHold = 6;
    static const unsigned int kBuffersToHold = 2;


    // Get the camera list
    // Get the camera list
    loadCameraList();
    loadCameraList();