Merge pull request #8 from AdarshRevankar/library-creation

HDR Library Created + Documentation

Author: AdarshRevankar

.idea/inspectionProfiles/Project_Default.xml

@@ -30,8 +30,10 @@ dependencies {
     implementation 'com.android.support.constraint:constraint-layout:1.1.3'
     implementation 'com.github.bumptech.glide:glide:3.7.0'
 
+
     testImplementation 'junit:junit:4.13'
 
     androidTestImplementation 'androidx.test.ext:junit:1.1.1'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
+    implementation project(path: ':hdr')
 }

app/build.gradle

@@ -15,6 +15,7 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
+        <activity android:name=".hdr"></activity>
         <activity android:name=".Pyramids" />
         <activity android:name=".Collapse" />
         <activity android:name=".MainActivity">

app/src/main/AndroidManifest.xml

@@ -1,5 +1,6 @@
 package com.adrino.renderscript;
 
+import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.os.Bundle;
@@ -10,49 +11,41 @@
 
 import androidx.appcompat.app.AppCompatActivity;
 
+import com.adrino.hdr.corehdr.Constants;
+import com.adrino.hdr.corehdr.CreateHDR;
+
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 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;
-
 public class Collapse extends AppCompatActivity {
-    ExposureFusion exposureFusion;
+    CreateHDR createHDR;
     List<Bitmap> bmpImages;
     private static final String TAG = "Collapse";
     private List<Bitmap> hdrOutput;
     private boolean set = false;
+    private Context context;
 
     @Override
     protected void onCreate(final Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_collapse);
-        exposureFusion = new ExposureFusion(this);
+        createHDR = new CreateHDR(this);
+        context = this;
 
         bmpImages = new ArrayList<>();
 
-        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));
-        }
+        bmpImages.add(BitmapFactory.decodeResource(getResources(), R.drawable.sarvesh_iphon1));
+        bmpImages.add(BitmapFactory.decodeResource(getResources(), R.drawable.sarvesh_iphone2));
+        bmpImages.add(BitmapFactory.decodeResource(getResources(), R.drawable.sarvesh_iphone3));
 
         new Thread(new Runnable() {
             @Override
             public void run() {
-                if(!HDRFilter.MEM_BOOST) {
-                    final List<Bitmap> resultant = exposureFusion.perform(bmpImages, ExposureFusion.Actions.RESULTANT);
+                if (!Constants.MEM_BOOST) {
+                    final List<Bitmap> resultant = new CreateHDR(context).perform(bmpImages, CreateHDR.Actions.RESULTANT);
 
                     runOnUiThread(new Runnable() {
                         @Override
@@ -65,14 +58,14 @@ public void run() {
                     });
                 }
                 long start = System.currentTimeMillis();
-                hdrOutput = exposureFusion.perform(bmpImages, ExposureFusion.Actions.COLLAPSE);
+                hdrOutput = createHDR.perform(bmpImages, CreateHDR.Actions.HDR);
                 long end = System.currentTimeMillis();
 
-                Log.e(TAG, "run: Total time : "+(float)(end - start)/1000+" s");
+                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(2));
+                        ((ImageView) findViewById(R.id.original)).setImageBitmap(bmpImages.get(2));
                         ((ImageView) findViewById(R.id.hdr)).setImageBitmap(hdrOutput.get(0));
                     }
                 });
@@ -84,14 +77,13 @@ public void run() {
             public boolean onLongClick(View v) {
 
                 ImageView imgView = findViewById(R.id.expanded_image);
-                if(!set){
-                    if(hdrOutput!=null) {
+                if (!set) {
+                    if (hdrOutput != null) {
                         imgView.setVisibility(View.VISIBLE);
                         imgView.setImageBitmap(hdrOutput.get(0));
                         set = true;
                     }
-                }
-                else{
+                } else {
                     imgView.setVisibility(View.INVISIBLE);
                     set = false;
                 }
@@ -101,25 +93,25 @@ public boolean onLongClick(View v) {
         });
     }
 
-    private void saveBitmaps(Bitmap bitmap, String filename){
+    private void saveBitmaps(Bitmap bitmap, String filename) {
         String path = Environment.getExternalStorageDirectory().toString();
         String directory = "HDRResult";
 
-        path = path + "/"+ directory;
+        path = path + "/" + directory;
 
-        if(!new File(path).exists()){
-            Log.e(TAG, "saveBitmaps: "+path );
-            if(new File(path).mkdir()){
-                Log.v("Directory Created :", ""+path);
+        if (!new File(path).exists()) {
+            Log.e(TAG, "saveBitmaps: " + path);
+            if (new File(path).mkdir()) {
+                Log.v("Directory Created :", "" + path);
 
-                try{
-                    FileOutputStream out = new FileOutputStream(path+"/"+filename);
+                try {
+                    FileOutputStream out = new FileOutputStream(path + "/" + filename);
                     bitmap.compress(Bitmap.CompressFormat.JPEG, 90, out);
-                } catch (FileNotFoundException e){
+                } catch (FileNotFoundException e) {
                     Log.e("Cannot Save", "File not found");
-                    Log.e("path", ""+path);
+                    Log.e("path", "" + path);
                 }
-            } else{
+            } else {
                 Log.e("Directory Error", "Directory cannot be created");
             }
         }