diff options
| author | Tim Murray <timmurray@google.com> | 2013-08-29 18:42:54 -0700 |
|---|---|---|
| committer | Tim Murray <timmurray@google.com> | 2013-08-29 18:42:54 -0700 |
| commit | aa782376e05c47141bc3f90966d609cfc69ebc39 (patch) | |
| tree | 6a8581380642d24ad865768a1af7c8418c56915f /cpu_ref/rsCpuIntrinsicYuvToRGB.cpp | |
| parent | 10f317038dd53543dc8c7f5afe26a6360adfb5f3 (diff) | |
| download | android_frameworks_rs-aa782376e05c47141bc3f90966d609cfc69ebc39.tar.gz android_frameworks_rs-aa782376e05c47141bc3f90966d609cfc69ebc39.tar.bz2 android_frameworks_rs-aa782376e05c47141bc3f90966d609cfc69ebc39.zip | |
Fix YUV intrinsic with compat lib.
Change-Id: I05bfd1d4de24e3e9eadf092ec519d54ed411aa89
Diffstat (limited to 'cpu_ref/rsCpuIntrinsicYuvToRGB.cpp')
| -rw-r--r-- | cpu_ref/rsCpuIntrinsicYuvToRGB.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/cpu_ref/rsCpuIntrinsicYuvToRGB.cpp b/cpu_ref/rsCpuIntrinsicYuvToRGB.cpp index 7b2a579f..4f564430 100644 --- a/cpu_ref/rsCpuIntrinsicYuvToRGB.cpp +++ b/cpu_ref/rsCpuIntrinsicYuvToRGB.cpp @@ -18,6 +18,10 @@ #include "rsCpuIntrinsic.h" #include "rsCpuIntrinsicInlines.h" +#ifdef RS_COMPATIBILITY_LIB +#include "rsCompatibilityLib.h" +#endif + #ifndef RS_COMPATIBILITY_LIB #include "hardware/gralloc.h" #endif @@ -134,7 +138,7 @@ void RsdCpuScriptIntrinsicYuvToRGB::kernel(const RsForEachStubParamStruct *p, switch (cp->alloc->mHal.state.yuv) { // In API 17 there was no yuv format and the intrinsic treated everything as NV21 case 0: -#if !defined(RS_SERVER) && !defined(RS_COMPATIBILITY_LIB) +#if !defined(RS_SERVER) case HAL_PIXEL_FORMAT_YCrCb_420_SP: // NV21 #endif { @@ -178,7 +182,7 @@ void RsdCpuScriptIntrinsicYuvToRGB::kernel(const RsForEachStubParamStruct *p, } break; -#if !defined(RS_SERVER) && !defined(RS_COMPATIBILITY_LIB) +#if !defined(RS_SERVER) case HAL_PIXEL_FORMAT_YV12: { const uchar *pinU = (const uchar *)cp->alloc->mHal.drvState.lod[1].mallocPtr; |