summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnanda Kishore <kananda@codeaurora.org>2012-01-10 14:07:08 +0530
committerEthan Chen <intervigil@gmail.com>2012-07-09 02:03:15 -0700
commit123baf6c964f9f2cd8f347ff3302009b1346eaaa (patch)
treea4ccf5e2db3d9eb232dd737c53522b7951e5c706
parenta4905d0e32d65bee0adb455b32ecbb49b5491257 (diff)
downloadframeworks_base-123baf6c964f9f2cd8f347ff3302009b1346eaaa.zip
frameworks_base-123baf6c964f9f2cd8f347ff3302009b1346eaaa.tar.gz
frameworks_base-123baf6c964f9f2cd8f347ff3302009b1346eaaa.tar.bz2
libstagefright: Use proper mangled name for color convert API
- Use proper mangled name for color convertor API CRs-Fixed: 329591 Change-Id: I06d9c54faf072f5beadb25d2234206bb2803626b
-rw-r--r--media/libstagefright/colorconversion/ColorConverter.cpp14
1 files changed, 13 insertions, 1 deletions
diff --git a/media/libstagefright/colorconversion/ColorConverter.cpp b/media/libstagefright/colorconversion/ColorConverter.cpp
index 0ef85e6..5bda1f6 100644
--- a/media/libstagefright/colorconversion/ColorConverter.cpp
+++ b/media/libstagefright/colorconversion/ColorConverter.cpp
@@ -136,9 +136,21 @@ status_t ColorConverter::convert(
case QOMX_COLOR_FormatYUV420PackedSemiPlanar64x32Tile2m8ka:
{
void * lib = dlopen("libmm-color-convertor.so", RTLD_NOW);
+
+ if (!lib) {
+ LOGE("dlopen for libmm-color-convertor failed with errno %d", errno);
+ return ERROR_UNSUPPORTED;
+ }
+
+
typedef int (*convertFn)(ColorConvertParams src, ColorConvertParams dst, uint8_t *adjustedClip);
- convertFn convertNV12Tile = (convertFn)dlsym(lib, "_Z7convertN7android18ColorConvertParamsES0_Ph");
+ convertFn convertNV12Tile = (convertFn)dlsym(lib, "_ZN7android7convertENS_18ColorConvertParamsES0_Ph");
+ if (!convertNV12Tile) {
+ dlclose(lib);
+ LOGE("dlsym on libmm-color-convertor failed with errno %d", errno);
+ return ERROR_UNSUPPORTED;
+ }
struct ColorConvertParams srcTemp;
srcTemp.width = srcWidth;