Add resolution support up to 4k

This commit is contained in:
Mauricio Colli
2017-04-11 21:55:53 -03:00
parent b587d175bb
commit fbb6a039b6
5 changed files with 148 additions and 52 deletions

View File

@@ -4,43 +4,49 @@ import java.io.Serializable;
/**
* Created by Christian Schabesberger on 04.03.16.
*
* <p>
* Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
* VideoStream.java is part of NewPipe.
*
* <p>
* NewPipe is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* <p>
* NewPipe is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* <p>
* You should have received a copy of the GNU General Public License
* along with NewPipe. If not, see <http://www.gnu.org/licenses/>.
*/
public class VideoStream implements Serializable{
public class VideoStream implements Serializable {
//url of the stream
public String url = "";
public int format = -1;
public String resolution = "";
public boolean isVideoOnly = false;
public VideoStream(String url, int format, String res) {
this.url = url; this.format = format; resolution = res;
this(false, url, format, res);
}
// reveals wether two streams are the same, but have diferent urls
public VideoStream(boolean isVideoOnly, String url, int format, String res) {
this.url = url;
this.format = format;
this.resolution = res;
this.isVideoOnly = isVideoOnly;
}
// reveals whether two streams are the same, but have diferent urls
public boolean equalStats(VideoStream cmp) {
return format == cmp.format
&& resolution == cmp.resolution;
return format == cmp.format && resolution.equals(cmp.resolution);
}
// revelas wether two streams are equal
// reveals whether two streams are equal
public boolean equals(VideoStream cmp) {
return cmp != null && equalStats(cmp)
&& url == cmp.url;
return cmp != null && equalStats(cmp) && url.equals(cmp.url);
}
}