From 123baf6c964f9f2cd8f347ff3302009b1346eaaa Mon Sep 17 00:00:00 2001 From: Ananda Kishore Date: Tue, 10 Jan 2012 14:07:08 +0530 Subject: libstagefright: Use proper mangled name for color convert API - Use proper mangled name for color convertor API CRs-Fixed: 329591 Change-Id: I06d9c54faf072f5beadb25d2234206bb2803626b --- media/libstagefright/colorconversion/ColorConverter.cpp | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) 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; -- cgit v1.1