Merge pull request #6 from AdarshRevankar/memoryOptimize

mem opt: Major UI Change ; Performance Improvements ( MemBoost - Togg…

Author: AdarshRevankar

app/build.gradle

@@ -25,9 +25,12 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation 'androidx.appcompat:appcompat:1.1.0'
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
-    implementation 'com.android.support:appcompat-v7:29.+'
+    implementation 'com.android.support:design:29.0.0'
+    implementation 'com.android.support:appcompat-v7:29.0.0'
     implementation 'com.android.support.constraint:constraint-layout:1.1.3'
+
     testImplementation 'junit:junit:4.13'
+
     androidTestImplementation 'androidx.test.ext:junit:1.1.1'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
 }

app/src/main/AndroidManifest.xml

@@ -21,6 +21,7 @@
         <activity android:name=".MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
+
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>

app/src/main/java/com/adrino/renderscript/Collapse.java

@@ -5,16 +5,19 @@
 import android.os.Bundle;
 import android.os.Environment;
 import android.util.Log;
+import android.view.View;
 import android.widget.ImageView;
 
 import androidx.appcompat.app.AppCompatActivity;
 
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
+import java.sql.Time;
 import java.util.ArrayList;
 import java.util.List;
 
+import static com.adrino.renderscript.MainActivity.SCALE_THRUSHOLD;
 import static com.adrino.renderscript.MainActivity.SOURCE1;
 import static com.adrino.renderscript.MainActivity.SOURCE2;
 import static com.adrino.renderscript.MainActivity.SOURCE3;
@@ -24,6 +27,7 @@ public class Collapse extends AppCompatActivity {
     List<Bitmap> bmpImages;
     private static final String TAG = "Collapse";
     private List<Bitmap> hdrOutput;
+    private boolean set = false;
 
     @Override
     protected void onCreate(final Bundle savedInstanceState) {
@@ -46,26 +50,58 @@ public void run() {
                     }
                 });
 
+                long start = System.currentTimeMillis();
                 hdrOutput = exposureFusion.perform(bmpImages, ExposureFusion.Actions.COLLAPSE);
+                long end = System.currentTimeMillis();
+
+                Log.e(TAG, "run: Total time : "+(float)(end - start)/1000+" s");
                 runOnUiThread(new Runnable() {
                     @Override
                     public void run() {
-                        ((ImageView)findViewById(R.id.original)).setImageBitmap(bmpImages.get(0));
+                        ((ImageView)findViewById(R.id.original)).setImageBitmap(bmpImages.get(2));
                         ((ImageView) findViewById(R.id.hdr)).setImageBitmap(hdrOutput.get(0));
                     }
                 });
             }
         }).start();
+
+        (findViewById(R.id.hdr)).setOnLongClickListener(new View.OnLongClickListener() {
+            @Override
+            public boolean onLongClick(View v) {
+
+                ImageView imgView = findViewById(R.id.expanded_image);
+                if(!set){
+                    if(hdrOutput!=null) {
+                        imgView.setVisibility(View.VISIBLE);
+                        imgView.setImageBitmap(hdrOutput.get(0));
+                        set = true;
+                    }
+                }
+                else{
+                    imgView.setVisibility(View.INVISIBLE);
+                    set = false;
+                }
+
+                return true;
+            }
+        });
     }
 
     List<Bitmap> generateResultant() {
         if (bmpImages == null) {
             bmpImages = new ArrayList<>();
-            BitmapFactory.Options imgLoadOption = new BitmapFactory.Options();
-            imgLoadOption.inSampleSize = ExposureFusion.SAMPLE_SIZE;
-            bmpImages.add(BitmapFactory.decodeResource(getResources(), SOURCE1, imgLoadOption));
-            bmpImages.add(BitmapFactory.decodeResource(getResources(), SOURCE2, imgLoadOption));
-            bmpImages.add(BitmapFactory.decodeResource(getResources(), SOURCE3, imgLoadOption));
+
+            bmpImages.add(BitmapFactory.decodeResource(getResources(), SOURCE1));
+            bmpImages.add(BitmapFactory.decodeResource(getResources(), SOURCE2));
+            bmpImages.add(BitmapFactory.decodeResource(getResources(), SOURCE3));
+
+            int imgWidth = bmpImages.get(0).getWidth();
+            int imgHeight = bmpImages.get(0).getHeight();
+            int scaledWidth = imgHeight > imgWidth ? (imgWidth * SCALE_THRUSHOLD) / imgHeight : SCALE_THRUSHOLD;
+            int scaledHeight = imgHeight > imgWidth ? SCALE_THRUSHOLD : (imgHeight * SCALE_THRUSHOLD) / imgWidth ;
+            for (int i = 0; i < bmpImages.size(); i++) {
+                bmpImages.set(i, Bitmap.createScaledBitmap(bmpImages.get(i), scaledWidth, scaledHeight, false));
+            }
             return exposureFusion.perform(bmpImages, ExposureFusion.Actions.RESULTANT);
         }
         return null;

app/src/main/java/com/adrino/renderscript/ExposureFusion.java

@@ -2,14 +2,16 @@
 
 import android.content.Context;
 import android.graphics.Bitmap;
+import android.util.Log;
 
 import androidx.renderscript.Allocation;
 
 import java.util.List;
 
 public class ExposureFusion implements HDRManager.Presenter {
 
-    public static final int SAMPLE_SIZE = 5;
+    public static boolean MEM_BOOST;
+    public static final int SAMPLE_SIZE = 1;
     private static final String TAG = "ExposureFusion";
     private static int SELECTED_INDEX = 0;
     private static HDRFilter hdrFilter;
@@ -38,6 +40,7 @@ public void setMeta(int imgWidth, int imgHeight, Bitmap.Config imgConfig) {
     @Override
     public List<Bitmap> perform(List<Bitmap> bmpImagesList, Actions action) {
 
+        Log.e(TAG, "perform: contrast : "+contrast);
         if (contrast == null) contrast = hdrFilter.applyConvolution3x3Filter(bmpImagesList);
         if (saturation == null) saturation = hdrFilter.applySaturationFilter(bmpImagesList);
         if (well_exposedness == null)
@@ -94,20 +97,4 @@ public List<Bitmap> perform(List<Bitmap> bmpImagesList, Actions action, int sele
 //        SELECTED_INDEX = selected;
 //        return hdrFilter.convertAllocationBMPDyamic(hdrFilter.generateLaplacianPyramids(inImage).get(SELECTED_INDEX));
 //    }
-
-    @Override
-    public Bitmap computeHDR(List<Bitmap> bmpInImages) {
-        return hdrFilter.convertAllocationBMPDyamic(hdrFilter.collapseResultant(
-                hdrFilter.generateResultant(
-                        hdrFilter.generateGaussianPyramid(
-                                hdrFilter.computeNormalWeighted(
-                                        hdrFilter.applyConvolution3x3Filter(bmpInImages),
-                                        hdrFilter.applySaturationFilter(bmpInImages),
-                                        hdrFilter.applyExposureFilter(bmpInImages)
-                                ), HDRFilter.DATA_TYPE.FLOAT32
-                        ),
-                        hdrFilter.generateLaplacianPyramids(bmpInImages)
-                )
-        )).get(0);
-    }
 }