Changed higher end bitrates to 1080p for local video playback.

Author: Chris Bellew

mobile/src/main/java/com/atomjack/vcfp/VoiceControlForPlexApplication.java

@@ -116,7 +116,9 @@ public class VoiceControlForPlexApplication extends Application
   private IabBroadcastReceiver promoReceiver;
 
   public static HashMap<String, String[]> chromecastVideoQualityOptions = new LinkedHashMap<String, String[]>();
+  public static String chromecastVideoQualityDefault;
   public static HashMap<String, String[]> localVideoQualityOptions = new LinkedHashMap<String, String[]>();
+  public static String localVideoQualityDefault;
 
   private NotificationManager mNotifyMgr;
   private Bitmap notificationBitmap = null;
@@ -182,6 +184,7 @@ public void onCreate() {
     localClientSubscription = new LocalClientSubscription();
 
 //    chromecastVideoQualityOptions.put(getString(R.string.original), new String[]{"12000", "1920x1080", "1"}); // Disabled for now. Don't know how to get PMS to direct play to chromecast
+    chromecastVideoQualityDefault = "8mbps 720p";
     chromecastVideoQualityOptions.put("20mbps 720p", new String[]{"20000", "1280x720"});
     chromecastVideoQualityOptions.put("12mbps 720p", new String[]{"12000", "1280x720"});
     chromecastVideoQualityOptions.put("10mbps 720p", new String[]{"10000", "1280x720"});
@@ -190,7 +193,17 @@ public void onCreate() {
     chromecastVideoQualityOptions.put("3mbps 720p", new String[]{"3000", "1280x720"});
     chromecastVideoQualityOptions.put("2mbps 720p", new String[]{"2000", "1280x720"});
     chromecastVideoQualityOptions.put("1.5mbps 720p", new String[]{"1500", "1280x720"});
-    localVideoQualityOptions.putAll(chromecastVideoQualityOptions);
+
+
+    localVideoQualityDefault = "8mbps 1080p";
+    localVideoQualityOptions.put("20mbps 1080p", new String[]{"20000", "1920x1080"});
+    localVideoQualityOptions.put("12mbps 1080p", new String[]{"12000", "1920x1080"});
+    localVideoQualityOptions.put("10mbps 1080p", new String[]{"10000", "1920x1080"});
+    localVideoQualityOptions.put("8mbps 1080p", new String[]{"8000", "1920x1080"});
+    localVideoQualityOptions.put("4mbps 720p", new String[]{"4000", "1280x720"});
+    localVideoQualityOptions.put("3mbps 720p", new String[]{"3000", "1280x720"});
+    localVideoQualityOptions.put("2mbps 720p", new String[]{"2000", "1280x720"});
+    localVideoQualityOptions.put("1.5mbps 720p", new String[]{"1500", "1280x720"});
     localVideoQualityOptions.put("720kbps 480p", new String[]{"720", "852x480"});
     localVideoQualityOptions.put("512kbps 480p", new String[]{"512", "852x480"});
     localVideoQualityOptions.put("320kbps 480p", new String[]{"320", "852x480"});

mobile/src/main/java/com/atomjack/vcfp/activities/MainActivity.java

@@ -2433,7 +2433,7 @@ public void onClick(View v) {
     chooserDialog.show();
   }
 
-  private void showVideoOptions(final boolean chromecast, final boolean local) {
+  private void showVideoOptions(final boolean chromecast, final boolean localNetwork) {
     HashMap<String, String[]> videoQualityOptions;
     if(chromecast)
       videoQualityOptions = VoiceControlForPlexApplication.chromecastVideoQualityOptions;
@@ -2447,24 +2447,26 @@ private void showVideoOptions(final boolean chromecast, final boolean local) {
     TextView videoOptionsTitle = (TextView)view.findViewById(R.id.videoOptionsTitle);
     int title;
     if(chromecast) {
-      title = local ? R.string.chromecast_video_local_full : R.string.chromecast_video_remote_full;
+      title = localNetwork ? R.string.chromecast_video_local_full : R.string.chromecast_video_remote_full;
     } else {
-      title = local ? R.string.local_video_local_full : R.string.local_video_remote_full;
+      title = localNetwork ? R.string.local_video_local_full : R.string.local_video_remote_full;
     }
     videoOptionsTitle.setText(title);
 
     final String prefKey;
     if(chromecast) {
-      prefKey = local ? Preferences.CHROMECAST_VIDEO_QUALITY_LOCAL : Preferences.CHROMECAST_VIDEO_QUALITY_REMOTE;
+      prefKey = localNetwork ? Preferences.CHROMECAST_VIDEO_QUALITY_LOCAL : Preferences.CHROMECAST_VIDEO_QUALITY_REMOTE;
     } else {
-      prefKey = local ? Preferences.LOCAL_VIDEO_QUALITY_LOCAL : Preferences.LOCAL_VIDEO_QUALITY_REMOTE;
+      prefKey = localNetwork ? Preferences.LOCAL_VIDEO_QUALITY_LOCAL : Preferences.LOCAL_VIDEO_QUALITY_REMOTE;
     }
 
     RadioGroup videoOptionsRadioGroup = (RadioGroup)view.findViewById(R.id.videoOptionsRadioGroup);
     final CharSequence[] items = videoQualityOptions.keySet().toArray(new CharSequence[videoQualityOptions.size()]);
     int videoQuality = new ArrayList<>(videoQualityOptions.keySet()).indexOf(prefs.getString(prefKey));
-    if(videoQuality == -1)
-      videoQuality = new ArrayList<>(videoQualityOptions.keySet()).indexOf("8mbps 720p");
+    logger.d("videoQuality: %d", videoQuality);
+    logger.d("options: %s", videoQualityOptions);
+    if(videoQuality == -1 || !videoQualityOptions.containsKey(prefs.getString(prefKey)))
+      videoQuality = new ArrayList<>(videoQualityOptions.keySet()).indexOf(chromecast ? VoiceControlForPlexApplication.chromecastVideoQualityDefault : VoiceControlForPlexApplication.localVideoQualityDefault);
     LinearLayout.LayoutParams layoutParams = new RadioGroup.LayoutParams(
             RadioGroup.LayoutParams.WRAP_CONTENT,
             RadioGroup.LayoutParams.WRAP_CONTENT);
@@ -2480,7 +2482,12 @@ private void showVideoOptions(final boolean chromecast, final boolean local) {
       public void onCheckedChanged(RadioGroup group, int checkedId) {
         logger.d("Checked %s", items[checkedId]);
         prefs.put(prefKey, (String)items[checkedId]);
-        dialog.dismiss();
+        handler.postDelayed(new Runnable() {
+          @Override
+          public void run() {
+            dialog.dismiss();
+          }
+        }, 500);
       }
     });
     dialog.show();