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

Commit a0df991d authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "TranscodingSessionControllerTest: Allow extra time to receive onError"... 

Merge "TranscodingSessionControllerTest: Allow extra time to receive onError" am: e9bd2c84 am: df58778f

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



Change-Id: I8763304872dd9bb8f1aa9d4796f535c1839662c4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 673c81eb df58778f

media/module/libmediatranscoding/tests/TranscodingSessionController_tests.cpp

+2 −0
Original line number Original line Diff line number Diff line
@@ -337,6 +337,8 @@ public: 
        // Should have created new transcoder.

        // Should have created new transcoder.

        EXPECT_EQ(mTranscoder->getGeneration(), generation);

        EXPECT_EQ(mTranscoder->getGeneration(), generation);

        EXPECT_EQ(mTranscoder.use_count(), 2);

        EXPECT_EQ(mTranscoder.use_count(), 2);

        // b/240537336: Allow extra time to finish onError call

        sleep(1);

    }

    }





    void testPacerHelper(int numSubmits, int sessionDurationMs, int expectedSuccess) {

    void testPacerHelper(int numSubmits, int sessionDurationMs, int expectedSuccess) {