Skip to content

SDK / exoplayer

Go to a project
Commit 42f2e144 by samrobinson Committed by Rohit Singh
Options

Don't include case statement if it falls through to default. 

PiperOrigin-RevId: 461888238
parent 5533ad17
Inline Side-by-side
Showing with 0 additions and 221 deletions
library/transformer/src/main/java/com/google/android/exoplayer2/transformer/DeviceMappedEncoderBitrateProvider.java
...@@ -49,8 +49,6 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide ...@@ -49,8 +49,6 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide
return 0.245; return 0.245;
case "SM-G935F": case "SM-G935F":
return 0.2625; return 0.2625;
case "SM-G570M":
case "SM-J710MN":
default: default:
return 0.37188; return 0.37188;
} }
...@@ -65,7 +63,6 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide ...@@ -65,7 +63,6 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide
switch (resolution) { switch (resolution) {
case "1920x1080": case "1920x1080":
return 0.1225; return 0.1225;
case "1280x720":
default: default:
return 0.315; return 0.315;
} }
...@@ -79,13 +76,11 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide ...@@ -79,13 +76,11 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide
switch (framerate) { switch (framerate) {
case 60: case 60:
return 0.14; return 0.14;
case 30:
default: default:
return 0.175; return 0.175;
} }
case "3840x2160": case "3840x2160":
return 0.0914; return 0.0914;
case "1280x720":
default: default:
return 0.2975; return 0.2975;
} }
...@@ -95,15 +90,12 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide ...@@ -95,15 +90,12 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide
switch (framerate) { switch (framerate) {
case 30: case 30:
return 0.1575; return 0.1575;
case 60:
default: default:
return 0.175; return 0.175;
} }
case "1280x720":
default: default:
return 0.35; return 0.35;
} }
case "SM-A750GN":
default: default:
return 0.35; return 0.35;
} }
...@@ -117,13 +109,7 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide ...@@ -117,13 +109,7 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide
case "640x480": case "640x480":
return 0.41563; return 0.41563;
case "1920x1080": case "1920x1080":
switch (framerate) {
case 30:
case 60:
default:
return 0.4375; return 0.4375;
}
case "1280x720":
default: default:
return 0.525; return 0.525;
} }
...@@ -135,11 +121,9 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide ...@@ -135,11 +121,9 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide
switch (framerate) { switch (framerate) {
case 60: case 60:
return 0.28; return 0.28;
case 30:
default: default:
return 0.315; return 0.315;
} }
case "1280x720":
default: default:
return 0.56875; return 0.56875;
} }
...@@ -154,7 +138,6 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide ...@@ -154,7 +138,6 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide
return 0.41563; return 0.41563;
case "1920x1080": case "1920x1080":
return 0.35; return 0.35;
case "1280x720":
default: default:
return 0.7; return 0.7;
} }
...@@ -166,11 +149,9 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide ...@@ -166,11 +149,9 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide
switch (framerate) { switch (framerate) {
case 60: case 60:
return 0.175; return 0.175;
case 30:
default: default:
return 0.21; return 0.21;
} }
case "640x480":
default: default:
return 0.245; return 0.245;
} }
...@@ -182,7 +163,6 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide ...@@ -182,7 +163,6 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide
return 0.21; return 0.21;
case "1920x1080": case "1920x1080":
return 0.11375; return 0.11375;
case "1280x720":
default: default:
return 0.39375; return 0.39375;
} }
...@@ -194,7 +174,6 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide ...@@ -194,7 +174,6 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide
return 0.175; return 0.175;
case "3840x2160": case "3840x2160":
return 0.08269; return 0.08269;
case "1280x720":
default: default:
return 0.39375; return 0.39375;
} }
...@@ -209,11 +188,9 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide ...@@ -209,11 +188,9 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide
switch (framerate) { switch (framerate) {
case 60: case 60:
return 0.175; return 0.175;
case 30:
default: default:
return 0.1925; return 0.1925;
} }
case "1280x720":
default: default:
return 0.39375; return 0.39375;
} }
...@@ -232,7 +209,6 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide ...@@ -232,7 +209,6 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide
switch (framerate) { switch (framerate) {
case 30: case 30:
return 1.05; return 1.05;
case 60:
default: default:
return 1.4; return 1.4;
} }
...@@ -243,7 +219,6 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide ...@@ -243,7 +219,6 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide
switch (resolution) { switch (resolution) {
case "1280x720": case "1280x720":
return 0.4375; return 0.4375;
case "1920x1080":
default: default:
return 0.7; return 0.7;
} }
...@@ -262,12 +237,6 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide ...@@ -262,12 +237,6 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide
case "SM-A515U1": case "SM-A515U1":
case "SM-M315F": case "SM-M315F":
return 0.1925; return 0.1925;
case "SM-A102U1":
case "SM-A105F":
case "SM-A202F":
case "SM-A205F":
case "SM-A307GN":
case "SM-A405FN":
default: default:
return 0.37188; return 0.37188;
} }
...@@ -282,11 +251,9 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide ...@@ -282,11 +251,9 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide
switch (deviceModel) { switch (deviceModel) {
case "SM-G965N": case "SM-G965N":
return 0.0525; return 0.0525;
case "SM-G950F":
default: default:
return 0.07; return 0.07;
} }
case 26:
default: default:
return 0.07; return 0.07;
} }
...@@ -301,13 +268,11 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide ...@@ -301,13 +268,11 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide
switch (framerate) { switch (framerate) {
case 60: case 60:
return 0.1925; return 0.1925;
case 30:
default: default:
return 0.2625; return 0.2625;
} }
case "3840x2160": case "3840x2160":
return 0.23208; return 0.23208;
case "640x480":
default: default:
return 0.28; return 0.28;
} }
...@@ -333,12 +298,7 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide ...@@ -333,12 +298,7 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide
case "1280x720": case "1280x720":
return 0.39375; return 0.39375;
case "1920x1080": case "1920x1080":
switch (framerate) {
case 30:
case 60:
default:
return 0.525; return 0.525;
}
default: default:
return 0.525; return 0.525;
} }
...@@ -349,7 +309,6 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide ...@@ -349,7 +309,6 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide
switch (deviceModel) { switch (deviceModel) {
case "Moto C": case "Moto C":
return 0.2625; return 0.2625;
case "LG-M250":
default: default:
return 0.28; return 0.28;
} }
...@@ -361,7 +320,6 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide ...@@ -361,7 +320,6 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide
switch (resolution) { switch (resolution) {
case "640x480": case "640x480":
return 0.28; return 0.28;
case "1280x720":
default: default:
return 0.4375; return 0.4375;
} }
...@@ -369,7 +327,6 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide ...@@ -369,7 +327,6 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide
switch (resolution) { switch (resolution) {
case "1280x720": case "1280x720":
return 0.21; return 0.21;
case "640x480":
default: default:
return 0.2975; return 0.2975;
} }
...@@ -379,11 +336,9 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide ...@@ -379,11 +336,9 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide
switch (framerate) { switch (framerate) {
case 60: case 60:
return 0.14875; return 0.14875;
case 30:
default: default:
return 0.175; return 0.175;
} }
case "640x480":
default: default:
return 0.315; return 0.315;
} }
...@@ -391,14 +346,7 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide ...@@ -391,14 +346,7 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide
return 0.4375; return 0.4375;
} }
case 28: case 28:
switch (deviceModel) {
case "CPH2015":
case "CPH2083":
case "RMX1941":
case "Redmi 6A":
default:
return 0.2625; return 0.2625;
}
case 29: case 29:
switch (deviceModel) { switch (deviceModel) {
case "CPH2179": case "CPH2179":
...@@ -416,7 +364,6 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide ...@@ -416,7 +364,6 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide
return 0.35; return 0.35;
case "1280x720": case "1280x720":
return 0.525; return 0.525;
case "1920x1080":
default: default:
return 0.7; return 0.7;
} }
...@@ -441,7 +388,6 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide ...@@ -441,7 +388,6 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide
return 0.35; return 0.35;
case "1280x720": case "1280x720":
return 0.525; return 0.525;
case "1920x1080":
default: default:
return 0.7; return 0.7;
} }
...@@ -458,13 +404,7 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide ...@@ -458,13 +404,7 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide
case "640x480": case "640x480":
return 0.525; return 0.525;
case "1920x1080": case "1920x1080":
switch (framerate) {
case 30:
case 60:
default:
return 0.245; return 0.245;
}
case "1280x720":
default: default:
return 0.56875; return 0.56875;
} }
...@@ -481,11 +421,9 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide ...@@ -481,11 +421,9 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide
switch (framerate) { switch (framerate) {
case 60: case 60:
return 0.13125; return 0.13125;
case 30:
default: default:
return 0.14; return 0.14;
} }
case "640x480":
default: default:
return 0.245; return 0.245;
} }
...@@ -496,7 +434,6 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide ...@@ -496,7 +434,6 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide
switch (deviceModel) { switch (deviceModel) {
case "HMA-L29": case "HMA-L29":
return 0.175; return 0.175;
case "COL-L29":
default: default:
return 0.21; return 0.21;
} }
...@@ -513,7 +450,6 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide ...@@ -513,7 +450,6 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide
return 0.39375; return 0.39375;
case "1920x1080": case "1920x1080":
return 0.35; return 0.35;
case "640x480":
default: default:
return 0.48125; return 0.48125;
} }
...@@ -523,11 +459,9 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide ...@@ -523,11 +459,9 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide
switch (framerate) { switch (framerate) {
case 60: case 60:
return 0.3325; return 0.3325;
case 30:
default: default:
return 0.35; return 0.35;
} }
case "1280x720":
default: default:
return 0.4375; return 0.4375;
} }
...@@ -537,11 +471,9 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide ...@@ -537,11 +471,9 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide
switch (framerate) { switch (framerate) {
case 60: case 60:
return 0.3325; return 0.3325;
case 30:
default: default:
return 0.35; return 0.35;
} }
case "1280x720":
default: default:
return 0.37188; return 0.37188;
} }
...@@ -555,11 +487,9 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide ...@@ -555,11 +487,9 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide
switch (framerate) { switch (framerate) {
case 60: case 60:
return 0.28; return 0.28;
case 30:
default: default:
return 0.35; return 0.35;
} }
case "1280x720":
default: default:
return 0.48125; return 0.48125;
} }
...@@ -571,11 +501,9 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide ...@@ -571,11 +501,9 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide
switch (framerate) { switch (framerate) {
case 30: case 30:
return 0.35; return 0.35;
case 60:
default: default:
return 0.39375; return 0.39375;
} }
case "1280x720":
default: default:
return 0.6125; return 0.6125;
} }
...@@ -587,11 +515,9 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide ...@@ -587,11 +515,9 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide
switch (framerate) { switch (framerate) {
case 60: case 60:
return 0.315; return 0.315;
case 30:
default: default:
return 0.4375; return 0.4375;
} }
case "1280x720":
default: default:
return 0.54688; return 0.54688;
} }
...@@ -610,7 +536,6 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide ...@@ -610,7 +536,6 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide
switch (framerate) { switch (framerate) {
case 30: case 30:
return 0.35; return 0.35;
case 60:
default: default:
return 0.39375; return 0.39375;
} }
...@@ -625,7 +550,6 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide ...@@ -625,7 +550,6 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide
switch (framerate) { switch (framerate) {
case 60: case 60:
return 0.39375; return 0.39375;
case 30:
default: default:
return 0.48125; return 0.48125;
} }
...@@ -649,7 +573,6 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide ...@@ -649,7 +573,6 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide
switch (framerate) { switch (framerate) {
case 30: case 30:
return 0.48125; return 0.48125;
case 60:
default: default:
return 0.525; return 0.525;
} }
...@@ -665,7 +588,6 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide ...@@ -665,7 +588,6 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide
switch (framerate) { switch (framerate) {
case 60: case 60:
return 0.39375; return 0.39375;
case 30:
default: default:
return 0.48125; return 0.48125;
} }
...@@ -682,7 +604,6 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide ...@@ -682,7 +604,6 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide
switch (framerate) { switch (framerate) {
case 60: case 60:
return 0.21; return 0.21;
case 30:
default: default:
return 0.245; return 0.245;
} }
...@@ -700,11 +621,9 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide ...@@ -700,11 +621,9 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide
switch (framerate) { switch (framerate) {
case 30: case 30:
return 0.245; return 0.245;
case 60:
default: default:
return 0.28; return 0.28;
} }
case "1280x720":
default: default:
return 0.28; return 0.28;
} }
...@@ -718,7 +637,6 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide ...@@ -718,7 +637,6 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide
switch (framerate) { switch (framerate) {
case 60: case 60:
return 0.21; return 0.21;
case 30:
default: default:
return 0.245; return 0.245;
} }
...@@ -730,8 +648,6 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide ...@@ -730,8 +648,6 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide
switch (resolution) { switch (resolution) {
case "640x480": case "640x480":
return 0.2275; return 0.2275;
case "1280x720":
case "1920x1080":
default: default:
return 0.28; return 0.28;
} }
...@@ -740,7 +656,6 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide ...@@ -740,7 +656,6 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide
switch (resolution) { switch (resolution) {
case "1920x1080": case "1920x1080":
return 0.21; return 0.21;
case "640x480":
default: default:
return 0.2275; return 0.2275;
} }
...@@ -748,7 +663,6 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide ...@@ -748,7 +663,6 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide
switch (framerate) { switch (framerate) {
case 30: case 30:
return 0.18375; return 0.18375;
case 60:
default: default:
return 0.21; return 0.21;
} }
...@@ -765,21 +679,14 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide ...@@ -765,21 +679,14 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide
switch (framerate) { switch (framerate) {
case 30: case 30:
return 0.245; return 0.245;
case 60:
default: default:
return 0.28; return 0.28;
} }
case "1280x720":
default: default:
return 0.28; return 0.28;
} }
case "MI 5s Plus": case "MI 5s Plus":
switch (resolution) {
case "640x480":
case "1280x720":
default:
return 0.2275; return 0.2275;
}
case "Mi MIX 2": case "Mi MIX 2":
case "ONEPLUS A3003": case "ONEPLUS A3003":
case "SAMSUNG-SM-G930AZ": case "SAMSUNG-SM-G930AZ":
...@@ -788,7 +695,6 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide ...@@ -788,7 +695,6 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide
switch (framerate) { switch (framerate) {
case 60: case 60:
return 0.21; return 0.21;
case 30:
default: default:
return 0.245; return 0.245;
} }
...@@ -800,21 +706,14 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide ...@@ -800,21 +706,14 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide
switch (framerate) { switch (framerate) {
case 60: case 60:
return 0.21; return 0.21;
case 30:
default: default:
return 0.245; return 0.245;
} }
case "1280x720":
default: default:
return 0.28; return 0.28;
} }
case "SAMSUNG-SM-G891A": case "SAMSUNG-SM-G891A":
switch (resolution) {
case "1280x720":
case "1920x1080":
default:
return 0.28; return 0.28;
}
case "SM-A9200": case "SM-A9200":
case "SM-A920F": case "SM-A920F":
switch (resolution) { switch (resolution) {
...@@ -822,11 +721,9 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide ...@@ -822,11 +721,9 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide
switch (framerate) { switch (framerate) {
case 60: case 60:
return 0.21; return 0.21;
case 30:
default: default:
return 0.245; return 0.245;
} }
case "640x480":
default: default:
return 0.28; return 0.28;
} }
...@@ -838,11 +735,9 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide ...@@ -838,11 +735,9 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide
switch (framerate) { switch (framerate) {
case 60: case 60:
return 0.21; return 0.21;
case 30:
default: default:
return 0.245; return 0.245;
} }
case "1280x720":
default: default:
return 0.35; return 0.35;
} }
...@@ -854,11 +749,9 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide ...@@ -854,11 +749,9 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide
switch (framerate) { switch (framerate) {
case 30: case 30:
return 0.245; return 0.245;
case 60:
default: default:
return 0.28; return 0.28;
} }
case "1280x720":
default: default:
return 0.35; return 0.35;
} }
...@@ -870,7 +763,6 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide ...@@ -870,7 +763,6 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide
switch (framerate) { switch (framerate) {
case 60: case 60:
return 0.21; return 0.21;
case 30:
default: default:
return 0.245; return 0.245;
} }
...@@ -880,12 +772,7 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide ...@@ -880,12 +772,7 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide
case "SM-G950U1": case "SM-G950U1":
case "SM-G955U": case "SM-G955U":
case "SM-N950U": case "SM-N950U":
switch (resolution) {
case "640x480":
case "1920x1080":
default:
return 0.21; return 0.21;
}
case "SM-G955U1": case "SM-G955U1":
switch (resolution) { switch (resolution) {
case "640x480": case "640x480":
...@@ -896,7 +783,6 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide ...@@ -896,7 +783,6 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide
switch (framerate) { switch (framerate) {
case 30: case 30:
return 0.245; return 0.245;
case 60:
default: default:
return 0.28; return 0.28;
} }
...@@ -911,13 +797,11 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide ...@@ -911,13 +797,11 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide
switch (framerate) { switch (framerate) {
case 30: case 30:
return 0.18375; return 0.18375;
case 60:
default: default:
return 0.21; return 0.21;
} }
case "3840x2160": case "3840x2160":
return 0.09575; return 0.09575;
case "1280x720":
default: default:
return 0.35; return 0.35;
} }
...@@ -927,11 +811,9 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide ...@@ -927,11 +811,9 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide
switch (framerate) { switch (framerate) {
case 30: case 30:
return 0.18375; return 0.18375;
case 60:
default: default:
return 0.21; return 0.21;
} }
case "640x480":
default: default:
return 0.21; return 0.21;
} }
...@@ -943,13 +825,11 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide ...@@ -943,13 +825,11 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide
switch (framerate) { switch (framerate) {
case 30: case 30:
return 0.18375; return 0.18375;
case 60:
default: default:
return 0.21; return 0.21;
} }
case "3840x2160": case "3840x2160":
return 0.09575; return 0.09575;
case "1280x720":
default: default:
return 0.2275; return 0.2275;
} }
...@@ -959,8 +839,6 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide ...@@ -959,8 +839,6 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide
return 0.2275; return 0.2275;
case "3840x2160": case "3840x2160":
return 0.08704; return 0.08704;
case "1280x720":
case "1920x1080":
default: default:
return 0.28; return 0.28;
} }
...@@ -970,7 +848,6 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide ...@@ -970,7 +848,6 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide
return 0.39375; return 0.39375;
case "1920x1080": case "1920x1080":
return 0.35; return 0.35;
case "1280x720":
default: default:
return 0.48125; return 0.48125;
} }
...@@ -985,11 +862,9 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide ...@@ -985,11 +862,9 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide
switch (framerate) { switch (framerate) {
case 30: case 30:
return 0.28; return 0.28;
case 60:
default: default:
return 0.4375; return 0.4375;
} }
case "1280x720":
default: default:
return 0.45937; return 0.45937;
} }
...@@ -1005,7 +880,6 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide ...@@ -1005,7 +880,6 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide
switch (framerate) { switch (framerate) {
case 30: case 30:
return 0.28; return 0.28;
case 60:
default: default:
return 0.7; return 0.7;
} }
...@@ -1018,13 +892,7 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide ...@@ -1018,13 +892,7 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide
case "640x480": case "640x480":
return 0.39375; return 0.39375;
case "1920x1080": case "1920x1080":
switch (framerate) {
case 30:
case 60:
default:
return 0.35; return 0.35;
}
case "1280x720":
default: default:
return 0.48125; return 0.48125;
} }
...@@ -1032,7 +900,6 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide ...@@ -1032,7 +900,6 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide
switch (resolution) { switch (resolution) {
case "640x480": case "640x480":
return 0.315; return 0.315;
case "1920x1080":
default: default:
return 0.7; return 0.7;
} }
...@@ -1042,17 +909,11 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide ...@@ -1042,17 +909,11 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide
return 0.39375; return 0.39375;
case "1920x1080": case "1920x1080":
return 0.35; return 0.35;
case "1280x720":
default: default:
return 0.48125; return 0.48125;
} }
case "Pixel 2": case "Pixel 2":
switch (resolution) {
case "640x480":
case "1920x1080":
default:
return 0.21; return 0.21;
}
case "Pixel 2 XL": case "Pixel 2 XL":
switch (resolution) { switch (resolution) {
case "640x480": case "640x480":
...@@ -1061,7 +922,6 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide ...@@ -1061,7 +922,6 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide
switch (framerate) { switch (framerate) {
case 60: case 60:
return 0.21; return 0.21;
case 30:
default: default:
return 0.245; return 0.245;
} }
...@@ -1074,13 +934,11 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide ...@@ -1074,13 +934,11 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide
switch (framerate) { switch (framerate) {
case 60: case 60:
return 0.245; return 0.245;
case 30:
default: default:
return 0.28; return 0.28;
} }
case "3840x2160": case "3840x2160":
return 0.17409; return 0.17409;
case "640x480":
default: default:
return 0.315; return 0.315;
} }
...@@ -1088,7 +946,6 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide ...@@ -1088,7 +946,6 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide
switch (framerate) { switch (framerate) {
case 60: case 60:
return 0.245; return 0.245;
case 30:
default: default:
return 0.28; return 0.28;
} }
...@@ -1098,7 +955,6 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide ...@@ -1098,7 +955,6 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide
switch (resolution) { switch (resolution) {
case "1920x1080": case "1920x1080":
return 0.21; return 0.21;
case "640x480":
default: default:
return 0.28; return 0.28;
} }
...@@ -1110,11 +966,9 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide ...@@ -1110,11 +966,9 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide
switch (framerate) { switch (framerate) {
case 30: case 30:
return 0.18375; return 0.18375;
case 60:
default: default:
return 0.21; return 0.21;
} }
case "1280x720":
default: default:
return 0.35; return 0.35;
} }
...@@ -1128,7 +982,6 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide ...@@ -1128,7 +982,6 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide
switch (framerate) { switch (framerate) {
case 30: case 30:
return 0.28; return 0.28;
case 60:
default: default:
return 0.7; return 0.7;
} }
...@@ -1142,7 +995,6 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide ...@@ -1142,7 +995,6 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide
case "640x480": case "640x480":
case "1920x1080": case "1920x1080":
return 0.21; return 0.21;
case "1280x720":
default: default:
return 0.35; return 0.35;
} }
...@@ -1156,7 +1008,6 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide ...@@ -1156,7 +1008,6 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide
switch (resolution) { switch (resolution) {
case "1920x1080": case "1920x1080":
return 0.21; return 0.21;
case "1280x720":
default: default:
return 0.35; return 0.35;
} }
...@@ -1168,7 +1019,6 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide ...@@ -1168,7 +1019,6 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide
switch (framerate) { switch (framerate) {
case 30: case 30:
return 0.245; return 0.245;
case 60:
default: default:
return 0.7; return 0.7;
} }
...@@ -1181,11 +1031,9 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide ...@@ -1181,11 +1031,9 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide
switch (framerate) { switch (framerate) {
case 30: case 30:
return 0.35; return 0.35;
case 60:
default: default:
return 0.525; return 0.525;
} }
case "1280x720":
default: default:
return 0.525; return 0.525;
} }
...@@ -1193,7 +1041,6 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide ...@@ -1193,7 +1041,6 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide
switch (resolution) { switch (resolution) {
case "1920x1080": case "1920x1080":
return 0.35; return 0.35;
case "1280x720":
default: default:
return 0.525; return 0.525;
} }
...@@ -1201,7 +1048,6 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide ...@@ -1201,7 +1048,6 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide
switch (resolution) { switch (resolution) {
case "1920x1080": case "1920x1080":
return 0.35; return 0.35;
case "1280x720":
default: default:
return 0.39375; return 0.39375;
} }
...@@ -1217,7 +1063,6 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide ...@@ -1217,7 +1063,6 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide
switch (framerate) { switch (framerate) {
case 30: case 30:
return 0.245; return 0.245;
case 60:
default: default:
return 0.7; return 0.7;
} }
...@@ -1230,11 +1075,9 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide ...@@ -1230,11 +1075,9 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide
switch (framerate) { switch (framerate) {
case 30: case 30:
return 0.175; return 0.175;
case 60:
default: default:
return 0.21; return 0.21;
} }
case "1280x720":
default: default:
return 0.35; return 0.35;
} }
...@@ -1245,11 +1088,9 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide ...@@ -1245,11 +1088,9 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide
switch (framerate) { switch (framerate) {
case 30: case 30:
return 0.175; return 0.175;
case 60:
default: default:
return 0.21; return 0.21;
} }
case "640x480":
default: default:
return 0.21; return 0.21;
} }
...@@ -1261,7 +1102,6 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide ...@@ -1261,7 +1102,6 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide
switch (framerate) { switch (framerate) {
case 30: case 30:
return 0.245; return 0.245;
case 60:
default: default:
return 0.7; return 0.7;
} }
...@@ -1276,7 +1116,6 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide ...@@ -1276,7 +1116,6 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide
switch (framerate) { switch (framerate) {
case 30: case 30:
return 0.28; return 0.28;
case 60:
default: default:
return 0.7; return 0.7;
} }
...@@ -1292,7 +1131,6 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide ...@@ -1292,7 +1131,6 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide
switch (framerate) { switch (framerate) {
case 30: case 30:
return 0.245; return 0.245;
case 60:
default: default:
return 0.7; return 0.7;
} }
...@@ -1305,7 +1143,6 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide ...@@ -1305,7 +1143,6 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide
switch (framerate) { switch (framerate) {
case 30: case 30:
return 0.175; return 0.175;
case 60:
default: default:
return 0.21; return 0.21;
} }
...@@ -1313,7 +1150,6 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide ...@@ -1313,7 +1150,6 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide
switch (resolution) { switch (resolution) {
case "640x480": case "640x480":
return 0.21; return 0.21;
case "1280x720":
default: default:
return 0.2275; return 0.2275;
} }
...@@ -1322,13 +1158,7 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide ...@@ -1322,13 +1158,7 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide
case "640x480": case "640x480":
return 0.21; return 0.21;
case "1920x1080": case "1920x1080":
switch (framerate) {
case 30:
case 60:
default:
return 0.175; return 0.175;
}
case "1280x720":
default: default:
return 0.35; return 0.35;
} }
...@@ -1338,13 +1168,11 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide ...@@ -1338,13 +1168,11 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide
switch (framerate) { switch (framerate) {
case 30: case 30:
return 0.175; return 0.175;
case 60:
default: default:
return 0.21; return 0.21;
} }
case "3840x2160": case "3840x2160":
return 0.09575; return 0.09575;
case "640x480":
default: default:
return 0.21; return 0.21;
} }
...@@ -1352,7 +1180,6 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide ...@@ -1352,7 +1180,6 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide
switch (framerate) { switch (framerate) {
case 30: case 30:
return 0.245; return 0.245;
case 60:
default: default:
return 0.7; return 0.7;
} }
...@@ -1361,7 +1188,6 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide ...@@ -1361,7 +1188,6 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide
case "640x480": case "640x480":
case "1920x1080": case "1920x1080":
return 0.21; return 0.21;
case "1280x720":
default: default:
return 0.35; return 0.35;
} }
...@@ -1373,7 +1199,6 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide ...@@ -1373,7 +1199,6 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide
switch (framerate) { switch (framerate) {
case 30: case 30:
return 0.28; return 0.28;
case 60:
default: default:
return 0.7; return 0.7;
} }
...@@ -1388,7 +1213,6 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide ...@@ -1388,7 +1213,6 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide
switch (framerate) { switch (framerate) {
case 60: case 60:
return 0.7; return 0.7;
case 30:
default: default:
return 1.05; return 1.05;
} }
...@@ -1405,7 +1229,6 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide ...@@ -1405,7 +1229,6 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide
switch (framerate) { switch (framerate) {
case 30: case 30:
return 0.245; return 0.245;
case 60:
default: default:
return 0.7; return 0.7;
} }
...@@ -1426,11 +1249,9 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide ...@@ -1426,11 +1249,9 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide
switch (framerate) { switch (framerate) {
case 30: case 30:
return 0.18375; return 0.18375;
case 60:
default: default:
return 0.21; return 0.21;
} }
case "1280x720":
default: default:
return 0.35; return 0.35;
} }
...@@ -1442,7 +1263,6 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide ...@@ -1442,7 +1263,6 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide
switch (framerate) { switch (framerate) {
case 30: case 30:
return 0.245; return 0.245;
case 60:
default: default:
return 0.7; return 0.7;
} }
...@@ -1457,7 +1277,6 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide ...@@ -1457,7 +1277,6 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide
switch (framerate) { switch (framerate) {
case 30: case 30:
return 0.28; return 0.28;
case 60:
default: default:
return 0.7; return 0.7;
} }
...@@ -1480,7 +1299,6 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide ...@@ -1480,7 +1299,6 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide
return 0.315; return 0.315;
case "1280x720": case "1280x720":
return 0.48125; return 0.48125;
case "1920x1080":
default: default:
return 0.7; return 0.7;
} }
...@@ -1497,7 +1315,6 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide ...@@ -1497,7 +1315,6 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide
switch (framerate) { switch (framerate) {
case 30: case 30:
return 0.2275; return 0.2275;
case 60:
default: default:
return 0.7; return 0.7;
} }
...@@ -1532,28 +1349,19 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide ...@@ -1532,28 +1349,19 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide
switch (framerate) { switch (framerate) {
case 30: case 30:
return 0.2275; return 0.2275;
case 60:
default: default:
return 0.35; return 0.35;
} }
case "1280x720":
default: default:
return 0.35; return 0.35;
} }
case "SM-N986U": case "SM-N986U":
return 0.1925; return 0.1925;
case "Nokia 1.4":
case "SM-A015M":
default: default:
return 0.35; return 0.35;
} }
case 31: case 31:
switch (deviceModel) {
case "SM-G975U1":
case "SM-N975U1":
default:
return 0.21; return 0.21;
}
case 32: case 32:
switch (resolution) { switch (resolution) {
case "640x480": case "640x480":
...@@ -1562,11 +1370,9 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide ...@@ -1562,11 +1370,9 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide
switch (framerate) { switch (framerate) {
case 30: case 30:
return 0.2275; return 0.2275;
case 60:
default: default:
return 0.35; return 0.35;
} }
case "1280x720":
default: default:
return 0.35; return 0.35;
} }
...@@ -1580,7 +1386,6 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide ...@@ -1580,7 +1386,6 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide
case "F8331": case "F8331":
case "MI 5s": case "MI 5s":
return 0.105; return 0.105;
case "SM-G885S":
default: default:
return 0.1575; return 0.1575;
} }
...@@ -1590,7 +1395,6 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide ...@@ -1590,7 +1395,6 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide
switch (deviceModel) { switch (deviceModel) {
case "Nokia 7.2": case "Nokia 7.2":
return 0.1575; return 0.1575;
case "moto g(7) plus":
default: default:
return 0.35; return 0.35;
} }
...@@ -1604,12 +1408,7 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide ...@@ -1604,12 +1408,7 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide
case "1280x720": case "1280x720":
return 0.245; return 0.245;
case "1920x1080": case "1920x1080":
switch (framerate) {
case 30:
case 60:
default:
return 0.7; return 0.7;
}
default: default:
return 0.7; return 0.7;
} }
...@@ -1622,12 +1421,7 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide ...@@ -1622,12 +1421,7 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide
case "1280x720": case "1280x720":
return 0.245; return 0.245;
case "1920x1080": case "1920x1080":
switch (framerate) {
case 30:
case 60:
default:
return 0.7; return 0.7;
}
default: default:
return 0.7; return 0.7;
} }
...@@ -1636,12 +1430,7 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide ...@@ -1636,12 +1430,7 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide
case "1280x720": case "1280x720":
return 0.245; return 0.245;
case "1920x1080": case "1920x1080":
switch (framerate) {
case 30:
case 60:
default:
return 0.7; return 0.7;
}
default: default:
return 0.7; return 0.7;
} }
...@@ -1663,7 +1452,6 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide ...@@ -1663,7 +1452,6 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide
return 0.21; return 0.21;
case "1280x720": case "1280x720":
return 0.245; return 0.245;
case "1920x1080":
default: default:
return 0.7; return 0.7;
} }
...@@ -1676,7 +1464,6 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide ...@@ -1676,7 +1464,6 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide
switch (framerate) { switch (framerate) {
case 30: case 30:
return 0.21; return 0.21;
case 60:
default: default:
return 1.4; return 1.4;
} }
...@@ -1694,7 +1481,6 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide ...@@ -1694,7 +1481,6 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide
switch (resolution) { switch (resolution) {
case "1280x720": case "1280x720":
return 0.21; return 0.21;
case "1920x1080":
default: default:
return 0.35; return 0.35;
} }
...@@ -1706,7 +1492,6 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide ...@@ -1706,7 +1492,6 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide
return 0.20125; return 0.20125;
case "1280x720": case "1280x720":
return 0.2275; return 0.2275;
case "1920x1080":
default: default:
return 0.28; return 0.28;
} }
...@@ -1718,7 +1503,6 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide ...@@ -1718,7 +1503,6 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide
switch (framerate) { switch (framerate) {
case 30: case 30:
return 0.21; return 0.21;
case 60:
default: default:
return 0.28; return 0.28;
} }
...@@ -1735,7 +1519,6 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide ...@@ -1735,7 +1519,6 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide
switch (framerate) { switch (framerate) {
case 30: case 30:
return 0.245; return 0.245;
case 60:
default: default:
return 0.7; return 0.7;
} }
...@@ -1748,7 +1531,6 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide ...@@ -1748,7 +1531,6 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide
return 0.21; return 0.21;
case "1280x720": case "1280x720":
return 0.2275; return 0.2275;
case "1920x1080":
default: default:
return 0.7; return 0.7;
} }
...@@ -1783,7 +1565,6 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide ...@@ -1783,7 +1565,6 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide
switch (framerate) { switch (framerate) {
case 30: case 30:
return 0.21; return 0.21;
case 60:
default: default:
return 0.28; return 0.28;
} }
...@@ -1809,7 +1590,6 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide ...@@ -1809,7 +1590,6 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide
switch (framerate) { switch (framerate) {
case 30: case 30:
return 0.21; return 0.21;
case 60:
default: default:
return 0.28; return 0.28;
} }
...@@ -1826,7 +1606,6 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide ...@@ -1826,7 +1606,6 @@ public class DeviceMappedEncoderBitrateProvider implements EncoderBitrateProvide
switch (deviceModel) { switch (deviceModel) {
case "Pixel 4": case "Pixel 4":
return 0.0875; return 0.0875;
case "Pixel 3":
default: default:
return 0.105; return 0.105;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment