author | Tellen Yu <tellen.yu@amlogic.com> | 2017-10-19 10:47:13 (GMT) |
---|---|---|
committer | Gerrit Code Review <gituser@scgit.amlogic.com> | 2017-10-19 10:47:14 (GMT) |
commit | e8e0729473264df37e2d09ba78448e6cdeabb818 (patch) | |
tree | b43995a350103da02df0259cc45665e6b0c25167 | |
parent | a94fb06f012a25916c955e85ceb53050dfeb9d09 (diff) | |
parent | fd003ce8e1d05dff8c370a71aaf38352f646c6d1 (diff) | |
download | hwcomposer-e8e0729473264df37e2d09ba78448e6cdeabb818.zip hwcomposer-e8e0729473264df37e2d09ba78448e6cdeabb818.tar.gz hwcomposer-e8e0729473264df37e2d09ba78448e6cdeabb818.tar.bz2 |
Merge "HWC2: Fix black screen when netflix play mide sideband video layer [1/1]" into o-amlogic
-rw-r--r-- | hwc2/common/devices/PhysicalDevice.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/hwc2/common/devices/PhysicalDevice.cpp b/hwc2/common/devices/PhysicalDevice.cpp index 6a85574..3c9d462 100644 --- a/hwc2/common/devices/PhysicalDevice.cpp +++ b/hwc2/common/devices/PhysicalDevice.cpp @@ -294,7 +294,7 @@ int32_t PhysicalDevice::getChangedCompositionTypes( // sideband stream. if (layer->getCompositionType() == HWC2_COMPOSITION_SIDEBAND - && layer->getSidebandStream()) { + /* && layer->getSidebandStream()*/) { // TODO: we just transact SIDEBAND to OVERLAY for now; DTRACE("get HWC_SIDEBAND layer, just change to overlay"); outLayers[i] = layerId; @@ -414,7 +414,7 @@ int32_t PhysicalDevice::getDisplayRequests( } // sideband stream. - if ((layer->getCompositionType() == HWC2_COMPOSITION_SIDEBAND && layer->getSidebandStream()) + if ((layer->getCompositionType() == HWC2_COMPOSITION_SIDEBAND /*&& layer->getSidebandStream()*/) || layer->getCompositionType() == HWC2_COMPOSITION_CURSOR) { // TODO: we just transact SIDEBAND to OVERLAY for now; DTRACE("get HWC_SIDEBAND layer, just change to overlay"); @@ -1139,7 +1139,7 @@ int32_t PhysicalDevice::preValidate() { if ((hnd && (hnd->flags & private_handle_t::PRIV_FLAGS_VIDEO_OVERLAY) && (layer->getCompositionType() == HWC2_COMPOSITION_DEVICE)) || (layer->getCompositionType() == HWC2_COMPOSITION_SIDEBAND - && layer->getSidebandStream())) { + /* && layer->getSidebandStream()*/)) { if (mVideoOverlayLayerId != 0) { ETRACE("ERROR: Find two video layer, should never get here !!"); } |