summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHuan Song <huans@google.com>2022-09-01 12:31:12 -0700
committerHuan Song <huans@google.com>2022-09-02 16:12:01 +0000
commit8cfebae8ee4dc034f956cb0fb1e63885874f351a (patch)
tree0079e33713315ef33a94d124579240eb159a4bd7
parentf8bd960f3985c95a01c4a013b892e4509ac24e20 (diff)
downloadgoldfish-8cfebae8ee4dc034f956cb0fb1e63885874f351a.tar.gz
Fix jpeg lib path for 64 bit image.
Bug: 239819857 Test: run Camera2Basic (https://github.com/android/camera-samples/tree/main/Camera2Basic) Change-Id: Ide6dfe5274b336f5c196040a148b64ff41411732 Merged-In: Ide6dfe5274b336f5c196040a148b64ff41411732 (cherry picked from commit 0a9884270cbc3fc6a7bdbc5b564e6289f8ff8a5f)
-rw-r--r--camera/JpegCompressor.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/camera/JpegCompressor.cpp b/camera/JpegCompressor.cpp
index 168b98a0..4efba282 100644
--- a/camera/JpegCompressor.cpp
+++ b/camera/JpegCompressor.cpp
@@ -46,7 +46,11 @@ typedef size_t (*GetCompressedSizeFunc)(JpegStub* stub);
NV21JpegCompressor::NV21JpegCompressor()
{
+#ifdef __LP64__
+ const char dlName[] = "/vendor/lib64/hw/camera.ranchu.jpeg.so";
+#else
const char dlName[] = "/vendor/lib/hw/camera.ranchu.jpeg.so";
+#endif
if (mDl == NULL) {
mDl = dlopen(dlName, RTLD_NOW);
}