#173 fixed

koral-- · Jun 11, 2015 · 66116f9 · 66116f9
1 parent 5edbb89
commit 66116f9
Show file tree

Hide file tree

Showing 9 changed files with 41 additions and 28 deletions.
diff --git a/src/main/java/pl/droidsonroids/gif/GifTextureView.java b/src/main/java/pl/droidsonroids/gif/GifTextureView.java
@@ -42,6 +42,9 @@
  */
 @TargetApi(Build.VERSION_CODES.ICE_CREAM_SANDWICH)
 public class GifTextureView extends TextureView {
+    static {
+        System.loadLibrary("pl_droidsonroids_gif_surface");
+    }
 
     private ScaleType mScaleType = ScaleType.FIT_CENTER;
     private final Matrix mTransform = new Matrix();

diff --git a/src/main/jni/Android.mk b/src/main/jni/Android.mk
@@ -2,7 +2,8 @@ LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := pl_droidsonroids_gif
-LOCAL_CFLAGS := -Ofast -DDEBUG
+LOCAL_CFLAGS := -Ofast
+#-DDEBUG
 LOCAL_LDLIBS := \
 	-ljnigraphics \
 	-llog \
@@ -16,6 +17,7 @@ LOCAL_SRC_FILES := \
 	open_close.c \
 	decoding.c \
 	exception.c \
+	surface_common.c \
 	time.c \
 	control.c \
 	memset.arm.S \
@@ -28,12 +30,13 @@ include $(BUILD_SHARED_LIBRARY)
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := pl_droidsonroids_gif_surface
-LOCAL_CFLAGS := -Ofast -DDEBUG
+LOCAL_CFLAGS := -Ofast
+#-DDEBUG
 LOCAL_LDLIBS := \
-	-landroid \
-	-llog \
+	-landroid
 
 LOCAL_SRC_FILES := \
 	surface.c \
 
+LOCAL_SHARED_LIBRARIES := pl_droidsonroids_gif
 include $(BUILD_SHARED_LIBRARY)
diff --git a/src/main/jni/Application.mk b/src/main/jni/Application.mk
@@ -1,5 +1,5 @@
 APP_ABI := all
 APP_PLATFORM := android-21
-APP_OPTIM := debug
+APP_OPTIM := release
 
-#NDK_TOOLCHAIN_VERSION := clang
+NDK_TOOLCHAIN_VERSION := clang
diff --git a/src/main/jni/drawing.c b/src/main/jni/drawing.c
@@ -129,7 +129,7 @@ static inline void disposeFrameIfNeeded(argb *bm, GifInfo *info) {
         memcpy(backup, bm, info->stride * fGif->SHeight * sizeof(argb));
 }
 
-inline void prepareCanvas(argb *bm, GifInfo *info) {
+void prepareCanvas(argb *bm, GifInfo *info) {
     if (info->gifFilePtr->SColorMap && info->controlBlock->TransparentColor == NO_TRANSPARENT_COLOR) {
         argb bgColArgb;
         bgColArgb.rgb = info->gifFilePtr->SColorMap->Colors[info->gifFilePtr->SBackGroundColor];

diff --git a/src/main/jni/gif.c b/src/main/jni/gif.c
@@ -17,7 +17,7 @@ inline JNIEnv *getEnv() {
     return NULL;
 }
 
-inline void DetachCurrentThread() {
+void DetachCurrentThread() {
     (*g_jvm)->DetachCurrentThread(g_jvm);
 }
 
@@ -395,6 +395,6 @@ __unused JNIEXPORT void JNICALL JNI_OnUnload(JavaVM *__unused vm, void *__unused
     GifFreeMapObject(defaultCmap);
 }
 
-inline ColorMapObject *getDefColorMap() {
+ColorMapObject *getDefColorMap() {
     return defaultCmap;
 }
diff --git a/src/main/jni/gif.h b/src/main/jni/gif.h
@@ -1,3 +1,6 @@
+#ifndef _GIF
+#define _GIF
+
 #include <unistd.h>
 #include <jni.h>
 #include <android/native_window_jni.h>
@@ -19,6 +22,8 @@
 #include <errno.h>
 #include "giflib/gif_lib.h"
 
+#define THROW_ON_NONZERO_RESULT(fun, message) if (fun !=0) throwException(env, ILLEGAL_STATE_EXCEPTION_ERRNO, message)
+
 #ifdef DEBUG
 #include <android/log.h>
 #define  LOG_TAG    "libgif"
@@ -134,14 +139,14 @@ typedef struct {
     jlong sourceLength;
 } GifSourceDescriptor;
 
-inline void DetachCurrentThread();
+void DetachCurrentThread();
 
-inline ColorMapObject* getDefColorMap();
+ColorMapObject* getDefColorMap();
 
 /**
 * @return the real time, in ms
 */
-inline long getRealTime();
+long getRealTime();
 
 /**
 * Frees dynamically allocated memory
@@ -202,8 +207,10 @@ jint restoreSavedState(GifInfo *info, JNIEnv *env, jlongArray state, void *pixel
 
 void releaseSurfaceDescriptor(SurfaceDescriptor *surfaceDescriptor, JNIEnv *pConst);
 
-inline void prepareCanvas(argb *bm, GifInfo *info);
+void prepareCanvas(argb *bm, GifInfo *info);
 
 void drawNextBitmap(argb *bm, GifInfo *info);
 
-uint_fast32_t getFrameDuration(GifInfo *info);
+uint_fast32_t getFrameDuration(GifInfo *info);
+
+#endif
diff --git a/src/main/jni/surface.c b/src/main/jni/surface.c
@@ -4,7 +4,6 @@
 typedef uint64_t POLL_TYPE;
 #define POLL_TYPE_SIZE sizeof(POLL_TYPE)
 
-#define THROW_ON_NONZERO_RESULT(fun, message) if (fun !=0) throwException(env, ILLEGAL_STATE_EXCEPTION_ERRNO, message)
 #define THROW_AND_BREAK_ON_NONZERO_RESULT(fun, message) if (fun !=0) {throwException(env, ILLEGAL_STATE_EXCEPTION_ERRNO, message); break;}
 
 static void *slurp(void *pVoidInfo) {
@@ -49,18 +48,6 @@ static inline bool initSurfaceDescriptor(SurfaceDescriptor *surfaceDescriptor, J
     return true;
 }
 
-void releaseSurfaceDescriptor(SurfaceDescriptor *surfaceDescriptor, JNIEnv *env) {
-    if (surfaceDescriptor == NULL)
-        return;
-    free(surfaceDescriptor->surfaceBackupPtr);
-    surfaceDescriptor->surfaceBackupPtr = NULL;
-    THROW_ON_NONZERO_RESULT(close(surfaceDescriptor->eventPollFd.fd), "eventfd close failed");
-    THROW_ON_NONZERO_RESULT(pthread_mutex_destroy(&surfaceDescriptor->slurpMutex), "slurp mutex destroy failed");
-    THROW_ON_NONZERO_RESULT(pthread_mutex_destroy(&surfaceDescriptor->renderMutex), "render mutex destroy failed");
-    THROW_ON_NONZERO_RESULT(pthread_cond_destroy(&surfaceDescriptor->slurpCond), "slurp cond destroy failed");
-    THROW_ON_NONZERO_RESULT(pthread_cond_destroy(&surfaceDescriptor->renderCond), "render cond  destroy failed");
-}
-
 __unused JNIEXPORT void JNICALL
 Java_pl_droidsonroids_gif_GifInfoHandle_bindSurface(JNIEnv *env, jclass __unused handleClass, jlong gifInfo,
                                                     jobject jsurface, jlongArray savedState, jboolean isOpaque) {

diff --git a/src/main/jni/surface_common.c b/src/main/jni/surface_common.c
@@ -0,0 +1,13 @@
+#include "gif.h"
+
+void releaseSurfaceDescriptor(SurfaceDescriptor *surfaceDescriptor, JNIEnv *env) {
+    if (surfaceDescriptor == NULL)
+        return;
+    free(surfaceDescriptor->surfaceBackupPtr);
+    surfaceDescriptor->surfaceBackupPtr = NULL;
+    THROW_ON_NONZERO_RESULT(close(surfaceDescriptor->eventPollFd.fd), "eventfd close failed");
+    THROW_ON_NONZERO_RESULT(pthread_mutex_destroy(&surfaceDescriptor->slurpMutex), "slurp mutex destroy failed");
+    THROW_ON_NONZERO_RESULT(pthread_mutex_destroy(&surfaceDescriptor->renderMutex), "render mutex destroy failed");
+    THROW_ON_NONZERO_RESULT(pthread_cond_destroy(&surfaceDescriptor->slurpCond), "slurp cond destroy failed");
+    THROW_ON_NONZERO_RESULT(pthread_cond_destroy(&surfaceDescriptor->renderCond), "render cond  destroy failed");
+}
diff --git a/src/main/jni/time.c b/src/main/jni/time.c
@@ -17,7 +17,7 @@ long calculateInvalidationDelay(GifInfo *info, long renderStartTime, uint_fast32
     return -1;
 }
 
-inline long getRealTime() {
+long getRealTime() {
     struct timespec ts; //result not checked since CLOCK_MONOTONIC_RAW availability is checked in JNI_ONLoad
     clock_gettime(CLOCK_MONOTONIC_RAW, &ts);
     return ts.tv_sec * 1000L + ts.tv_nsec / 1000000L;