commit c559d902ae9e815f97b90f14a4aeb52e48ee2d83
author Jason Sams <jsams@google.com> Tue Jun 24 01:47:40 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jun 23 21:50:22 2014 +0000
tree cdf176307cab0d248fb12e33fe95c6579df30aef
parent 9f63f5d894d8bad1c636013fa79c2e9786b11939
parent c765a55556c597bd5e1f75072e8e3ce25cd836ba

Merge "Fix reversal of channels with flexible yuv."

rsGrallocConsumer.cpp

diff --git a/rsGrallocConsumer.cpp b/rsGrallocConsumer.cpp
index e016e7d..c5d37b2 100644
--- a/rsGrallocConsumer.cpp
+++ b/rsGrallocConsumer.cpp
@@ -142,8 +142,8 @@
     //mAlloc->frameNumber = b.mFrameNumber;
 
     if (mAlloc->mHal.state.yuv) {
-        mAlloc->mHal.drvState.lod[1].mallocPtr = ycbcr.cr;
-        mAlloc->mHal.drvState.lod[2].mallocPtr = ycbcr.cb;
+        mAlloc->mHal.drvState.lod[1].mallocPtr = ycbcr.cb;
+        mAlloc->mHal.drvState.lod[2].mallocPtr = ycbcr.cr;
 
         mAlloc->mHal.drvState.lod[0].stride = ycbcr.ystride;
         mAlloc->mHal.drvState.lod[1].stride = ycbcr.cstride;