commit 5f3fb6f3640d833be33ebe3b6b6135d0accc6f0f
author Sungtak Lee <taklee@google.com> Thu Jan 31 11:53:22 2019 -0800
committer Sungtak Lee <taklee@google.com> Fri Feb 15 14:08:02 2019 -0800
tree 20efcf98e62098121b763f6233e45034075c8de2
parent 4c2ca73b9c97adef6fb31a9a02ae686c1a8a0513

Codec2 C2BlockPool: Use C2_BLOCKING instead of C2_TIMED_OUT

Currently C2_TIMED_OUT is used for WOULD_BLOCK cases inside BlockPool.
Use C2_BLOCKING instead of C2_TIMED_OUT.

Bug: 123711537
Bug: 123951795

Change-Id: I3c250b9e50c8aed7eb8bcc4a974ff6dd0b54083f

media/codec2/components/base/SimpleC2Component.cpp

diff --git a/media/codec2/components/base/SimpleC2Component.cpp b/media/codec2/components/base/SimpleC2Component.cpp
index b8baec8..b158f8f 100644
--- a/media/codec2/components/base/SimpleC2Component.cpp
+++ b/media/codec2/components/base/SimpleC2Component.cpp
@@ -151,7 +151,7 @@
         c2_status_t status;
         do {
             status = mBase->fetchLinearBlock(capacity, usage, block);
-        } while (status == C2_TIMED_OUT);
+        } while (status == C2_BLOCKING);
         return status;
     }
 
@@ -162,7 +162,7 @@
         c2_status_t status;
         do {
             status = mBase->fetchCircularBlock(capacity, usage, block);
-        } while (status == C2_TIMED_OUT);
+        } while (status == C2_BLOCKING);
         return status;
     }
 
@@ -174,7 +174,7 @@
         do {
             status = mBase->fetchGraphicBlock(width, height, format, usage,
                                               block);
-        } while (status == C2_TIMED_OUT);
+        } while (status == C2_BLOCKING);
         return status;
     }