opacity support for gifTextureView added

froggy96 · Apr 13, 2015 · b61da4a · b61da4a
1 parent e0d9b27
commit b61da4a
Show file tree

Hide file tree

Showing 8 changed files with 93 additions and 22 deletions.
diff --git a/src/main/java/pl/droidsonroids/gif/GifInfoHandle.java b/src/main/java/pl/droidsonroids/gif/GifInfoHandle.java
@@ -45,7 +45,7 @@ private GifInfoHandle(long gifInfoPtr, int width, int height, int frameCount) {
     static native GifInfoHandle openStream(InputStream stream, boolean justDecodeMetaData) throws GifIOException;
     static native GifInfoHandle openFile(String filePath, boolean justDecodeMetaData) throws GifIOException;
     private static native long renderFrame(long gifFileInPtr, Bitmap frameBuffer);
-    private static native void bindSurface(long gifInfoPtr, Surface surface, long[] savedState);
+    private static native void bindSurface(long gifInfoPtr, Surface surface, long[] savedState, boolean isOpaque, boolean wasOpaque);
     private static native void free(long gifFileInPtr);
     private static native boolean reset(long gifFileInPtr);
     private static native void setSpeedFactor(long gifFileInPtr, float factor);
@@ -94,8 +94,8 @@ synchronized long renderFrame(Bitmap frameBuffer) {
         return renderFrame(gifInfoPtr, frameBuffer);
     }
 
-    void bindSurface(Surface surface, long[] savedState) {
-        bindSurface(gifInfoPtr, surface, savedState);
+    void bindSurface(Surface surface, long[] savedState, boolean isOpaque, boolean wasOpaque) {
+        bindSurface(gifInfoPtr, surface, savedState, isOpaque, wasOpaque);
     }
 
     synchronized void recycle() {

diff --git a/src/main/java/pl/droidsonroids/gif/GifTextureView.java b/src/main/java/pl/droidsonroids/gif/GifTextureView.java
@@ -49,6 +49,7 @@ public class GifTextureView extends TextureView {
 
     private RenderThread mRenderThread;
     private float mSpeedFactor = 1f;
+    private boolean mWasOpaque;
 
     public GifTextureView(Context context) {
         super(context);
@@ -80,7 +81,8 @@ private void init(AttributeSet attrs, int defStyleAttr, int defStyleRes) {
             }
             final TypedArray textureViewAttributes = getContext().obtainStyledAttributes(attrs, R.styleable.GifTextureView, defStyleAttr, defStyleRes);
             mInputSource = findSource(textureViewAttributes);
-            setOpaque(textureViewAttributes.getBoolean(R.styleable.GifTextureView_isOpaque, false));
+            mWasOpaque = textureViewAttributes.getBoolean(R.styleable.GifTextureView_isOpaque, false);
+            setOpaque(mWasOpaque);
             textureViewAttributes.recycle();
             mFreezesAnimation = GifViewUtils.isFreezingAnimation(this, attrs, defStyleAttr, defStyleRes);
             mRenderThread = new RenderThread();
@@ -181,7 +183,7 @@ public void run() {
                 }
                 final Surface surface = new Surface(surfaceTexture);
                 try {
-                    mGifInfoHandle.bindSurface(surface, mSavedState);
+                    mGifInfoHandle.bindSurface(surface, mSavedState, isOpaque(), mWasOpaque);
                 } finally {
                     surface.release();
                 }
@@ -231,6 +233,24 @@ void dispose() {
         }
     }
 
+    /**
+     * Indicates whether the content of this GifTextureView is opaque. The
+     * content is assumed to be <b>non-opaque</b> by default (unlike {@link TextureView}.
+     * View that is known to be opaque can take a faster drawing case than non-opaque one.<br>
+     * If opacity is changed from true to false then pending animation will be restarted.
+     *
+     * @param opaque True if the content of this GifTextureView is opaque,
+     *               false otherwise
+     */
+    @Override
+    public void setOpaque(final boolean opaque) {
+        mWasOpaque = isOpaque();
+        if (mWasOpaque != opaque) {
+            super.setOpaque(opaque);
+            mRenderThread.mGifInfoHandle.postUnbindSurface();
+        }
+    }
+
     @Override
     protected void onDetachedFromWindow() {
         mRenderThread.dispose();
@@ -251,6 +271,7 @@ public synchronized void setInputSource(@Nullable InputSource inputSource) {
         mInputSource = inputSource;
         mRenderThread = new RenderThread();
         if (inputSource != null) {
+            setOpaque(inputSource.isOpaque());
             mRenderThread.start();
         }
     }

diff --git a/src/main/java/pl/droidsonroids/gif/InputSource.java b/src/main/java/pl/droidsonroids/gif/InputSource.java
@@ -21,6 +21,8 @@
  * Abstract class for all input sources, to be used with {@link GifTextureView}
  */
 public abstract class InputSource {
+    private boolean mIsOpaque;
+
     InputSource() {
     }
 
@@ -30,6 +32,23 @@ final GifDrawable build(GifDrawable oldDrawable, ScheduledThreadPoolExecutor exe
         return new GifDrawable(open(), oldDrawable, executor, isRenderingAlwaysEnabled);
     }
 
+    final boolean isOpaque() {
+        return mIsOpaque;
+    }
+
+    /**
+     * Indicates whether the content of this source is opaque. GIF that is known to be opaque can
+     * take a faster drawing case than non-opaque one. See {@link GifTextureView#setOpaque(boolean)}
+     * for more information.<br>
+     * Currently it is used only by {@link GifTextureView}, not by {@link GifDrawable}
+     * @param isOpaque whether the content of this source is opaque
+     * @return this InputSource
+     */
+    public final InputSource setOpaque(boolean isOpaque) {
+        mIsOpaque = isOpaque;
+        return this;
+    }
+
     /**
      * Input using {@link ByteBuffer} as a source. It must be direct.
      */

diff --git a/src/main/jni/bitmap.c b/src/main/jni/bitmap.c
@@ -65,7 +65,7 @@ Java_pl_droidsonroids_gif_GifInfoHandle_renderFrame(JNIEnv *env, jclass __unused
         return 0;
     }
     DDGifSlurp(info, true);
-    const uint_fast16_t frameDuration = getBitmap((argb *) pixels, info);
+    const uint_fast32_t frameDuration = getBitmap((argb *) pixels, info);
     unlockPixels(env, jbitmap);
     return calculateInvalidationDelay(info, renderStartTime, frameDuration);
 }
diff --git a/src/main/jni/drawing.c b/src/main/jni/drawing.c
@@ -16,23 +16,43 @@ static void blitNormal(argb *bm, GifInfo *info, SavedImage *frame, ColorMapObjec
 
     uint_fast16_t x, y = frame->ImageDesc.Height;
     const int_fast16_t transpIndex = info->infos[info->currentIndex].TransparentColor;
-    if (transpIndex == NO_TRANSPARENT_COLOR) {
-        for (; y > 0; y--) {
-            MEMSET_ARGB((uint32_t *) dst, UINT32_MAX, frame->ImageDesc.Width);
-            for (x = frame->ImageDesc.Width; x > 0; x--, src++, dst++)
-                dst->rgb = cmap->Colors[*src];
-            dst += info->stride - frame->ImageDesc.Width;
+    if (info->isOpaque == JNI_TRUE) {
+        if (transpIndex == NO_TRANSPARENT_COLOR) {
+            for (; y > 0; y--) {
+                for (x = frame->ImageDesc.Width; x > 0; x--, src++, dst++)
+                    dst->rgb = cmap->Colors[*src];
+                dst += info->stride - frame->ImageDesc.Width;
+            }
+        }
+        else {
+            for (; y > 0; y--) {
+                for (x = frame->ImageDesc.Width; x > 0; x--, src++, dst++) {
+                    if (*src != transpIndex)
+                        dst->rgb = cmap->Colors[*src];
+                }
+                dst += info->stride - frame->ImageDesc.Width;
+            }
         }
     }
     else {
-        for (; y > 0; y--) {
-            for (x = frame->ImageDesc.Width; x > 0; x--, src++, dst++) {
-                if (*src != transpIndex) {
+        if (transpIndex == NO_TRANSPARENT_COLOR) {
+            for (; y > 0; y--) {
+                MEMSET_ARGB((uint32_t *) dst, UINT32_MAX, frame->ImageDesc.Width);
+                for (x = frame->ImageDesc.Width; x > 0; x--, src++, dst++)
                     dst->rgb = cmap->Colors[*src];
-                    dst->alpha = 0xFF;
+                dst += info->stride - frame->ImageDesc.Width;
+            }
+        }
+        else {
+            for (; y > 0; y--) {
+                for (x = frame->ImageDesc.Width; x > 0; x--, src++, dst++) {
+                    if (*src != transpIndex) {
+                        dst->rgb = cmap->Colors[*src];
+                        dst->alpha = 0xFF;
+                    }
                 }
+                dst += info->stride - frame->ImageDesc.Width;
             }
-            dst += info->stride - frame->ImageDesc.Width;
         }
     }
 }
@@ -115,7 +135,7 @@ static inline void disposeFrameIfNeeded(argb *bm, GifInfo *info, int idx) {
         memcpy(backup, bm, info->stride * fGif->SHeight * sizeof(argb));
 }
 
-uint_fast16_t const getBitmap(argb *bm, GifInfo *info) {
+uint_fast32_t const getBitmap(argb *bm, GifInfo *info) {
     if (info->currentIndex == 0) {
         if (info->gifFilePtr->SColorMap && info->infos[0].TransparentColor == NO_TRANSPARENT_COLOR) {
             argb bgColArgb;

diff --git a/src/main/jni/gif.h b/src/main/jni/gif.h
@@ -90,6 +90,7 @@ struct GifInfo {
     jlong sourceLength;
     int eventFd;
     void *surfaceBackupPtr;
+    jboolean isOpaque;
 };
 
 typedef struct {

diff --git a/src/main/jni/open_close.c b/src/main/jni/open_close.c
@@ -55,6 +55,7 @@ jobject createGifHandle(GifSourceDescriptor *descriptor, JNIEnv *env, jboolean j
     info->rewindFunction = descriptor->rewindFunc;
     info->eventFd = -1;
     info->surfaceBackupPtr = NULL;
+    info->isOpaque = JNI_FALSE;
 
     DDGifSlurp(info, false);
     if (justDecodeMetaData == JNI_TRUE)

diff --git a/src/main/jni/surface.c b/src/main/jni/surface.c
@@ -7,7 +7,8 @@ typedef uint64_t POLL_TYPE;
 
 __unused JNIEXPORT void JNICALL
 Java_pl_droidsonroids_gif_GifInfoHandle_bindSurface(JNIEnv *env, jclass __unused handleClass,
-                                                    jlong gifInfo, jobject jsurface, jlongArray savedState) {
+                                                    jlong gifInfo, jobject jsurface, jlongArray savedState,
+                                                    jboolean isOpaque, jboolean wasOpaque) {
 
     GifInfo *info = (GifInfo *) (intptr_t) gifInfo;
 
@@ -18,9 +19,11 @@ Java_pl_droidsonroids_gif_GifInfoHandle_bindSurface(JNIEnv *env, jclass __unused
             return;
         }
     }
+    info->isOpaque = isOpaque;
     struct ANativeWindow *window = ANativeWindow_fromSurface(env, jsurface);
+    const int32_t windowFormat = isOpaque == JNI_TRUE ? WINDOW_FORMAT_RGBX_8888 : WINDOW_FORMAT_RGBA_8888;
     if (ANativeWindow_setBuffersGeometry(window, info->gifFilePtr->SWidth, info->gifFilePtr->SHeight,
-                                         WINDOW_FORMAT_RGBA_8888) != 0) {
+                                         windowFormat) != 0) {
         ANativeWindow_release(window);
         throwException(env, ILLEGAL_STATE_EXCEPTION_ERRNO, "Buffers geometry setting failed");
         return;
@@ -57,7 +60,13 @@ Java_pl_droidsonroids_gif_GifInfoHandle_bindSurface(JNIEnv *env, jclass __unused
     const size_t bufferSize = buffer.stride * buffer.height * sizeof(argb);
 
     info->stride = buffer.stride;
-    if (info->surfaceBackupPtr) {
+    if (isOpaque == JNI_FALSE && wasOpaque == JNI_TRUE) {
+        if (!reset(info)) {
+            ANativeWindow_release(window);
+            return;
+        }
+    }
+    else if (info->surfaceBackupPtr) {
         memcpy(buffer.bits, info->surfaceBackupPtr, bufferSize);
         info->lastFrameRemainder = -1;
     }
@@ -86,7 +95,7 @@ Java_pl_droidsonroids_gif_GifInfoHandle_bindSurface(JNIEnv *env, jclass __unused
         if (info->currentIndex > 0) {
             memcpy(buffer.bits, oldBufferBits, bufferSize);
         }
-        const uint_fast16_t frameDuration = getBitmap(buffer.bits, info);
+        const uint_fast32_t frameDuration = getBitmap(buffer.bits, info);
 
         ANativeWindow_unlockAndPost(window);