commit 649cda6710c01fbc4259f8ab61aff2cdb05b242c
author Saurabh Shah <saurshah@codeaurora.org> Sun Sep 16 16:05:58 2012 -0700
committer Iliyan Malchev <malchev@google.com> Tue Sep 18 10:26:51 2012 -0700
tree 2364f000efb26728f823e01c91484c6e60df0205
parent 56f610dd235b577725198e9341caae92379fdf23

hwc: Minor bug fixes.

Some minor bug fixes.

Change-Id: Ie8c2f58b9c6db6e77739e4693da503f6f963827d

libhwcomposer/hwc_video.cpp

diff --git a/libhwcomposer/hwc_video.cpp b/libhwcomposer/hwc_video.cpp
index 141d83b..daf3f80 100644
--- a/libhwcomposer/hwc_video.cpp
+++ b/libhwcomposer/hwc_video.cpp
@@ -52,7 +52,7 @@
             ccLayer = &list->hwLayers[sCCLayerIndex];
 
         if(configure(ctx, yuvLayer, ccLayer)) {
-            markFlags(&list->hwLayers[sYuvLayerIndex]);
+            markFlags(yuvLayer, ccLayer);
             sIsModeOn = true;
         }
     }
@@ -90,15 +90,23 @@
             ovutils::getStateString(sState));
 }
 
-void VideoOverlay::markFlags(hwc_layer_1_t *layer) {
+void VideoOverlay::markFlags(hwc_layer_1_t *yuvLayer, hwc_layer_1_t *ccLayer) {
     switch(sState) {
         case ovutils::OV_2D_VIDEO_ON_PANEL:
         case ovutils::OV_2D_VIDEO_ON_PANEL_TV:
-            layer->compositionType = HWC_OVERLAY;
-            layer->hints |= HWC_HINT_CLEAR_FB;
+            if(yuvLayer) {
+                yuvLayer->compositionType = HWC_OVERLAY;
+                yuvLayer->hints |= HWC_HINT_CLEAR_FB;
+            }
+            if(ccLayer) {
+                ccLayer->compositionType = HWC_OVERLAY;
+            }
             break;
         case ovutils::OV_2D_VIDEO_ON_TV:
-            break; //dont update flags.
+            if(ccLayer) {
+                ccLayer->compositionType = HWC_OVERLAY;
+            }
+            break; //dont update video layer flags.
         default:
             break;
     }