Add loop count control

-Adds callback into app for drawable that finishes animating
-Fixes timestamp delay mapping (was previously off by one)
-64 bit pointer storage

Change-Id: I21cf7eb325fd58fb0aeda58f864d35fe483a89a7

4 files changed, 48 insertions, 20 deletions

diff --git a/framesequence/jni/FrameSequence.h b/framesequence/jni/FrameSequence.h
index 781b7c6..6667cdd 100644
--- a/framesequence/jni/FrameSequence.h
+++ b/framesequence/jni/FrameSequence.h
@@ -46,8 +46,9 @@ public:
     virtual ~FrameSequence() {}
     virtual int getWidth() const = 0;
     virtual int getHeight() const = 0;
-    virtual int getFrameCount() const = 0;
     virtual bool isOpaque() const = 0;
+    virtual int getFrameCount() const = 0;
+    virtual int getDefaultLoopCount() const = 0;
 
     virtual FrameSequenceState* createState() const = 0;
 };
diff --git a/framesequence/jni/FrameSequenceJNI.cpp b/framesequence/jni/FrameSequenceJNI.cpp
index 90d0465..369b481 100644
--- a/framesequence/jni/FrameSequenceJNI.cpp
+++ b/framesequence/jni/FrameSequenceJNI.cpp
@@ -37,11 +37,12 @@ static jobject createJavaFrameSequence(JNIEnv* env, FrameSequence* frameSequence
         return NULL;
     }
     return env->NewObject(gFrameSequenceClassInfo.clazz, gFrameSequenceClassInfo.ctor,
-            reinterpret_cast<jint>(frameSequence),
+            reinterpret_cast<jlong>(frameSequence),
             frameSequence->getWidth(),
             frameSequence->getHeight(),
+            frameSequence->isOpaque(),
             frameSequence->getFrameCount(),
-            frameSequence->isOpaque());
+            frameSequence->getDefaultLoopCount());
 }
 
 static jobject nativeDecodeByteArray(JNIEnv* env, jobject clazz,
@@ -67,15 +68,15 @@ static jobject nativeDecodeStream(JNIEnv* env, jobject clazz,
 }
 
 static void nativeDestroyFrameSequence(JNIEnv* env, jobject clazz,
-        jint frameSequenceInt) {
-    FrameSequence* frameSequence = reinterpret_cast<FrameSequence*>(frameSequenceInt);
+        jlong frameSequenceLong) {
+    FrameSequence* frameSequence = reinterpret_cast<FrameSequence*>(frameSequenceLong);
     delete frameSequence;
 }
 
-static jint nativeCreateState(JNIEnv* env, jobject clazz, jint frameSequenceInt) {
-    FrameSequence* frameSequence = reinterpret_cast<FrameSequence*>(frameSequenceInt);
+static jlong nativeCreateState(JNIEnv* env, jobject clazz, jlong frameSequenceLong) {
+    FrameSequence* frameSequence = reinterpret_cast<FrameSequence*>(frameSequenceLong);
     FrameSequenceState* state = frameSequence->createState();
-    return reinterpret_cast<jint>(state);
+    return reinterpret_cast<jlong>(state);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -83,17 +84,17 @@ static jint nativeCreateState(JNIEnv* env, jobject clazz, jint frameSequenceInt)
 ////////////////////////////////////////////////////////////////////////////////
 
 static void nativeDestroyState(
-        JNIEnv* env, jobject clazz, jint frameSequenceStateInt) {
+        JNIEnv* env, jobject clazz, jlong frameSequenceStateLong) {
     FrameSequenceState* frameSequenceState =
-            reinterpret_cast<FrameSequenceState*>(frameSequenceStateInt);
+            reinterpret_cast<FrameSequenceState*>(frameSequenceStateLong);
     delete frameSequenceState;
 }
 
 static jlong JNICALL nativeGetFrame(
-        JNIEnv* env, jobject clazz, jint frameSequenceStateInt, jint frameNr,
+        JNIEnv* env, jobject clazz, jlong frameSequenceStateLong, jint frameNr,
         jobject bitmap, jint previousFrameNr) {
     FrameSequenceState* frameSequenceState =
-            reinterpret_cast<FrameSequenceState*>(frameSequenceStateInt);
+            reinterpret_cast<FrameSequenceState*>(frameSequenceStateLong);
     int ret;
     AndroidBitmapInfo info;
     void* pixels;
@@ -128,19 +129,19 @@ static JNINativeMethod gMethods[] = {
         (void*) nativeDecodeStream
     },
     {   "nativeDestroyFrameSequence",
-        "(I)V",
+        "(J)V",
         (void*) nativeDestroyFrameSequence
     },
     {   "nativeCreateState",
-        "(I)I",
+        "(J)J",
         (void*) nativeCreateState
     },
     {   "nativeGetFrame",
-        "(IILandroid/graphics/Bitmap;I)J",
+        "(JILandroid/graphics/Bitmap;I)J",
         (void*) nativeGetFrame
     },
     {   "nativeDestroyFrameSequence",
-        "(I)V",
+        "(J)V",
         (void*) nativeDestroyState
     },
 };
@@ -155,7 +156,7 @@ jint FrameSequence_OnLoad(JNIEnv* env) {
     }
     gFrameSequenceClassInfo.clazz = (jclass)env->NewGlobalRef(gFrameSequenceClassInfo.clazz);
 
-    gFrameSequenceClassInfo.ctor = env->GetMethodID(gFrameSequenceClassInfo.clazz, "<init>", "(IIIIZ)V");
+    gFrameSequenceClassInfo.ctor = env->GetMethodID(gFrameSequenceClassInfo.clazz, "<init>", "(JIIZII)V");
     if (!gFrameSequenceClassInfo.ctor) {
         ALOGW("Failed to find constructor for FrameSequence - was it stripped?");
         return -1;
diff --git a/framesequence/jni/FrameSequence_gif.cpp b/framesequence/jni/FrameSequence_gif.cpp
index e9f3ace..2402439 100644
--- a/framesequence/jni/FrameSequence_gif.cpp
+++ b/framesequence/jni/FrameSequence_gif.cpp
@@ -54,7 +54,7 @@ static bool willBeCleared(const GraphicsControlBlock& gcb) {
 ////////////////////////////////////////////////////////////////////////////////
 
 FrameSequence_gif::FrameSequence_gif(Stream* stream) :
-        mBgColor(TRANSPARENT), mPreservedFrames(NULL), mRestoringFrames(NULL) {
+        mLoopCount(1), mBgColor(TRANSPARENT), mPreservedFrames(NULL), mRestoringFrames(NULL) {
     mGif = DGifOpen(stream, streamReader, NULL);
     if (!mGif) {
         ALOGW("Gif load failed");
@@ -76,6 +76,23 @@ FrameSequence_gif::FrameSequence_gif(Stream* stream) :
     GraphicsControlBlock gcb;
     for (int i = 0; i < mGif->ImageCount; i++) {
         const SavedImage& image = mGif->SavedImages[i];
+
+        // find the loop extension pair
+        for (int j = 0; (j + 1) < image.ExtensionBlockCount; j++) {
+            ExtensionBlock* eb1 = image.ExtensionBlocks + j;
+            ExtensionBlock* eb2 = image.ExtensionBlocks + j + 1;
+            if (eb1->Function == APPLICATION_EXT_FUNC_CODE &&
+                    // look for "NETSCAPE2.0" app extension
+                    eb1->ByteCount == 11 &&
+                    !strcmp((const char*)(eb1->Bytes), "NETSCAPE2.0") &&
+                    // verify extension contents and get loop count
+                    eb2->Function == CONTINUE_EXT_FUNC_CODE &&
+                    eb2->ByteCount == 3 &&
+                    eb2->Bytes[0] == 1) {
+                mLoopCount = (int)(eb2->Bytes[2] & 0xff) + (int)(eb2->Bytes[1] & 0xff);
+            }
+        }
+
         DGifSavedExtensionToGCB(mGif, i, &gcb);
 
         // timing
@@ -316,6 +333,10 @@ long FrameSequenceState_gif::drawFrame(int frameNr,
         }
     }
 
+    // return last frame's delay
+    const int maxFrame = gif->ImageCount;
+    const int lastFrame = (frameNr + maxFrame - 1) % maxFrame;
+    DGifSavedExtensionToGCB(gif, lastFrame, &gcb);
     return getDelayMs(gcb);
 }
 
diff --git a/framesequence/jni/FrameSequence_gif.h b/framesequence/jni/FrameSequence_gif.h
index fbc4959..8bf57b6 100644
--- a/framesequence/jni/FrameSequence_gif.h
+++ b/framesequence/jni/FrameSequence_gif.h
@@ -37,12 +37,16 @@ public:
         return mGif ? mGif->SHeight : 0;
     }
 
+    virtual bool isOpaque() const {
+        return (mBgColor & COLOR_8888_ALPHA_MASK) == COLOR_8888_ALPHA_MASK;
+    }
+
     virtual int getFrameCount() const {
         return mGif ? mGif->ImageCount : 0;
     }
 
-    virtual bool isOpaque() const {
-        return (mBgColor & COLOR_8888_ALPHA_MASK) == COLOR_8888_ALPHA_MASK;
+    virtual int getDefaultLoopCount() const {
+        return mLoopCount;
     }
 
     virtual FrameSequenceState* createState() const;
@@ -54,6 +58,7 @@ public:
 
 private:
     GifFileType* mGif;
+    int mLoopCount;
     Color8888 mBgColor;
 
     // array of bool per frame - if true, frame data is used by a later DISPOSE_PREVIOUS frame