Merge pull request #550 from FireMasterK/add-more-data

Add more data.

Author: B0pol

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

@@ -163,6 +163,7 @@ public MediaFormat getMediaFormat() {
     private int initEnd;
     private int indexStart;
     private int indexEnd;
+    private String quality;
     private String codec;
 
     public int getBitrate() {
@@ -221,6 +222,14 @@ public void setIndexEnd(int indexEnd) {
         this.indexEnd = indexEnd;
     }
 
+    public String getQuality() {
+        return quality;
+    }
+
+    public void setQuality(String quality) {
+        this.quality = quality;
+    }
+
     public String getCodec() {
         return codec;
     }

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

@@ -970,6 +970,7 @@ private Map<String, ItagItem> getItags(final String streamingDataKey,
                         itagItem.setIndexStart(Integer.parseInt(indexRange.getString("start", "-1")));
                         itagItem.setIndexEnd(Integer.parseInt(indexRange.getString("end", "-1")));
                         itagItem.fps = formatData.getInt("fps");
+                        itagItem.setQuality(formatData.getString("quality"));
                         itagItem.setCodec(codec);
 
                         urlAndItags.put(streamUrl, itagItem);

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

@@ -27,11 +27,13 @@ public class AudioStream extends Stream {
     public int average_bitrate = -1;
 
     // Fields for Dash
+    private int itag;
     private int bitrate;
     private int initStart;
     private int initEnd;
     private int indexStart;
     private int indexEnd;
+    private String quality;
     private String codec;
 
     /**
@@ -52,6 +54,8 @@ public AudioStream(String url, MediaFormat format, int averageBitrate) {
      */
     public AudioStream(String url, ItagItem itag) {
         this(url, itag.getMediaFormat(), itag.avgBitrate);
+        this.itag = itag.id;
+        this.quality = itag.getQuality();
         this.bitrate = itag.getBitrate();
         this.initStart = itag.getInitStart();
         this.initEnd = itag.getInitEnd();
@@ -74,6 +78,10 @@ public int getAverageBitrate() {
         return average_bitrate;
     }
 
+    public int getItag() {
+        return itag;
+    }
+
     public int getBitrate() {
         return bitrate;
     }
@@ -94,6 +102,10 @@ public int getIndexEnd() {
         return indexEnd;
     }
 
+    public String getQuality() {
+        return quality;
+    }
+
     public String getCodec() {
         return codec;
     }

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

@@ -28,6 +28,7 @@ public class VideoStream extends Stream {
     public final boolean isVideoOnly;
 
     // Fields for Dash
+    private int itag;
     private int bitrate;
     private int initStart;
     private int initEnd;
@@ -36,6 +37,7 @@ public class VideoStream extends Stream {
     private int width;
     private int height;
     private int fps;
+    private String quality;
     private String codec;
 
     public VideoStream(String url, MediaFormat format, String resolution) {
@@ -48,6 +50,7 @@ public VideoStream(String url, MediaFormat format, String resolution, boolean is
 
     public VideoStream(String url, boolean isVideoOnly, ItagItem itag) {
         this(url, itag.getMediaFormat(), itag.resolutionString, isVideoOnly);
+        this.itag = itag.id;
         this.bitrate = itag.getBitrate();
         this.initStart = itag.getInitStart();
         this.initEnd = itag.getInitEnd();
@@ -56,6 +59,7 @@ public VideoStream(String url, boolean isVideoOnly, ItagItem itag) {
         this.codec = itag.getCodec();
         this.height = itag.getHeight();
         this.width = itag.getWidth();
+        this.quality = itag.getQuality();
         this.fps = itag.fps;
     }
 
@@ -96,6 +100,10 @@ public boolean isVideoOnly() {
         return isVideoOnly;
     }
 
+    public int getItag() {
+        return itag;
+    }
+
     public int getBitrate() {
         return bitrate;
     }
@@ -128,6 +136,10 @@ public int getFps() {
         return fps;
     }
 
+    public String getQuality() {
+        return quality;
+    }
+
     public String getCodec() {
         return codec;
     }