Scarfski/filament
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Stream API: cleanup as per code review feedback.

Browse Source
This commit is contained in:
Philip Rideout
2019-11-13 12:31:46 -08:00
parent d85f8164c0
commit 44e8d57935
4 changed files with 25 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
android/filament-android/src/main/cpp/Stream.cpp
View File

@@ -37,11 +37,6 @@ typedef struct AHardwareBuffer AHardwareBuffer;
#include <dlfcn.h>
template <typename T>
static void loadSymbol(T*& pfn, const char *symbol) noexcept {
pfn = (T*)dlsym(RTLD_DEFAULT, symbol);
}
#endif
using namespace filament;
@@ -189,8 +184,15 @@ Java_com_google_android_filament_Stream_nSetAcquiredImage(JNIEnv* env, jclass, j
#ifdef ANDROID
AHardwareBuffer* (*AHardwareBuffer_fromHardwareBuffer)(JNIEnv*, jobject);
loadSymbol(AHardwareBuffer_fromHardwareBuffer, "AHardwareBuffer_fromHardwareBuffer");
using PFN_FROMHARDWAREBUFFER = AHardwareBuffer* (*)(JNIEnv*, jobject);
static PFN_FROMHARDWAREBUFFER AHardwareBuffer_fromHardwareBuffer =
(PFN_FROMHARDWAREBUFFER) dlsym(RTLD_DEFAULT, "AHardwareBuffer_fromHardwareBuffer");
// This function is not available before NDK 15 or before Android 8.
if (!AHardwareBuffer_fromHardwareBuffer) {
__android_log_print(ANDROID_LOG_INFO, "Filament", "AHardwareBuffer_fromHardwareBuffer is not available.");
return;
}
AHardwareBuffer* nativeBuffer = AHardwareBuffer_fromHardwareBuffer(env, hwbuffer);
if (!nativeBuffer) {