commit fa7abe5b3914c3041874b360f511b132e6bf1116
author Lajos Molnar <lajos@google.com> Thu Jan 25 21:48:00 2018 -0800
committer Lajos Molnar <lajos@google.com> Wed Jan 31 18:00:49 2018 -0800
tree 0219e11cf8972b964ac1f71ce904c4566308f2a2
parent 2b1d550beed28d6108b6d706f0f1a53fab7bd8f6

Codec2: more adjustments for C2Work related changes

Bug: 64121714
Change-Id: Ia0365b0b0087d9304b04a1f0e53edc091873c6e5

C2VDAComponent.cpp

diff --git a/C2VDAComponent.cpp b/C2VDAComponent.cpp
index ab7ff13..d7f2a8e 100644
--- a/C2VDAComponent.cpp
+++ b/C2VDAComponent.cpp
@@ -1229,7 +1229,7 @@
 
 void C2VDAComponent::reportFinishedWorkIfAny() {
     DCHECK(mTaskRunner->BelongsToCurrentThread());
-    std::vector<std::unique_ptr<C2Work>> finishedWorks;
+    std::list<std::unique_ptr<C2Work>> finishedWorks;
 
     // Work should be reported as done if both input and output buffer are returned by VDA.
 
@@ -1268,7 +1268,7 @@
 
 void C2VDAComponent::reportAbandonedWorks() {
     DCHECK(mTaskRunner->BelongsToCurrentThread());
-    std::vector<std::unique_ptr<C2Work>> abandonedWorks;
+    std::list<std::unique_ptr<C2Work>> abandonedWorks;
 
     while (!mPendingWorks.empty()) {
         std::unique_ptr<C2Work> work(std::move(mPendingWorks.front()));

cmds/codec2.cpp

diff --git a/cmds/codec2.cpp b/cmds/codec2.cpp
index 9d1e311..d5d1250 100644
--- a/cmds/codec2.cpp
+++ b/cmds/codec2.cpp
@@ -79,7 +79,7 @@
     ~SimplePlayer();
 
     void onWorkDone(std::weak_ptr<C2Component> component,
-                    std::vector<std::unique_ptr<C2Work>> workItems);
+                    std::list<std::unique_ptr<C2Work>> workItems);
     void onTripped(std::weak_ptr<C2Component> component,
                    std::vector<std::shared_ptr<C2SettingResult>> settingResult);
     void onError(std::weak_ptr<C2Component> component, uint32_t errorCode);
@@ -121,7 +121,7 @@
     virtual ~Listener() = default;
 
     virtual void onWorkDone_nb(std::weak_ptr<C2Component> component,
-                               std::vector<std::unique_ptr<C2Work>> workItems) override {
+                               std::list<std::unique_ptr<C2Work>> workItems) override {
         mThis->onWorkDone(component, std::move(workItems));
     }
 
@@ -175,7 +175,7 @@
 }
 
 void SimplePlayer::onWorkDone(std::weak_ptr<C2Component> component,
-                              std::vector<std::unique_ptr<C2Work>> workItems) {
+                              std::list<std::unique_ptr<C2Work>> workItems) {
     (void)component;
     ULock l(mProcessedLock);
     for (auto& item : workItems) {

tests/C2VDACompIntf_test.cpp

diff --git a/tests/C2VDACompIntf_test.cpp b/tests/C2VDACompIntf_test.cpp
index 1c78ab4..485155c 100644
--- a/tests/C2VDACompIntf_test.cpp
+++ b/tests/C2VDACompIntf_test.cpp
@@ -414,9 +414,9 @@
     for (const auto& paramDesc : params) {
         printf("name: %s\n", paramDesc->name().c_str());
         printf("  required: %s\n", paramDesc->isRequired() ? "yes" : "no");
-        printf("  type: %x\n", paramDesc->type().type());
+        printf("  type: %x\n", paramDesc->index().type());
         std::unique_ptr<C2StructDescriptor> desc{
-                store->getParamReflector()->describe(paramDesc->type().type())};
+                store->getParamReflector()->describe(paramDesc->index().type())};
         if (desc.get()) dumpStruct(*desc);
     }
 }

tests/C2VDAComponent_test.cpp

diff --git a/tests/C2VDAComponent_test.cpp b/tests/C2VDAComponent_test.cpp
index 44f6ab2..575f309 100644
--- a/tests/C2VDAComponent_test.cpp
+++ b/tests/C2VDAComponent_test.cpp
@@ -95,7 +95,7 @@
 class C2VDAComponentTest : public ::testing::Test {
 public:
     void onWorkDone(std::weak_ptr<C2Component> component,
-                    std::vector<std::unique_ptr<C2Work>> workItems);
+                    std::list<std::unique_ptr<C2Work>> workItems);
     void onTripped(std::weak_ptr<C2Component> component,
                    std::vector<std::shared_ptr<C2SettingResult>> settingResult);
     void onError(std::weak_ptr<C2Component> component, uint32_t errorCode);
@@ -150,7 +150,7 @@
     virtual ~Listener() = default;
 
     virtual void onWorkDone_nb(std::weak_ptr<C2Component> component,
-                               std::vector<std::unique_ptr<C2Work>> workItems) override {
+                               std::list<std::unique_ptr<C2Work>> workItems) override {
         mThis->onWorkDone(component, std::move(workItems));
     }
 
@@ -176,7 +176,7 @@
 }
 
 void C2VDAComponentTest::onWorkDone(std::weak_ptr<C2Component> component,
-                                    std::vector<std::unique_ptr<C2Work>> workItems) {
+                                    std::list<std::unique_ptr<C2Work>> workItems) {
     (void)component;
     ULock l(mProcessedLock);
     for (auto& item : workItems) {