Skip to content

Commit 817ca5c

Browse files
yuliskovyuliskov
committed
Video presets: move av01 to the top
1 parent 24105ad commit 817ca5c

File tree

2 files changed

+27
-27
lines changed

2 files changed

+27
-27
lines changed

‎common/src/main/java/com/liskovsoft/smartyoutubetv2/common/app/presenters/ChannelUploadsPresenter.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,7 @@ private MediaGroup findPlaylistRow(MediaItemMetadata mediaItemMetadata) {
324324

325325
for (MediaGroup group : mediaItemMetadata.getSuggestions()) {
326326
List<MediaItem> mediaItems = group.getMediaItems();
327-
if (mediaItems != null && mediaItems.size() > 0) {
327+
if (mediaItems != null && !mediaItems.isEmpty()) {
328328
return group;
329329
}
330330
}

‎common/src/main/java/com/liskovsoft/smartyoutubetv2/common/misc/AppDataSourceManager.java‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -81,66 +81,66 @@ public List<SettingsItem> getSettingItems(Context context) {
8181

8282
public VideoPreset[] getVideoPresets() {
8383
VideoPreset[] presets = {
84-
new VideoPreset("144p 30fps av01", "256,144,30,av01"),
8584
new VideoPreset("144p 30fps avc", "256,144,30,avc"),
8685
new VideoPreset("144p 30fps vp9", "256,144,30,vp9"),
87-
new VideoPreset("240p 30fps av01", "320,240,30,av01"),
86+
new VideoPreset("144p 30fps av01", "256,144,30,av01"),
8887
new VideoPreset("240p 30fps avc", "320,240,30,avc"),
8988
new VideoPreset("240p 30fps vp9", "320,240,30,vp9"),
90-
new VideoPreset("360p 30fps av01", "640,360,30,av01"),
89+
new VideoPreset("240p 30fps av01", "320,240,30,av01"),
9190
new VideoPreset("360p 30fps avc", "640,360,30,avc"),
9291
new VideoPreset("360p 30fps vp9", "640,360,30,vp9"),
93-
new VideoPreset("360p 60fps av01", "640,360,60,av01"),
92+
new VideoPreset("360p 30fps av01", "640,360,30,av01"),
9493
new VideoPreset("360p 60fps avc", "640,360,60,avc"),
9594
new VideoPreset("360p 60fps vp9", "640,360,60,vp9"),
96-
new VideoPreset("480p 30fps av01", "854,480,30,av01"),
95+
new VideoPreset("360p 60fps av01", "640,360,60,av01"),
9796
new VideoPreset("480p 30fps avc", "854,480,30,avc"),
9897
new VideoPreset("480p 30fps vp9", "854,480,30,vp9"),
99-
new VideoPreset("480p 60fps av01", "854,480,60,av01"),
98+
new VideoPreset("480p 30fps av01", "854,480,30,av01"),
10099
new VideoPreset("480p 60fps avc", "854,480,60,avc"),
101100
new VideoPreset("480p 60fps vp9", "854,480,60,vp9"),
102-
new VideoPreset("720p 30fps av01", "1280,720,30,av01"),
103-
new VideoPreset("720p 60fps av01", "1280,720,60,av01"),
104-
new VideoPreset("720p 30fps av01+hdr", "1280,720,30,av01.hdr"),
105-
new VideoPreset("720p 60fps av01+hdr", "1280,720,60,av01.hdr"),
101+
new VideoPreset("480p 60fps av01", "854,480,60,av01"),
106102
new VideoPreset("720p 30fps avc", "1280,720,30,avc"),
107103
new VideoPreset("720p 60fps avc", "1280,720,60,avc"),
108104
new VideoPreset("720p 30fps vp9", "1280,720,30,vp9"),
109105
new VideoPreset("720p 60fps vp9", "1280,720,60,vp9"),
110-
new VideoPreset("1080p 30fps av01", "1920,1080,30,av01"),
111-
new VideoPreset("1080p 60fps av01", "1920,1080,60,av01"),
112-
new VideoPreset("1080p 30fps av01+hdr", "1920,1080,30,av01.hdr"),
113-
new VideoPreset("1080p 60fps av01+hdr", "1920,1080,60,av01.hdr"),
106+
new VideoPreset("720p 30fps av01", "1280,720,30,av01"),
107+
new VideoPreset("720p 60fps av01", "1280,720,60,av01"),
108+
new VideoPreset("720p 30fps av01+hdr", "1280,720,30,av01.hdr"),
109+
new VideoPreset("720p 60fps av01+hdr", "1280,720,60,av01.hdr"),
114110
new VideoPreset("1080p 30fps avc", "1920,1080,30,avc"),
115111
new VideoPreset("1080p 60fps avc", "1920,1080,60,avc"),
116112
new VideoPreset("1080p 30fps vp9", "1920,1080,30,vp9"),
117113
new VideoPreset("1080p 60fps vp9", "1920,1080,60,vp9"),
118114
new VideoPreset("1080p 30fps vp9+hdr", "1920,1080,30,vp9.2"),
119115
new VideoPreset("1080p 60fps vp9+hdr", "1920,1080,60,vp9.2"),
120-
new VideoPreset("(2K) 1440p 30fps av01", "2560,1440,30,av01"),
121-
new VideoPreset("(2K) 1440p 60fps av01", "2560,1440,60,av01"),
122-
new VideoPreset("(2K) 1440p 30fps av01+hdr", "2560,1440,30,av01.hdr"),
123-
new VideoPreset("(2K) 1440p 60fps av01+hdr", "2560,1440,60,av01.hdr"),
116+
new VideoPreset("1080p 30fps av01", "1920,1080,30,av01"),
117+
new VideoPreset("1080p 60fps av01", "1920,1080,60,av01"),
118+
new VideoPreset("1080p 30fps av01+hdr", "1920,1080,30,av01.hdr"),
119+
new VideoPreset("1080p 60fps av01+hdr", "1920,1080,60,av01.hdr"),
124120
new VideoPreset("(2K) 1440p 30fps vp9", "2560,1440,30,vp9"),
125121
new VideoPreset("(2K) 1440p 60fps vp9", "2560,1440,60,vp9"),
126122
new VideoPreset("(2K) 1440p 30fps vp9+hdr", "2560,1440,30,vp9.2"),
127123
new VideoPreset("(2K) 1440p 60fps vp9+hdr", "2560,1440,60,vp9.2"),
128-
new VideoPreset("(4K) 2160p 30fps av01", "3840,2160,30,av01"),
129-
new VideoPreset("(4K) 2160p 60fps av01", "3840,2160,60,av01"),
130-
new VideoPreset("(4K) 2160p 30fps av01+hdr", "3840,2160,30,av01.hdr"),
131-
new VideoPreset("(4K) 2160p 60fps av01+hdr", "3840,2160,60,av01.hdr"),
124+
new VideoPreset("(2K) 1440p 30fps av01", "2560,1440,30,av01"),
125+
new VideoPreset("(2K) 1440p 60fps av01", "2560,1440,60,av01"),
126+
new VideoPreset("(2K) 1440p 30fps av01+hdr", "2560,1440,30,av01.hdr"),
127+
new VideoPreset("(2K) 1440p 60fps av01+hdr", "2560,1440,60,av01.hdr"),
132128
new VideoPreset("(4K) 2160p 30fps vp9", "3840,2160,30,vp9"),
133129
new VideoPreset("(4K) 2160p 60fps vp9", "3840,2160,60,vp9"),
134130
new VideoPreset("(4K) 2160p 30fps vp9+hdr", "3840,2160,30,vp9.2"),
135131
new VideoPreset("(4K) 2160p 60fps vp9+hdr", "3840,2160,60,vp9.2"),
136-
new VideoPreset("(8K) 4320p 30fps av01", "7680,4320,30,av01"),
137-
new VideoPreset("(8K) 4320p 60fps av01", "7680,4320,60,av01"),
138-
new VideoPreset("(8K) 4320p 30fps av01+hdr", "7680,4320,30,av01.hdr"),
139-
new VideoPreset("(8K) 4320p 60fps av01+hdr", "7680,4320,60,av01.hdr"),
132+
new VideoPreset("(4K) 2160p 30fps av01", "3840,2160,30,av01"),
133+
new VideoPreset("(4K) 2160p 60fps av01", "3840,2160,60,av01"),
134+
new VideoPreset("(4K) 2160p 30fps av01+hdr", "3840,2160,30,av01.hdr"),
135+
new VideoPreset("(4K) 2160p 60fps av01+hdr", "3840,2160,60,av01.hdr"),
140136
new VideoPreset("(8K) 4320p 30fps vp9", "7680,4320,30,vp9"),
141137
new VideoPreset("(8K) 4320p 60fps vp9", "7680,4320,60,vp9"),
142138
new VideoPreset("(8K) 4320p 30fps vp9+hdr", "7680,4320,30,vp9.2"),
143139
new VideoPreset("(8K) 4320p 60fps vp9+hdr", "7680,4320,60,vp9.2"),
140+
new VideoPreset("(8K) 4320p 30fps av01", "7680,4320,30,av01"),
141+
new VideoPreset("(8K) 4320p 60fps av01", "7680,4320,60,av01"),
142+
new VideoPreset("(8K) 4320p 30fps av01+hdr", "7680,4320,30,av01.hdr"),
143+
new VideoPreset("(8K) 4320p 60fps av01+hdr", "7680,4320,60,av01.hdr"),
144144
//new VideoPreset("Adaptive", null)
145145
};
146146

0 commit comments

Comments
 (0)
⚡