moparisthebest
/
filebot
mirror of https://github.com/mitb-archive/filebot
1
0
Fork 0
Code Issues Releases Wiki Activity

Factor in video resolution as well as bitrate

This commit is contained in:
Reinhard Pointner 2019-03-15 13:35:14 +07:00
parent 53f23c8acf
commit 45528ef212
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/net/filebot/media/VideoQuality.java
View File

@ -21,7 +21,7 @@ public class VideoQuality implements Comparator<File> {
return DESCENDING_ORDER.compare(f1, f2) < 0;
}
private final Comparator<File> chain = comparingInt(this::getRepack).thenComparingInt(this::getResolution).thenComparingLong(File::length);
private final Comparator<File> chain = comparingInt(this::getRepack).thenComparingDouble(this::getScore).thenComparingLong(File::length);
@Override
public int compare(File f1, File f2) {
@ -34,15 +34,15 @@ public class VideoQuality implements Comparator<File> {
return find(f.getName(), repack) ? 1 : 0;
}
private int getResolution(File f) {
private double getScore(File f) {
// use primary video file when checking video resolution of subtitle files or disk folders
f = new MediaBindingBean(f, f).getInferredMediaFile();
if (VIDEO_FILES.accept(f) && f.length() > ONE_MEGABYTE) {
try (MediaCharacteristics mi = MediaCharacteristicsParser.DEFAULT.open(f)) {
return mi.getWidth() * mi.getHeight();
return mi.getWidth() * mi.getHeight() * mi.getBitRate();
} catch (Exception e) {
debug.warning(message("Failed to read video resolution", e.getMessage()));
debug.warning(message("Failed to read video resolution or bitrate", e));
}
}