fix(AppleVideoToolBox): fix err in backgroud recoverage

do not create decoder in bg recreate decoder when SessionErr Signed-off-by: pingkai <pingkai010@gmail.com>
alibaba · Mar 4, 2020 · 2129643 · 2129643
1 parent c797182
commit 2129643
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/framework/codec/Apple/AppleVideoToolBox.cpp b/framework/codec/Apple/AppleVideoToolBox.cpp
@@ -97,10 +97,11 @@ namespace Cicada {
 //            return ret;
 //        mGotFirstFrame = false;
 
-        if (meta->extradata && meta->extradata_size > 0) {
+        if (meta->extradata && meta->extradata_size > 0  && mActive) {
             ret = createDecompressionSession(meta->extradata, meta->extradata_size, meta->width, meta->height);
 
             if (ret < 0) {
+                AF_LOGE("createDecompressionSession error\n");
                 return ret;
             }
         }
@@ -526,8 +527,9 @@ namespace Cicada {
         CFRelease(sampleBuffer);
 
         if (rv == kVTInvalidSessionErr) {
-            mActive = false;
+            AF_LOGW("kVTInvalidSessionErr\n");
             pPacket.reset(packet);
+            close_decoder();
             return -EAGAIN;
         }
 

diff --git a/framework/codec/Apple/AppleVideoToolBox.h b/framework/codec/Apple/AppleVideoToolBox.h
@@ -105,7 +105,7 @@ namespace Cicada{
         int mInputCount{0};
         bool mThrowPacket{false};
         std::mutex mActiveStatusMutex;
-        bool mActive{true};
+        std::atomic_bool mActive{true};
         AFPixelFormat mVTOutFmt = AF_PIX_FMT_NONE;
         std::unique_ptr<streamMeta> mPInMeta{nullptr};
         std::queue<std::unique_ptr<IAFPacket>> mRecoveryQueue{};