Merge branch 'master' into feature/PLAYER-2265

ooyala · Nov 22, 2017 · 4741bdb · 4741bdb
2 parents 35c2591 + 4ed4c32
commit 4741bdb
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 0 deletions.
diff --git a/skin-schema.json b/skin-schema.json
@@ -108,6 +108,21 @@
       },
       "required": ["defaultLanguage"]
     },
+    "languageDirections": {
+      "ar": "rtl",
+      "dv": "rtl",
+      "he": "rtl",
+      "fa": "rtl",
+      "ks": "rtl",
+      "ku": "rtl",
+      "pa": "rtl",
+      "ps": "rtl",
+      "sd": "rtl",
+      "tk": "rtl",
+      "ug": "rtl",
+      "ur": "rtl",
+      "yi": "rtl"
+    },
     "responsive": {
       "description": "Defines values needed for Responsive Design Rules",
       "properties": {
@@ -674,6 +689,18 @@
               "default": "false"
             }
           }
+        },
+        "qualitySelection":{
+          "description":"Configuration for the control bar quality selection panel/popover",
+          "type":"object",
+          "properties":{
+            "format":{
+              "description":"Determine the format of the quality options. Available formats: bitrate only, resolution only, and resolution + bitrate.",
+              "type":"string",
+              "enum": ["bitrate", "resolution", "resolution bitrate"],
+              "default":"bitrate"
+            }
+          }
         }
       }
     },

diff --git a/skin.json b/skin.json
@@ -41,6 +41,21 @@
       }
     ]
   },
+  "languageDirections": {
+    "ar": "rtl",
+    "dv": "rtl",
+    "he": "rtl",
+    "fa": "rtl",
+    "ks": "rtl",
+    "ku": "rtl",
+    "pa": "rtl",
+    "ps": "rtl",
+    "sd": "rtl",
+    "tk": "rtl",
+    "ug": "rtl",
+    "ur": "rtl",
+    "yi": "rtl"
+  },
   "responsive": {
     "breakpoints": {
       "xs": {"id": "xs", "name": "oo-xsmall", "maxWidth": 559, "multiplier": 0.7},
@@ -194,6 +209,9 @@
     },
     "tooltips":{
       "enabled":false
+    },
+    "qualitySelection":{
+      "format": "bitrate"
     }
   },
   "live": {