Reworked VideoQualityData

Author: litetex

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

@@ -199,10 +199,9 @@ public List<VideoAudioStream> getVideoStreams() throws IOException, ExtractionEx
                             deliveryData,
                             // TODO: This looks wrong
                             new VideoAudioFormatRegistry().getFromSuffix(dto.getUrlKey()),
-                            new VideoQualityData(
+                            VideoQualityData.fromHeightWidth(
                                     /*height=*/videoSize.getInt(1, VideoQualityData.UNKNOWN),
-                                    /*width=*/videoSize.getInt(0, VideoQualityData.UNKNOWN),
-                                    VideoQualityData.UNKNOWN)
+                                    /*width=*/videoSize.getInt(0, VideoQualityData.UNKNOWN))
                     );
                 })
                 .collect(Collectors.toList());

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

@@ -113,11 +113,9 @@ public List<VideoAudioStream> getVideoStreams() throws ExtractionException {
                         null,
                         AudioStream.UNKNOWN_BITRATE,
                         new VideoAudioFormatRegistry().getFromMimeType(o.getString("mime_type")),
-                        new VideoQualityData(
+                        VideoQualityData.fromHeightWidth(
                                 o.getInt("height", VideoQualityData.UNKNOWN),
-                                o.getInt("width", VideoQualityData.UNKNOWN),
-                                VideoQualityData.UNKNOWN
-                        )
+                                o.getInt("width", VideoQualityData.UNKNOWN))
                 ))
                 .collect(Collectors.toList());
     }

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

@@ -518,7 +518,7 @@ private void addStreamsFromArray(
                                         dd,
                                         new VideoAudioFormatRegistry()
                                                 .getFromSuffix(getExtensionFromStream(s)),
-                                        new VideoQualityData(
+                                        VideoQualityData.fromHeightFps(
                                                 resJson.getInt("id", VideoQualityData.UNKNOWN),
                                                 stream.getInt("fps", VideoQualityData.UNKNOWN))
                                 )

extractor/src/main/java/org/schabi/newpipe/extractor/streamdata/stream/quality/VideoQualityData.java

@@ -13,18 +13,6 @@ public VideoQualityData(final int height, final int width, final int fps) {
         this.fps = fps;
     }
 
-    public VideoQualityData(final int height, final int fps) {
-        this(height, UNKNOWN, fps);
-    }
-
-    public VideoQualityData(final int height) {
-        this(height, UNKNOWN);
-    }
-
-    public VideoQualityData() {
-        this(UNKNOWN);
-    }
-
 
     public int height() {
         return height;
@@ -43,4 +31,20 @@ public boolean equalsVideoQualityData(final VideoQualityData other) {
                 && width() == other.width()
                 && fps() == other.fps();
     }
+
+    public static VideoQualityData fromHeightWidth(final int height, final int width) {
+        return new VideoQualityData(height, width, UNKNOWN);
+    }
+
+    public static VideoQualityData fromHeightFps(final int height, final int fps) {
+        return new VideoQualityData(height, UNKNOWN, fps);
+    }
+
+    public static VideoQualityData fromHeight(final int height) {
+        return new VideoQualityData(height, UNKNOWN, UNKNOWN);
+    }
+
+    public static VideoQualityData fromUnknown() {
+        return new VideoQualityData(UNKNOWN, UNKNOWN, UNKNOWN);
+    }
 }

extractor/src/main/java/org/schabi/newpipe/extractor/streamdata/stream/simpleimpl/SimpleVideoAudioStreamImpl.java

@@ -47,7 +47,7 @@ public SimpleVideoAudioStreamImpl(
             @Nonnull final DeliveryData deliveryData,
             @Nullable final VideoAudioMediaFormat videoAudioMediaFormat
     ) {
-        this(deliveryData, videoAudioMediaFormat, new VideoQualityData());
+        this(deliveryData, videoAudioMediaFormat, VideoQualityData.fromUnknown());
     }
 
     @Nullable

extractor/src/main/java/org/schabi/newpipe/extractor/streamdata/stream/simpleimpl/SimpleVideoStreamImpl.java

@@ -34,7 +34,7 @@ public SimpleVideoStreamImpl(
     }
 
     public SimpleVideoStreamImpl(@Nonnull final DeliveryData deliveryData) {
-        this(deliveryData, new VideoQualityData());
+        this(deliveryData, VideoQualityData.fromUnknown());
     }
 
     @Nullable