Release buffer immediately if the surface node is checked not on the tree.

Signed-off-by: xxfeng_hw <yuxiaofeng8@huawei.com>
Change-Id: Ib2a436f592f296ed66951ddb2041f69ff72abb92

rosen/modules/render_service/core/pipeline/rs_render_service_listener.cpp

@@ -35,9 +35,37 @@ void RSRenderServiceListener::OnBufferAvailable()
         return;
     }
     ROSEN_LOGE("RsDebug RSRenderServiceListener::OnBufferAvailable node id:%llu", node->GetId());
-    node->IncreaseAvailableBuffer();
+
+    if (!node->IsOnTheTree()) {
+        RSMainThread::Instance()->PostTask([node]() {
+            ROSEN_LOGI("RsDebug RSRenderServiceListener::OnBufferAvailable node id:%llu: is not on the tree",
+                node->GetId());
+            auto& surfaceConsumer = node->GetConsumer();
+            if (surfaceConsumer == nullptr) {
+                ROSEN_LOGE("RsDebug RSRenderServiceListener::OnBufferAvailable: consumer is null!");
+                return;
+            }
+            sptr<SurfaceBuffer> buffer;
+            int32_t fence = -1;
+            int64_t timestamp = 0;
+            Rect damage;
+            auto ret = surfaceConsumer->AcquireBuffer(buffer, fence, timestamp, damage);
+            if (buffer == nullptr || ret != SURFACE_ERROR_OK) {
+                ROSEN_LOGE("RsDebug RSRenderServiceListener::OnBufferAvailable: AcquireBuffer failed!");
+                return;
+            }
+
+            if (node->GetBuffer() != nullptr && node->GetBuffer() != buffer) {
+                (void)surfaceConsumer->ReleaseBuffer(node->GetBuffer(), -1);
+            }
+            node->SetBuffer(buffer);
+            node->SetFence(fence);
+        });
+    } else {
+        node->IncreaseAvailableBuffer();
+    }
+
     RSMainThread::Instance()->RequestNextVSync();
 }
-
 } // namespace Rosen
-} // namespace OHOS
+} // namespace OHOS

rosen/modules/render_service_base/include/pipeline/rs_base_render_node.h

@@ -52,6 +52,11 @@ public:
         return id_;
     }
 
+    bool IsOnTheTree() const
+    {
+        return isOnTheTree_;
+    }
+
     std::vector<WeakPtr>& GetChildren()
     {
         return children_;
@@ -120,6 +125,7 @@ private:
 
     const std::weak_ptr<RSContext> context_;
     NodeDirty dirtyStatus_ = NodeDirty::DIRTY;
+    bool isOnTheTree_ = false;
 };
 } // namespace Rosen
 } // namespace OHOS

rosen/modules/render_service_base/src/pipeline/rs_base_render_node.cpp

@@ -46,6 +46,7 @@ void RSBaseRenderNode::AddChild(const SharedPtr& child, int index)
     }
 
     OnAddChild(child);
+    child->isOnTheTree_ = true;
 }
 
 void RSBaseRenderNode::RemoveChild(const SharedPtr& child)
@@ -64,6 +65,7 @@ void RSBaseRenderNode::RemoveChild(const SharedPtr& child)
     SetDirty();
 
     OnRemoveChild(child);
+    child->isOnTheTree_ = false;
 }
 
 void RSBaseRenderNode::OnAddChild(const SharedPtr& child)