Merge pull request #111 from brarcher/custom-resolutions

Add support for custom resolutions
brarcher · Jun 26, 2018 · a019a08 · a019a08
2 parents d89765e + 1a5598c
commit a019a08
Show file tree

Hide file tree

Showing 3 changed files with 82 additions and 1 deletion.
diff --git a/app/src/main/java/protect/videotranscoder/activity/MainActivity.java b/app/src/main/java/protect/videotranscoder/activity/MainActivity.java
@@ -20,6 +20,7 @@
 import android.os.Messenger;
 import android.os.RemoteException;
 import android.preference.PreferenceManager;
+import android.support.annotation.IdRes;
 import android.support.v4.app.ActivityCompat;
 import android.support.v4.content.FileProvider;
 import android.support.v7.app.AlertDialog;
@@ -133,6 +134,7 @@ public class MainActivity extends AppCompatActivity
     private Spinner videoCodecSpinner;
     private Spinner fpsSpinner;
     private Spinner resolutionSpinner;
+    private EditText resolutionCustom;
     private EditText videoBitrateValue;
     private Spinner audioCodecSpinner;
     private Spinner audioBitrateSpinner;
@@ -181,6 +183,7 @@ protected void onCreate(Bundle savedInstanceState)
         videoCodecSpinner = findViewById(R.id.videoCodecSpinner);
         fpsSpinner = findViewById(R.id.fpsSpinner);
         resolutionSpinner = findViewById(R.id.resolutionSpinner);
+        resolutionCustom = findViewById(R.id.resolutionCustom);
         videoBitrateValue = findViewById(R.id.videoBitrateValue);
         audioCodecSpinner = findViewById(R.id.audioCodecSpinner);
         audioBitrateSpinner = findViewById(R.id.audioBitrateSpinner);
@@ -776,6 +779,34 @@ private void startEncode()
             return;
         }
 
+        final String customString = getString(R.string.custom);
+
+        if(resolution.equals(customString))
+        {
+            resolution = resolutionCustom.getText().toString();
+            String [] split = resolution.split("x");
+            if(split.length != 2)
+            {
+                Toast.makeText(this, R.string.videoResolutionValueInvalid, Toast.LENGTH_LONG).show();
+                return;
+            }
+
+            for(String value : split)
+            {
+                try
+                {
+                    // Check if the string can be parsed or not.
+                    Integer.parseInt(value);
+                }
+                catch(NumberFormatException e)
+                {
+                    Toast.makeText(this, R.string.videoResolutionValueInvalid, Toast.LENGTH_LONG).show();
+                    return;
+                }
+            }
+        }
+
+
         try
         {
             String videoBitrateKStr = videoBitrateValue.getText().toString();
@@ -1075,6 +1106,33 @@ public void onNothingSelected(AdapterView<?> parentView)
             }
         });
 
+        class SetCustomAdapter implements AdapterView.OnItemSelectedListener
+        {
+            private final String customString;
+            private final View customField;
+
+            public SetCustomAdapter(String customString, @IdRes int customFieldId)
+            {
+                this.customString = customString;
+                this.customField = findViewById(customFieldId);
+            }
+
+            @Override
+            public void onItemSelected(AdapterView<?> parent, View view, int position, long id)
+            {
+                String value = (String)parent.getItemAtPosition(position);
+                customField.setVisibility(value.equals(customString) ? View.VISIBLE : View.GONE);
+            }
+
+            @Override
+            public void onNothingSelected(AdapterView<?> parent)
+            {
+                // Nothing to do
+            }
+        }
+
+        final String customString = getString(R.string.custom);
+
         LinkedList<String> fps = new LinkedList<>(Arrays.asList("15", "24", "23.98", "25", "29.97", "30", "50"));
         if(videoInfo.videoFramerate != null && fps.contains(videoInfo.videoFramerate) == false)
         {
@@ -1116,7 +1174,9 @@ public int compare(String o1, String o2)
                 }
             });
         }
+        resolution.addLast(customString);
         resolutionSpinner.setAdapter(new ArrayAdapter<>(this, R.layout.spinner_textview, resolution));
+        resolutionSpinner.setOnItemSelectedListener(new SetCustomAdapter(customString, R.id.resolutionCustomContainer));
 
         audioCodecSpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener()
         {

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -282,12 +282,31 @@
                     android:textSize="@dimen/inputSize"
                     android:drawSelectorOnTop="true" />
             </LinearLayout>
+
+            <!-- Resolution Custom-->
+            <RelativeLayout
+                android:id="@+id/resolutionCustomContainer"
+                android:orientation="horizontal"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="@color/inputBackground"
+                android:layout_below="@id/resolutionContainer"
+                android:visibility="gone">
+                <EditText
+                    android:id="@+id/resolutionCustom"
+                    android:hint="1920×1080"
+                    android:layout_alignParentEnd="true"
+                    android:layout_height="wrap_content"
+                    android:layout_width="wrap_content"
+                    android:padding="@dimen/inputPadding"
+                    android:textSize="@dimen/inputSize"/>
+            </RelativeLayout>
             <View
                 android:id="@+id/resolutionContainerDivider"
                 android:layout_height="@dimen/inputBorderThickness"
                 android:layout_width="match_parent"
                 android:background="@color/inputBorder"
-                android:layout_below="@id/resolutionContainer"
+                android:layout_below="@id/resolutionCustomContainer"
                 android:visibility="gone"/>
 
             <!-- Video Bitrate -->

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -22,11 +22,13 @@
     <string name="audioSettingsTitle">Audio Settings</string>
     <string name="sampleRate">Sample Rate (Hz)</string>
     <string name="channels">Channels</string>
+    <string name="custom">Custom</string>
 
     <string name="notSupportedTitle">Not Supported</string>
     <string name="notSupportedMessage">This device\'s CPU architecture is not supported. Only ARM is supported.</string>
 
     <string name="selectFileFirst">You must select a file to encode first.</string>
+    <string name="videoResolutionValueInvalid">Resolution value is invalid, could not encode.</string>
     <string name="videoBitrateValueInvalid">Video bitrate value is invalid, could not encode.</string>
     <string name="encodingNotification">Encoding <xliff:g id="input_filename">%s</xliff:g></string>
     <string name="encodeStartConfirmation">Do you want to encode <xliff:g id="input_filename">%s</xliff:g> and output to <xliff:g id="output_filename">%s</xliff:g>?</string>