Skip to content

Commit 76e2a27

Browse files
committed
Add static constant UNKNOWN_BITRATE in AudioStream and use it in stream extractors
1 parent 629d750 commit 76e2a27

4 files changed

Lines changed: 13 additions & 7 deletions

File tree

extractor/src/main/java/org/schabi/newpipe/extractor/services/media_ccc/extractors/MediaCCCLiveStreamExtractor.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@
2020
import java.util.List;
2121
import java.util.Locale;
2222

23+
import static org.schabi.newpipe.extractor.stream.AudioStream.UNKNOWN_BITRATE;
24+
2325
public class MediaCCCLiveStreamExtractor extends StreamExtractor {
2426
private JsonArray doc = null;
2527
private JsonObject conference = null;
@@ -188,7 +190,7 @@ public List<AudioStream> getAudioStreams() throws IOException, ExtractionExcepti
188190
for (final String type : stream.getObject("urls").keySet()) {
189191
final JsonObject url = stream.getObject("urls").getObject(type);
190192
audioStreams.add(new AudioStream(url.getString("tech"), url.getString("url"),
191-
MediaFormat.getFromSuffix(type), -1));
193+
MediaFormat.getFromSuffix(type), UNKNOWN_BITRATE));
192194
}
193195
}
194196
}

extractor/src/main/java/org/schabi/newpipe/extractor/services/media_ccc/extractors/MediaCCCStreamExtractor.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@
2626
import java.util.List;
2727
import java.util.Locale;
2828

29+
import static org.schabi.newpipe.extractor.stream.AudioStream.UNKNOWN_BITRATE;
30+
2931
public class MediaCCCStreamExtractor extends StreamExtractor {
3032
private JsonObject data;
3133
private JsonObject conferenceData;
@@ -163,7 +165,7 @@ public List<AudioStream> getAudioStreams() throws ExtractionException {
163165
}
164166

165167
audioStreams.add(new AudioStream(recording.getString("filename"),
166-
recording.getString("recording_url"), mediaFormat, -1));
168+
recording.getString("recording_url"), mediaFormat, UNKNOWN_BITRATE));
167169
}
168170
}
169171
return audioStreams;

extractor/src/main/java/org/schabi/newpipe/extractor/services/peertube/extractors/PeertubeStreamExtractor.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
import java.util.List;
3333
import java.util.Locale;
3434

35+
import static org.schabi.newpipe.extractor.stream.AudioStream.UNKNOWN_BITRATE;
3536
import static org.schabi.newpipe.extractor.utils.Utils.*;
3637

3738
public class PeertubeStreamExtractor extends StreamExtractor {
@@ -262,14 +263,14 @@ private List<AudioStream> getAudioStreamsFromArray(final JsonArray streams,
262263
true,
263264
format,
264265
DeliveryMethod.PROGRESSIVE_HTTP,
265-
-1));
266+
UNKNOWN_BITRATE));
266267
audioStreams.add(new AudioStream(
267268
id + "-" + idSuffix + "-" + DeliveryMethod.TORRENT,
268269
torrentUrl,
269270
true,
270271
format,
271272
DeliveryMethod.TORRENT,
272-
-1));
273+
UNKNOWN_BITRATE));
273274
if (!isNullOrEmpty(playlistUrl)) {
274275
final String hlsStreamUrl = playlistUrl.replace("master",
275276
JsonUtils.getNumber(stream, "resolution.id").toString());
@@ -279,7 +280,7 @@ private List<AudioStream> getAudioStreamsFromArray(final JsonArray streams,
279280
true,
280281
format,
281282
DeliveryMethod.HLS,
282-
-1));
283+
UNKNOWN_BITRATE));
283284
}
284285
}
285286
return audioStreams;

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,9 @@
2727
import javax.annotation.Nullable;
2828

2929
public class AudioStream extends Stream {
30-
public final int averageBitrate;
30+
public static final int UNKNOWN_BITRATE = -1;
3131

32+
private final int averageBitrate;
3233
// Fields for Dash
3334
private int itag;
3435
private int bitrate;
@@ -111,7 +112,7 @@ public boolean equalStats(final Stream cmp) {
111112

112113
/**
113114
* Get the average bitrate.
114-
* @return the average bitrate
115+
* @return the average bitrate or {@link #UNKNOWN_BITRATE} if it is unknown
115116
*/
116117
public int getAverageBitrate() {
117118
return averageBitrate;

0 commit comments

Comments
 (0)