fixup! [TTVD] Prevent overlay promotion for released decoder collections

Base patch introduces regresion of inability to render
camera captured frames using overlay system, as they lack
of collection token and only software rendering might be
used with them.

Bug: https://jira-eu.sec.samsung.net/browse/VDGAME-558
Change-Id: Iad3ccc0c032733c0ecc5156d47136c2a86318279
Signed-off-by: Jakub Gajownik <j.gajownik2@samsung.com>

diff --git a/tizen_src/chromium_impl/ui/ozone/platform/efl/output_surface_manager.cc b/tizen_src/chromium_impl/ui/ozone/platform/efl/output_surface_manager.cc
index 04f3cfa976d1281d3ab6f9b10671fbe4d4d78e4a..386fabca45dce25faf4e89a766e3b6cf80f0c5ac 100644 (file)
--- a/tizen_src/chromium_impl/ui/ozone/platform/efl/output_surface_manager.cc
+++ b/tizen_src/chromium_impl/ui/ozone/platform/efl/output_surface_manager.cc
@@ -63,8 +63,11 @@ OutputSurfaceManager::AssignSurfaces(
 
   // Step 1: remove all the surfaces that where already released, but player
   //         still holds video frames and tries to render them.
+  //         Note that empty collection token means it might be rendered using
+  //         "software" method, so we should not remove such candidates.
   for (auto it = candidates.begin(); it != candidates.end();) {
-    if (alive_collections_.find(it->second) != alive_collections_.end()) {
+    if (it->second.is_empty() ||
+        alive_collections_.find(it->second) != alive_collections_.end()) {
       ++it;
     } else {
       TIZEN_MEDIA_LOG(VERBOSE)