Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
3d4cf4b474
1 changed files with 5 additions and 5 deletions
|
@ -200,19 +200,19 @@ public class SettingsAudioVideoActivity extends SettingsBaseActivity {
|
|||
|
||||
List<String> qNames = new ArrayList<>();
|
||||
List<Integer> qValues = new ArrayList<>();
|
||||
if (CamcorderProfile.hasProfile(CamcorderProfile.QUALITY_LOW)) {
|
||||
if (Build.VERSION.SDK_INT < 11 || CamcorderProfile.hasProfile(CamcorderProfile.QUALITY_LOW)) {
|
||||
qNames.add(getString(R.string.av_video_quality_low));
|
||||
qValues.add(CamcorderProfile.QUALITY_LOW);
|
||||
}
|
||||
if (CamcorderProfile.hasProfile(CamcorderProfile.QUALITY_480P)) {
|
||||
if (Build.VERSION.SDK_INT >= 11 && CamcorderProfile.hasProfile(CamcorderProfile.QUALITY_480P)) {
|
||||
qNames.add("720 x 480 (480p)");
|
||||
qValues.add(CamcorderProfile.QUALITY_480P);
|
||||
}
|
||||
if (CamcorderProfile.hasProfile(CamcorderProfile.QUALITY_720P)) {
|
||||
if (Build.VERSION.SDK_INT >= 11 && CamcorderProfile.hasProfile(CamcorderProfile.QUALITY_720P)) {
|
||||
qNames.add("1280 x 720 (720p)");
|
||||
qValues.add(CamcorderProfile.QUALITY_720P);
|
||||
}
|
||||
if (CamcorderProfile.hasProfile(CamcorderProfile.QUALITY_1080P)) {
|
||||
if (Build.VERSION.SDK_INT >= 11 && CamcorderProfile.hasProfile(CamcorderProfile.QUALITY_1080P)) {
|
||||
qNames.add("1920 x 1080 (1080p)");
|
||||
qValues.add(CamcorderProfile.QUALITY_1080P);
|
||||
}
|
||||
|
@ -220,7 +220,7 @@ public class SettingsAudioVideoActivity extends SettingsBaseActivity {
|
|||
qNames.add("3840x2160 (2160p)");
|
||||
qValues.add(CamcorderProfile.QUALITY_2160P);
|
||||
}
|
||||
if (CamcorderProfile.hasProfile(CamcorderProfile.QUALITY_HIGH)) {
|
||||
if (Build.VERSION.SDK_INT < 11 || CamcorderProfile.hasProfile(CamcorderProfile.QUALITY_HIGH)) {
|
||||
qNames.add(getString(R.string.av_video_quality_high));
|
||||
qValues.add(CamcorderProfile.QUALITY_HIGH);
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue