Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 61b6df52 authored by Jason Sams's avatar Jason Sams Committed by Android (Google) Code Review
Browse files

Merge "Update imageprocessing to remove generated files. Fix thread launch race condition."

parents ce726478 c7f4e41e

libs/rs/java/ImageProcessing/Android.mk

+2 −1
Original line number Diff line number Diff line
@@ -21,7 +21,8 @@ include $(CLEAR_VARS) 


LOCAL_MODULE_TAGS := optional



LOCAL_SRC_FILES := $(call all-java-files-under, src)

LOCAL_SRC_FILES := $(call all-java-files-under, src) \

                   $(call all-renderscript-files-under, src)

#LOCAL_STATIC_JAVA_LIBRARIES := android.renderscript



LOCAL_PACKAGE_NAME := ImageProcessing

libs/rs/java/ImageProcessing/res/raw/horizontal_blur_bc.bc

deleted100644 → 0
−1.32 KiB

File deleted.

View file

libs/rs/java/ImageProcessing/res/raw/threshold_bc.bc

deleted100644 → 0
−3.23 KiB

File deleted.

View file

libs/rs/java/ImageProcessing/res/raw/vertical_blur_bc.bc

deleted100644 → 0
−1.43 KiB

File deleted.

View file

libs/rs/java/ImageProcessing/src/com/android/rs/image/ImageProcessingActivity.java

+15 −15
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ public class ImageProcessingActivity extends Activity 
    private ScriptC_Threshold mScript;

    private ScriptC_Vertical_blur mScriptVBlur;

    private ScriptC_Horizontal_blur mScriptHBlur;

    private ScriptC_Levels mScriptLevels;

    private int mRadius = 0;

    private SeekBar mRadiusSeekBar;
@@ -260,29 +261,29 @@ public class ImageProcessingActivity extends Activity 
            }

            else if(seekBar == mInBlackSeekBar) {

                mInBlack = (float)progress;

                mScript.set_inBlack(mInBlack);

                mScriptLevels.invoke_setLevels(mInBlack, mOutBlack, mInWhite, mOutWhite);

            }

            else if(seekBar == mOutBlackSeekBar) {

                mOutBlack = (float)progress;

                mScript.set_outBlack(mOutBlack);

                mScriptLevels.invoke_setLevels(mInBlack, mOutBlack, mInWhite, mOutWhite);

            }

            else if(seekBar == mInWhiteSeekBar) {

                mInWhite = (float)progress + 127.0f;

                mScript.set_inWhite(mInWhite);

                mScriptLevels.invoke_setLevels(mInBlack, mOutBlack, mInWhite, mOutWhite);

            }

            else if(seekBar == mOutWhiteSeekBar) {

                mOutWhite = (float)progress + 127.0f;

                mScript.set_outWhite(mOutWhite);

                mScriptLevels.invoke_setLevels(mInBlack, mOutBlack, mInWhite, mOutWhite);

            }

            else if(seekBar == mGammaSeekBar) {

                mGamma = (float)progress/100.0f;

                mGamma = Math.max(mGamma, 0.1f);

                mGamma = 1.0f / mGamma;

                mScript.set_gamma(mGamma);

                mScriptLevels.invoke_setGamma(mGamma);

            }

            else if(seekBar == mSaturationSeekBar) {

                mSaturation = (float)progress / 50.0f;

                mScript.set_saturation(mSaturation);

                mScriptLevels.invoke_setSaturation(mSaturation);

            }



            long t = java.lang.System.currentTimeMillis();
@@ -375,20 +376,18 @@ public class ImageProcessingActivity extends Activity 
        mOutPixelsAllocation = Allocation.createBitmapRef(mRS, mBitmapOut);

        mScratchPixelsAllocation = Allocation.createBitmapRef(mRS, mBitmapScratch);



        mScriptVBlur = new ScriptC_Vertical_blur(mRS, getResources(), R.raw.vertical_blur_bc, false);

        mScriptHBlur = new ScriptC_Horizontal_blur(mRS, getResources(), R.raw.horizontal_blur_bc, false);

        mScriptVBlur = new ScriptC_Vertical_blur(mRS, getResources(), R.raw.vertical_blur, false);

        mScriptHBlur = new ScriptC_Horizontal_blur(mRS, getResources(), R.raw.horizontal_blur, false);

        mScriptLevels = new ScriptC_Levels(mRS, getResources(), R.raw.levels, false);



        mScript = new ScriptC_Threshold(mRS, getResources(), R.raw.threshold_bc, false);

        mScript = new ScriptC_Threshold(mRS, getResources(), R.raw.threshold, false);

        mScript.set_width(mBitmapIn.getWidth());

        mScript.set_height(mBitmapIn.getHeight());

        mScript.set_radius(mRadius);



        mScript.set_inBlack(mInBlack);

        mScript.set_outBlack(mOutBlack);

        mScript.set_inWhite(mInWhite);

        mScript.set_outWhite(mOutWhite);

        mScript.set_gamma(mGamma);

        mScript.set_saturation(mSaturation);

        mScriptLevels.invoke_setLevels(mInBlack, mOutBlack, mInWhite, mOutWhite);

        mScriptLevels.invoke_setGamma(mGamma);

        mScriptLevels.invoke_setSaturation(mSaturation);



        mScript.bind_InPixel(mInPixelsAllocation);

        mScript.bind_OutPixel(mOutPixelsAllocation);
@@ -396,6 +395,7 @@ public class ImageProcessingActivity extends Activity 


        mScript.set_vBlurScript(mScriptVBlur);

        mScript.set_hBlurScript(mScriptHBlur);

        mScript.set_levelsScript(mScriptLevels);

    }



    private Bitmap loadBitmap(int resource) {