Fix bug for VPP compositon

1) overlay plane not universal can't be count as avail planes for video
2) VPP can't deal with solid color(no input buffer), drop solid color layer
   for temp solution
3) Video Planes don't have to only contain 1 layer(ResetLayers)

Change-Id: Ie2b285598ea77bd1038b1dfe5d630cf7bf1aa816
Tracked-On: None
Tests: Android video playback with UI composited by VPP path
Signed-off-by: Lin Johnson <johnson.lin@intel.com>

Author: js0701

common/compositor/va/varenderer.cpp

@@ -271,6 +271,8 @@ bool VARenderer::Draw(const MediaState& state, NativeSurface* surface) {
 
   for (uint32_t i = 0; i < total_layers; i++) {
     layer_in = state.layers_.at(i);
+    if (layer_in->IsSolidColor())
+      continue;
     ScopedVABufferID& pipeline_buffer = pipeline_buffers.at(i);
     // Get Input Surface.
     OverlayBuffer* buffer_in = layer_in->GetBuffer();
@@ -374,7 +376,6 @@ bool VARenderer::Draw(const MediaState& state, NativeSurface* surface) {
   ret |= vaEndPicture(va_display_, va_context_);
 
   surface->ResetDamage();
-
   return ret == VA_STATUS_SUCCESS ? true : false;
 }
 

common/display/displayplanemanager.cpp

@@ -140,9 +140,12 @@ bool DisplayPlaneManager::ValidateLayers(
     if (layers[lindex].IsVideoLayer())
       video_layers++;
   }
+  size_t avail_planes = overlay_planes_.size() - composition.size();
+  if (!(overlay_planes_[overlay_planes_.size() - 1]->IsUniversal()))
+    avail_planes--;
   // If video layers is more than available planes
   // We are going to force all the layers bo be composited by VA path
-  if (video_layers >= overlay_planes_.size() - composition.size()) {
+  if (video_layers >= avail_planes) {
     ForceVppForAllLayers(commit_planes, composition, layers, add_index,
                          mark_later, false);
     *re_validation_needed = false;

common/display/displayplanestate.cpp

@@ -210,11 +210,12 @@ void DisplayPlaneState::ResetLayers(const std::vector<OverlayLayer> &layers,
 
   *rects_updated = rect_updated;
 
+  if (has_video)
+    private_data_->type_ = DisplayPlanePrivateState::PlaneType::kVideo;
+
   if (private_data_->source_layers_.size() == 1) {
     if (private_data_->has_cursor_layer_) {
       private_data_->type_ = DisplayPlanePrivateState::PlaneType::kCursor;
-    } else if (has_video) {
-      private_data_->type_ = DisplayPlanePrivateState::PlaneType::kVideo;
     } else {
       private_data_->type_ = DisplayPlanePrivateState::PlaneType::kNormal;
     }