commit 98b8a370059a1e142f3eed4bafdcc9b1e0b230fd
author Chong Zhang <chz@google.com> Wed Jul 08 17:27:37 2020 -0700
committer Chong Zhang <chz@google.com> Wed Jul 08 17:29:21 2020 -0700
tree 340456833b1a73302035a762363d10a3713a386c
parent b035849c7818c868386fa2f3b65ab5bfb4b1a31a

transcoding: post progress update to client

bug: 160277443
bug: 154733526
test: unit tests
Change-Id: I04cd198d5fb1e83b1d256e4968fb3685c16b7a55

services/mediatranscoding/tests/MediaTranscodingServiceTestHelper.h

diff --git a/services/mediatranscoding/tests/MediaTranscodingServiceTestHelper.h b/services/mediatranscoding/tests/MediaTranscodingServiceTestHelper.h
index 2f4e74b..53fd7ec 100644
--- a/services/mediatranscoding/tests/MediaTranscodingServiceTestHelper.h
+++ b/services/mediatranscoding/tests/MediaTranscodingServiceTestHelper.h
@@ -180,6 +180,18 @@
         mCondition.notify_one();
     }
 
+    void updateProgress(int progress) {
+        std::unique_lock lock(mLock);
+        mLastProgress = progress;
+        mUpdateCount++;
+    }
+
+    int getUpdateCount(int *lastProgress) {
+        std::unique_lock lock(mLock);
+        *lastProgress = mLastProgress;
+        return mUpdateCount;
+    }
+
     TranscodingErrorCode getLastError() {
         std::unique_lock lock(mLock);
         return mLastErr;
@@ -191,6 +203,8 @@
     Event mPoppedEvent;
     std::list<Event> mEventQueue;
     TranscodingErrorCode mLastErr;
+    int mUpdateCount = 0;
+    int mLastProgress = -1;
 };
 
 // Operators for GTest macros.
@@ -266,7 +280,8 @@
         return Status::ok();
     }
 
-    Status onProgressUpdate(int32_t /* in_jobId */, int32_t /* in_progress */) override {
+    Status onProgressUpdate(int32_t /* in_jobId */, int32_t in_progress) override {
+        updateProgress(in_progress);
         return Status::ok();
     }
 

services/mediatranscoding/tests/mediatranscodingservice_real_tests.cpp

diff --git a/services/mediatranscoding/tests/mediatranscodingservice_real_tests.cpp b/services/mediatranscoding/tests/mediatranscodingservice_real_tests.cpp
index c6368a8..0ac03d6 100644
--- a/services/mediatranscoding/tests/mediatranscodingservice_real_tests.cpp
+++ b/services/mediatranscoding/tests/mediatranscodingservice_real_tests.cpp
@@ -100,6 +100,29 @@
     unregisterMultipleClients();
 }
 
+TEST_F(MediaTranscodingServiceRealTest, TestTranscodeVideoProgress) {
+    registerMultipleClients();
+
+    const char* dstPath = OUTPATH(TestTranscodeVideoProgress);
+    deleteFile(dstPath);
+
+    // Submit one job.
+    EXPECT_TRUE(
+            submit(mClient1, 0, kLongSrcPath, dstPath, TranscodingJobPriority::kNormal, kBitRate));
+
+    // Wait for job to finish.
+    EXPECT_EQ(mClientCallback1->pop(kPaddingUs), EventTracker::Start(CLIENT(1), 0));
+    EXPECT_EQ(mClientCallback1->pop(kJobWithPaddingUs), EventTracker::Finished(CLIENT(1), 0));
+
+    // Check the progress update messages are received. For this clip (around ~15 second long),
+    // expect at least 10 updates, and the last update should be 100.
+    int lastProgress;
+    EXPECT_GE(mClientCallback1->getUpdateCount(&lastProgress), 10);
+    EXPECT_EQ(lastProgress, 100);
+
+    unregisterMultipleClients();
+}
+
 /*
  * Test cancel immediately after start.
  */