diff options
author | nicolasroard <nicolasroard@google.com> | 2013-07-19 14:45:32 -0700 |
---|---|---|
committer | nicolasroard <nicolasroard@google.com> | 2013-07-19 15:48:58 -0700 |
commit | 58019558c7465a8dce8dfb49d68292a296c6b408 (patch) | |
tree | 437bcaf4d1b14a83c669bdd89a16ef211baf2430 /src/com/android/gallery3d/filtershow/imageshow/MasterImage.java | |
parent | cf76723e40171afef891d494d4c537200597acbb (diff) | |
download | android_packages_apps_Snap-58019558c7465a8dce8dfb49d68292a296c6b408.tar.gz android_packages_apps_Snap-58019558c7465a8dce8dfb49d68292a296c6b408.tar.bz2 android_packages_apps_Snap-58019558c7465a8dce8dfb49d68292a296c6b408.zip |
Remove FilteringPipeline
Reorganize things around the filtering service.
- add HighresRenderingTask
- add RenderingRequestTask
- add UpdatePreviewTask
Change-Id: I3da34fee8c624fb55311c3e1639857fc1bcdadad
Diffstat (limited to 'src/com/android/gallery3d/filtershow/imageshow/MasterImage.java')
-rw-r--r-- | src/com/android/gallery3d/filtershow/imageshow/MasterImage.java | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/com/android/gallery3d/filtershow/imageshow/MasterImage.java b/src/com/android/gallery3d/filtershow/imageshow/MasterImage.java index 01fe3c159..45ee5d7a4 100644 --- a/src/com/android/gallery3d/filtershow/imageshow/MasterImage.java +++ b/src/com/android/gallery3d/filtershow/imageshow/MasterImage.java @@ -32,7 +32,6 @@ import com.android.gallery3d.filtershow.filters.ImageFilter; import com.android.gallery3d.filtershow.history.HistoryItem; import com.android.gallery3d.filtershow.history.HistoryManager; import com.android.gallery3d.filtershow.pipeline.Buffer; -import com.android.gallery3d.filtershow.pipeline.FilteringPipeline; import com.android.gallery3d.filtershow.pipeline.ImagePreset; import com.android.gallery3d.filtershow.pipeline.RenderingRequest; import com.android.gallery3d.filtershow.pipeline.RenderingRequestCaller; @@ -387,7 +386,7 @@ public class MasterImage implements RenderingRequestCaller { if (force || mGeometryOnlyPreset == null || !newPreset.same(mGeometryOnlyPreset)) { mGeometryOnlyPreset = newPreset; - RenderingRequest.post(getOriginalBitmapLarge(), + RenderingRequest.post(mActivity, getOriginalBitmapLarge(), mGeometryOnlyPreset, RenderingRequest.GEOMETRY_RENDERING, this); } } @@ -398,7 +397,7 @@ public class MasterImage implements RenderingRequestCaller { if (force || mFiltersOnlyPreset == null || !newPreset.same(mFiltersOnlyPreset)) { mFiltersOnlyPreset = newPreset; - RenderingRequest.post(MasterImage.getImage().getOriginalBitmapLarge(), + RenderingRequest.post(mActivity, MasterImage.getImage().getOriginalBitmapLarge(), mFiltersOnlyPreset, RenderingRequest.FILTERS_RENDERING, this); } } @@ -439,7 +438,7 @@ public class MasterImage implements RenderingRequestCaller { invalidateHighresPreview(); needsUpdatePartialPreview(); needsUpdateHighResPreview(); - FilteringPipeline.getPipeline().updatePreviewBuffer(); + mActivity.getProcessingService().updatePreviewBuffer(); } public void setImageShowSize(int w, int h) { @@ -477,7 +476,11 @@ public class MasterImage implements RenderingRequestCaller { if (!mSupportsHighRes) { return; } - RenderingRequest.post(null, mPreset, RenderingRequest.HIGHRES_RENDERING, this); + if (mActivity.getProcessingService() == null) { + return; + } + mActivity.getProcessingService().postHighresRenderingRequest(mPreset, + getScaleFactor(), this); invalidateHighresPreview(); } @@ -495,7 +498,7 @@ public class MasterImage implements RenderingRequestCaller { m.mapRect(dest, r); Rect bounds = new Rect(); dest.roundOut(bounds); - RenderingRequest.post(null, mPreset, RenderingRequest.PARTIAL_RENDERING, + RenderingRequest.post(mActivity, null, mPreset, RenderingRequest.PARTIAL_RENDERING, this, bounds, new Rect(0, 0, mImageShowSize.x, mImageShowSize.y)); invalidatePartialPreview(); } |