diff options
Diffstat (limited to 'src/com/android/gallery3d/filtershow/pipeline')
3 files changed, 72 insertions, 15 deletions
diff --git a/src/com/android/gallery3d/filtershow/pipeline/Buffer.java b/src/com/android/gallery3d/filtershow/pipeline/Buffer.java index 72685167a..c6dbdb75a 100644 --- a/src/com/android/gallery3d/filtershow/pipeline/Buffer.java +++ b/src/com/android/gallery3d/filtershow/pipeline/Buffer.java @@ -20,16 +20,21 @@ import android.graphics.Bitmap; import android.support.v8.renderscript.Allocation; import android.support.v8.renderscript.RenderScript; import com.android.gallery3d.filtershow.cache.CachingPipeline; +import com.android.gallery3d.filtershow.presets.ImagePreset; public class Buffer { + private static final String LOGTAG = "Buffer"; private Bitmap mBitmap; private Allocation mAllocation; private boolean mUseAllocation = false; private static final Bitmap.Config BITMAP_CONFIG = Bitmap.Config.ARGB_8888; + private ImagePreset mPreset; public Buffer(Bitmap bitmap) { RenderScript rs = CachingPipeline.getRenderScriptContext(); - mBitmap = bitmap.copy(BITMAP_CONFIG, true); + if (bitmap != null) { + mBitmap = bitmap.copy(BITMAP_CONFIG, true); + } if (mUseAllocation) { // TODO: recreate the allocation when the RS context changes mAllocation = Allocation.createFromBitmap(rs, mBitmap, @@ -38,6 +43,10 @@ public class Buffer { } } + public void setBitmap(Bitmap bitmap) { + mBitmap = bitmap.copy(BITMAP_CONFIG, true); + } + public Bitmap getBitmap() { return mBitmap; } @@ -52,5 +61,16 @@ public class Buffer { } } + public ImagePreset getPreset() { + return mPreset; + } + + public void setPreset(ImagePreset preset) { + if ((mPreset == null) || (!mPreset.same(preset))) { + mPreset = new ImagePreset(preset); + } else { + mPreset.updateWith(preset); + } + } } diff --git a/src/com/android/gallery3d/filtershow/pipeline/SharedBuffer.java b/src/com/android/gallery3d/filtershow/pipeline/SharedBuffer.java index 587174668..98e69f60e 100644 --- a/src/com/android/gallery3d/filtershow/pipeline/SharedBuffer.java +++ b/src/com/android/gallery3d/filtershow/pipeline/SharedBuffer.java @@ -17,7 +17,6 @@ package com.android.gallery3d.filtershow.pipeline; import android.graphics.Bitmap; -import android.util.Log; public class SharedBuffer { @@ -26,15 +25,15 @@ public class SharedBuffer { private volatile Buffer mProducer = null; private volatile Buffer mConsumer = null; private volatile Buffer mIntermediate = null; - private volatile boolean mNeedsSwap = false; + private volatile boolean mNeedsSwap = false; private volatile boolean mNeedsRepaint = true; - public SharedBuffer() { - } - - public synchronized void setProducer(Bitmap producer) { - mProducer = new Buffer(producer); + public void setProducer(Bitmap producer) { + Buffer buffer = new Buffer(producer); + synchronized (this) { + mProducer = buffer; + } } public synchronized Buffer getProducer() { @@ -46,22 +45,16 @@ public class SharedBuffer { } public synchronized void swapProducer() { - if (mProducer != null) { - mProducer.sync(); - } Buffer intermediate = mIntermediate; mIntermediate = mProducer; mProducer = intermediate; mNeedsSwap = true; } - public synchronized void swapConsumer() { + public synchronized void swapConsumerIfNeeded() { if (!mNeedsSwap) { return; } - if (mConsumer != null) { - mConsumer.sync(); - } Buffer intermediate = mIntermediate; mIntermediate = mConsumer; mConsumer = intermediate; diff --git a/src/com/android/gallery3d/filtershow/pipeline/SharedPreset.java b/src/com/android/gallery3d/filtershow/pipeline/SharedPreset.java new file mode 100644 index 000000000..e87469458 --- /dev/null +++ b/src/com/android/gallery3d/filtershow/pipeline/SharedPreset.java @@ -0,0 +1,44 @@ +/* + * Copyright (C) 2013 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.gallery3d.filtershow.pipeline; + +import com.android.gallery3d.filtershow.presets.ImagePreset; + +public class SharedPreset { + + private volatile ImagePreset mProducerPreset = null; + private volatile ImagePreset mConsumerPreset = null; + private volatile ImagePreset mIntermediatePreset = null; + + public synchronized void enqueuePreset(ImagePreset preset) { + if (mProducerPreset == null || (!mProducerPreset.same(preset))) { + mProducerPreset = new ImagePreset(preset); + } else { + mProducerPreset.updateWith(preset); + } + ImagePreset temp = mIntermediatePreset; + mIntermediatePreset = mProducerPreset; + mProducerPreset = temp; + } + + public synchronized ImagePreset dequeuePreset() { + ImagePreset temp = mConsumerPreset; + mConsumerPreset = mIntermediatePreset; + mIntermediatePreset = temp; + return mConsumerPreset; + } +} |