Skip to content

Commit f31b2a6

Browse files
committed
use getters/setters.
1 parent d4945ac commit f31b2a6

4 files changed

Lines changed: 95 additions & 34 deletions

File tree

extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/ItagItem.java

Lines changed: 72 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
public class ItagItem {
1010
/**
11-
* List can be found here https://github.com/rg3/youtube-dl/blob/master/youtube_dl/extractor/youtube.py#L360
11+
* List can be found here https://github.com/ytdl-org/youtube-dl/blob/master/youtube_dl/extractor/youtube.py#L1046
1212
*/
1313
private static final ItagItem[] ITAG_LIST = {
1414
/////////////////////////////////////////////////////
@@ -156,13 +156,76 @@ public MediaFormat getMediaFormat() {
156156
public int fps = -1;
157157

158158
// Fields for Dash
159-
public int bitrate;
160-
public int width;
161-
public int height;
162-
public int initStart;
163-
public int initEnd;
164-
public int indexStart;
165-
public int indexEnd;
166-
public String codec;
159+
private int bitrate;
160+
private int width;
161+
private int height;
162+
private int initStart;
163+
private int initEnd;
164+
private int indexStart;
165+
private int indexEnd;
166+
private String codec;
167+
168+
public int getBitrate() {
169+
return bitrate;
170+
}
171+
172+
public void setBitrate(int bitrate) {
173+
this.bitrate = bitrate;
174+
}
175+
176+
public int getWidth() {
177+
return width;
178+
}
179+
180+
public void setWidth(int width) {
181+
this.width = width;
182+
}
183+
184+
public int getHeight() {
185+
return height;
186+
}
187+
188+
public void setHeight(int height) {
189+
this.height = height;
190+
}
191+
192+
public int getInitStart() {
193+
return initStart;
194+
}
195+
196+
public void setInitStart(int initStart) {
197+
this.initStart = initStart;
198+
}
167199

200+
public int getInitEnd() {
201+
return initEnd;
202+
}
203+
204+
public void setInitEnd(int initEnd) {
205+
this.initEnd = initEnd;
206+
}
207+
208+
public int getIndexStart() {
209+
return indexStart;
210+
}
211+
212+
public void setIndexStart(int indexStart) {
213+
this.indexStart = indexStart;
214+
}
215+
216+
public int getIndexEnd() {
217+
return indexEnd;
218+
}
219+
220+
public void setIndexEnd(int indexEnd) {
221+
this.indexEnd = indexEnd;
222+
}
223+
224+
public String getCodec() {
225+
return codec;
226+
}
227+
228+
public void setCodec(String codec) {
229+
this.codec = codec;
230+
}
168231
}

extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/extractors/YoutubeStreamExtractor.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -954,15 +954,15 @@ private Map<String, ItagItem> getItags(final String streamingDataKey,
954954
String mimeType = formatData.getString("mimeType", EMPTY_STRING);
955955
String codec = mimeType.contains("codecs") ? mimeType.split("\"")[1] : EMPTY_STRING;
956956

957-
itagItem.bitrate = formatData.getInt("bitrate");
958-
itagItem.width = formatData.getInt("width");
959-
itagItem.height = formatData.getInt("height");
960-
itagItem.initStart = Integer.parseInt(initRange.getString("start", "-1"));
961-
itagItem.initEnd = Integer.parseInt(initRange.getString("end", "-1"));
962-
itagItem.indexStart = Integer.parseInt(indexRange.getString("start", "-1"));
963-
itagItem.indexEnd = Integer.parseInt(indexRange.getString("end", "-1"));
957+
itagItem.setBitrate(formatData.getInt("bitrate"));
958+
itagItem.setWidth(formatData.getInt("width"));
959+
itagItem.setHeight(formatData.getInt("height"));
960+
itagItem.setInitStart(Integer.parseInt(initRange.getString("start", "-1")));
961+
itagItem.setInitEnd(Integer.parseInt(initRange.getString("end", "-1")));
962+
itagItem.setIndexStart(Integer.parseInt(indexRange.getString("start", "-1")));
963+
itagItem.setIndexEnd(Integer.parseInt(indexRange.getString("end", "-1")));
964964
itagItem.fps = formatData.getInt("fps");
965-
itagItem.codec = codec;
965+
itagItem.setCodec(codec);
966966

967967
urlAndItags.put(streamUrl, itagItem);
968968
}

extractor/src/main/java/org/schabi/newpipe/extractor/stream/AudioStream.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,12 @@ public AudioStream(String url, MediaFormat format, int averageBitrate) {
5252
*/
5353
public AudioStream(String url, ItagItem itag) {
5454
this(url, itag.getMediaFormat(), itag.avgBitrate);
55-
this.bitrate = itag.bitrate;
56-
this.initStart = itag.initStart;
57-
this.initEnd = itag.initEnd;
58-
this.indexStart = itag.indexStart;
59-
this.indexEnd = itag.indexEnd;
60-
this.codec = itag.codec;
55+
this.bitrate = itag.getBitrate();
56+
this.initStart = itag.getInitStart();
57+
this.initEnd = itag.getInitEnd();
58+
this.indexStart = itag.getIndexStart();
59+
this.indexEnd = itag.getIndexEnd();
60+
this.codec = itag.getCodec();
6161
}
6262

6363
@Override

extractor/src/main/java/org/schabi/newpipe/extractor/stream/VideoStream.java

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -42,21 +42,19 @@ public VideoStream(String url, MediaFormat format, String resolution) {
4242
}
4343

4444
public VideoStream(String url, MediaFormat format, String resolution, boolean isVideoOnly) {
45-
super(url, format);
46-
this.resolution = resolution;
47-
this.isVideoOnly = isVideoOnly;
45+
this(url, null, format, resolution, isVideoOnly);
4846
}
4947

5048
public VideoStream(String url, boolean isVideoOnly, ItagItem itag) {
5149
this(url, itag.getMediaFormat(), itag.resolutionString, isVideoOnly);
52-
this.bitrate = itag.bitrate;
53-
this.initStart = itag.initStart;
54-
this.initEnd = itag.initEnd;
55-
this.indexStart = itag.indexStart;
56-
this.indexEnd = itag.indexEnd;
57-
this.codec = itag.codec;
58-
this.height = itag.height;
59-
this.width = itag.width;
50+
this.bitrate = itag.getBitrate();
51+
this.initStart = itag.getInitStart();
52+
this.initEnd = itag.getInitEnd();
53+
this.indexStart = itag.getIndexStart();
54+
this.indexEnd = itag.getIndexEnd();
55+
this.codec = itag.getCodec();
56+
this.height = itag.getHeight();
57+
this.width = itag.getWidth();
6058
}
6159

6260
public VideoStream(String url, String torrentUrl, MediaFormat format, String resolution) {

0 commit comments

Comments
 (0)