diff options
Diffstat (limited to 'framesequence/src')
-rw-r--r-- | framesequence/src/android/support/rastermill/FrameSequence.java | 29 | ||||
-rw-r--r-- | framesequence/src/android/support/rastermill/FrameSequenceDrawable.java | 71 |
2 files changed, 86 insertions, 14 deletions
diff --git a/framesequence/src/android/support/rastermill/FrameSequence.java b/framesequence/src/android/support/rastermill/FrameSequence.java index 5881ea9..d6bde0f 100644 --- a/framesequence/src/android/support/rastermill/FrameSequence.java +++ b/framesequence/src/android/support/rastermill/FrameSequence.java @@ -25,33 +25,36 @@ public class FrameSequence { System.loadLibrary("framesequence"); } - private final int mNativeFrameSequence; + private final long mNativeFrameSequence; private final int mWidth; private final int mHeight; - private final int mFrameCount; private final boolean mOpaque; + private final int mFrameCount; + private final int mDefaultLoopCount; public int getWidth() { return mWidth; } public int getHeight() { return mHeight; } - public int getFrameCount() { return mFrameCount; } public boolean isOpaque() { return mOpaque; } + public int getFrameCount() { return mFrameCount; } + public int getDefaultLoopCount() { return mDefaultLoopCount; } private static native FrameSequence nativeDecodeByteArray(byte[] data, int offset, int length); private static native FrameSequence nativeDecodeStream(InputStream is, byte[] tempStorage); - private static native void nativeDestroyFrameSequence(int nativeFrameSequence); - private static native int nativeCreateState(int nativeFrameSequence); - private static native void nativeDestroyState(int nativeState); - private static native long nativeGetFrame(int nativeState, int frameNr, + private static native void nativeDestroyFrameSequence(long nativeFrameSequence); + private static native long nativeCreateState(long nativeFrameSequence); + private static native void nativeDestroyState(long nativeState); + private static native long nativeGetFrame(long nativeState, int frameNr, Bitmap output, int previousFrameNr); @SuppressWarnings("unused") // called by native - private FrameSequence(int nativeFrameSequence, int width, int height, - int frameCount, boolean opaque) { + private FrameSequence(long nativeFrameSequence, int width, int height, + boolean opaque, int frameCount, int defaultLoopCount) { mNativeFrameSequence = nativeFrameSequence; mWidth = width; mHeight = height; - mFrameCount = frameCount; mOpaque = opaque; + mFrameCount = frameCount; + mDefaultLoopCount = defaultLoopCount; } public static FrameSequence decodeByteArray(byte[] data) { @@ -77,7 +80,7 @@ public class FrameSequence { throw new IllegalStateException("attempted to use incorrectly built FrameSequence"); } - int nativeState = nativeCreateState(mNativeFrameSequence); + long nativeState = nativeCreateState(mNativeFrameSequence); if (nativeState == 0) { return null; } @@ -106,9 +109,9 @@ public class FrameSequence { * remain ref'd while it is in use */ static class State { - private int mNativeState; + private long mNativeState; - public State(int nativeState) { + public State(long nativeState) { mNativeState = nativeState; } diff --git a/framesequence/src/android/support/rastermill/FrameSequenceDrawable.java b/framesequence/src/android/support/rastermill/FrameSequenceDrawable.java index 94f4da0..f5f1f47 100644 --- a/framesequence/src/android/support/rastermill/FrameSequenceDrawable.java +++ b/framesequence/src/android/support/rastermill/FrameSequenceDrawable.java @@ -42,6 +42,49 @@ public class FrameSequenceDrawable extends Drawable implements Animatable, Runna } } + public static interface OnFinishedListener { + /** + * Called when a FrameSequenceDrawable has finished looping. + * + * Note that this is will not be called if the drawable is explicitly + * stopped, or marked invisible. + */ + public abstract void onFinished(FrameSequenceDrawable drawable); + } + + /** + * Register a callback to be invoked when a FrameSequenceDrawable finishes looping. + * + * @see setLoopBehavior() + */ + public void setOnFinishedListener(OnFinishedListener onFinishedListener) { + mOnFinishedListener = onFinishedListener; + } + + /** + * Loop only once. + */ + public static final int LOOP_ONCE = 1; + + /** + * Loop continuously. The OnFinishedListener will never be called. + */ + public static final int LOOP_INF = 2; + + /** + * Use loop count stored in source data, or LOOP_ONCE if not present. + */ + public static final int LOOP_DEFAULT = 3; + + /** + * Define looping behavior of frame sequence. + * + * Must be one of LOOP_ONCE, LOOP_INF, or LOOP_DEFAULT + */ + public void setLoopBehavior(int loopBehavior) { + mLoopBehavior = loopBehavior; + } + private final FrameSequence mFrameSequence; private final FrameSequence.State mFrameSequenceState; @@ -60,9 +103,12 @@ public class FrameSequenceDrawable extends Drawable implements Animatable, Runna private static final int STATE_READY_TO_SWAP = 4; private int mState; + private int mCurrentLoop; + private int mLoopBehavior = LOOP_DEFAULT; private long mLastSwap; private int mNextFrameToDecode; + private OnFinishedListener mOnFinishedListener; /** * Runs on decoding thread, only modifies mBackBitmap's pixels @@ -93,6 +139,14 @@ public class FrameSequenceDrawable extends Drawable implements Animatable, Runna } }; + private Runnable mCallbackRunnable = new Runnable() { + @Override + public void run() { + if (mOnFinishedListener != null) { + mOnFinishedListener.onFinished(FrameSequenceDrawable.this); + } + } + }; public FrameSequenceDrawable(FrameSequence frameSequence) { if (frameSequence == null) throw new IllegalArgumentException(); @@ -138,7 +192,21 @@ public class FrameSequenceDrawable extends Drawable implements Animatable, Runna mFrontBitmap = tmp; mLastSwap = SystemClock.uptimeMillis(); - scheduleDecodeLocked(); + + boolean continueLooping = true; + if (mNextFrameToDecode == mFrameSequence.getFrameCount() - 1) { + mCurrentLoop++; + if ((mLoopBehavior == LOOP_ONCE && mCurrentLoop == 1) || + (mLoopBehavior == LOOP_DEFAULT && mCurrentLoop == mFrameSequence.getDefaultLoopCount())) { + continueLooping = false; + } + } + + if (continueLooping) { + scheduleDecodeLocked(); + } else { + scheduleSelf(mCallbackRunnable, 0); + } } } @@ -166,6 +234,7 @@ public class FrameSequenceDrawable extends Drawable implements Animatable, Runna if (!isRunning()) { synchronized (mLock) { if (mState == STATE_SCHEDULED) return; // already scheduled + mCurrentLoop = 0; scheduleDecodeLocked(); } } |