Add cancel button and progress bar

Author: brarcher

app/src/main/java/protect/videotranscoder/FFmpegResponseHandler.java

@@ -3,6 +3,7 @@
 import android.app.ProgressDialog;
 import android.content.Context;
 import android.util.Log;
+import android.widget.ProgressBar;
 
 import com.github.hiteshsondhi88.libffmpeg.ExecuteBinaryResponseHandler;
 
@@ -11,14 +12,14 @@ public class FFmpegResponseHandler extends ExecuteBinaryResponseHandler
     private static final String TAG = "VideoTranscoder";
 
     private final long _durationMs;
-    private final ProgressDialog _progressDialog;
+    private final ProgressBar _progressBar;
     private final ResultCallbackHandler<Boolean> _resultHandler;
 
-    public FFmpegResponseHandler(long durationMs, ProgressDialog progressDialog,
+    public FFmpegResponseHandler(long durationMs, ProgressBar progressBar,
                                  ResultCallbackHandler<Boolean> resultHandler)
     {
         _durationMs = durationMs;
-        _progressDialog = progressDialog;
+        _progressBar = progressBar;
         _resultHandler = resultHandler;
     }
 
@@ -61,23 +62,19 @@ public void onProgress(String s)
         if(currentTimeMs != null)
         {
             int percentComplete = (int)Math.floor((currentTimeMs * 100) / (float)_durationMs);
-
-            _progressDialog.setMessage(percentComplete + "%");
+            _progressBar.setProgress(percentComplete);
         }
     }
 
     @Override
     public void onStart()
     {
         Log.d(TAG, "Started FFmpeg command");
-        _progressDialog.setMessage("Processing...");
-        _progressDialog.show();
     }
 
     @Override
     public void onFinish()
     {
         Log.d(TAG, "Finished command");
-        _progressDialog.dismiss();
     }
 }

app/src/main/java/protect/videotranscoder/activity/MainActivity.java

@@ -1,7 +1,6 @@
 package protect.videotranscoder.activity;
 
 import android.Manifest;
-import android.app.ProgressDialog;
 import android.content.ContentUris;
 import android.content.Context;
 import android.content.DialogInterface;
@@ -27,6 +26,7 @@
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
 import android.widget.Button;
+import android.widget.ProgressBar;
 import android.widget.Spinner;
 import android.widget.TextView;
 import android.widget.Toast;
@@ -96,7 +96,7 @@ public class MainActivity extends AppCompatActivity
     private VideoView videoView;
     private CrystalRangeSeekbar rangeSeekBar;
     private Timer videoTimer = null;
-    private ProgressDialog progressDialog;
+    private ProgressBar progressBar;
 
     private Spinner containerSpinner;
     private Spinner videoCodecSpinner;
@@ -109,7 +109,9 @@ public class MainActivity extends AppCompatActivity
     private Spinner audioChannelSpinner;
 
     private TextView tvLeft, tvRight;
+    private Button selectVideoButton;
     private Button encodeButton;
+    private Button cancelButton;
     private MediaInfo videoInfo;
     private File outputDestination;
 
@@ -118,17 +120,16 @@ protected void onCreate(Bundle savedInstanceState)
     {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
-        final Button selectVideo = findViewById(R.id.selectVideo);
+        selectVideoButton = findViewById(R.id.selectVideo);
         encodeButton = findViewById(R.id.encode);
+        cancelButton = findViewById(R.id.cancel);
 
         tvLeft = findViewById(R.id.tvLeft);
         tvRight = findViewById(R.id.tvRight);
 
         videoView =  findViewById(R.id.videoView);
         rangeSeekBar =  findViewById(R.id.rangeSeekBar);
-        progressDialog = new ProgressDialog(this);
-        progressDialog.setTitle(null);
-        progressDialog.setCancelable(false);
+        progressBar = findViewById(R.id.encodeProgress);
         rangeSeekBar.setEnabled(false);
 
         containerSpinner = findViewById(R.id.containerSpinner);
@@ -153,7 +154,7 @@ public void onResult(Boolean result)
             }
         });
 
-        selectVideo.setOnClickListener(new View.OnClickListener()
+        selectVideoButton.setOnClickListener(new View.OnClickListener()
         {
             @Override
             public void onClick(View v)
@@ -177,6 +178,15 @@ public void onClick(View v)
                 startEncode();
             }
         });
+
+        cancelButton.setOnClickListener(new View.OnClickListener()
+        {
+            @Override
+            public void onClick(View v)
+            {
+                cancelEncode();
+            }
+        });
     }
 
     private void getPermission()
@@ -379,10 +389,28 @@ private void startEncode()
         // Output file
         command.add(destination.getAbsolutePath());
 
-        FFmpegResponseHandler handler = new FFmpegResponseHandler(videoInfo.durationMs, progressDialog, _transcodeResultHandler);
+        FFmpegResponseHandler handler = new FFmpegResponseHandler(videoInfo.durationMs, progressBar, _transcodeResultHandler);
         FFmpegUtil.call(command.toArray(new String[command.size()]), handler);
 
         stopVideoPlayback();
+
+        selectVideoButton.setVisibility(View.GONE);
+        encodeButton.setVisibility(View.GONE);
+        cancelButton.setVisibility(View.VISIBLE);
+        progressBar.setVisibility(View.VISIBLE);
+    }
+
+    private void cancelEncode()
+    {
+        FFmpegUtil.cancelCall();
+
+        _transcodeResultHandler.onResult(false);
+
+        boolean result = outputDestination.delete();
+        if(result == false)
+        {
+            Log.d(TAG, "Failed to remove after encode cancel: " + outputDestination.getAbsolutePath());
+        }
     }
 
     private void stopVideoPlayback()
@@ -715,6 +743,11 @@ public void onClick(DialogInterface dialog, int which)
                     .show();
 
             startVideoPlayback();
+
+            selectVideoButton.setVisibility(View.VISIBLE);
+            encodeButton.setVisibility(View.VISIBLE);
+            cancelButton.setVisibility(View.GONE);
+            progressBar.setVisibility(View.GONE);
         }
     };
 

app/src/main/res/layout/activity_main.xml

@@ -70,8 +70,23 @@
                     android:visibility="gone"
                     android:text="@string/encode"
                     />
+                <Button
+                    android:id="@+id/cancel"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:visibility="gone"
+                    android:text="@string/cancel"
+                    />
             </LinearLayout>
 
+            <ProgressBar
+                android:id="@+id/encodeProgress"
+                style="@android:style/Widget.ProgressBar.Horizontal"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:visibility="gone"
+                android:layout_below="@id/buttonContainer"/>
+
             <!-- Basic Settings Title -->
             <TextView
                 android:id="@+id/basicSettingsText"
@@ -81,7 +96,7 @@
                 android:paddingRight="@dimen/titlePaddingHorizontal"
                 android:paddingStart="@dimen/titlePaddingHorizontal"
                 android:paddingTop="@dimen/titlePaddingTop"
-                android:layout_below="@id/buttonContainer"
+                android:layout_below="@id/encodeProgress"
                 android:text="Basic Settings"
                 android:textSize="@dimen/inputTitleSize"
                 android:visibility="gone"

app/src/main/res/values/strings.xml

@@ -5,6 +5,7 @@
 
     <string name="selectVideo">Select\nVideo</string>
     <string name="encode">Encode</string>
+    <string name="cancel">Cancel</string>
 
     <string name="ok">OK</string>