diff --git a/source/net/filebot/format/MediaBindingBean.java b/source/net/filebot/format/MediaBindingBean.java index b361cef1..055a44b1 100644 --- a/source/net/filebot/format/MediaBindingBean.java +++ b/source/net/filebot/format/MediaBindingBean.java @@ -755,16 +755,6 @@ public class MediaBindingBean { return new Double(getMediaInfo(StreamKind.General, 0, "OverallBitRate")).longValue(); } - @Define("vbr") - public Long getVideoBitRate() { - return new Double(getMediaInfo(StreamKind.Video, 0, "BitRate")).longValue(); - } - - @Define("abr") - public Long getAudioBitRate() { - return new Double(getMediaInfo(StreamKind.Audio, 0, "BitRate")).longValue(); - } - @Define("duration") public Long getDuration() { return new Double(getMediaInfo(StreamKind.General, 0, "Duration")).longValue(); @@ -780,6 +770,11 @@ public class MediaBindingBean { return (int) (getDuration() / 60000); } + @Define("encodedDate") + public String getEncodedDate() { + return getMediaInfo(StreamKind.General, 0, "Encoded_Date"); // e.g. UTC 2014-07-18 13:57:37 + } + @Define("media") public AssociativeScriptObject getGeneralMediaInfo() { return createMediaInfoBindings(StreamKind.General).get(0); diff --git a/source/net/filebot/media/MediaDetection.java b/source/net/filebot/media/MediaDetection.java index e1d49d93..567459b3 100644 --- a/source/net/filebot/media/MediaDetection.java +++ b/source/net/filebot/media/MediaDetection.java @@ -1083,7 +1083,7 @@ public class MediaDetection { } try { - filesByMediaFolder.stream().collect(groupingBy(new VideoQuality()::getVideoBitrate)).forEach((vbr, videos) -> { + filesByMediaFolder.stream().collect(groupingBy(new VideoQuality()::getEncodedDate)).forEach((group, videos) -> { groups.add(videos); }); } catch (Exception e) { diff --git a/source/net/filebot/media/VideoQuality.java b/source/net/filebot/media/VideoQuality.java index 2475739a..16da933c 100644 --- a/source/net/filebot/media/VideoQuality.java +++ b/source/net/filebot/media/VideoQuality.java @@ -64,16 +64,10 @@ public class VideoQuality implements Comparator { }).orElseGet(f::length); } - public long getVideoBitrate(File f) { + public String getEncodedDate(File f) { return media(f).map(it -> { - return it.getVideoBitRate(); - }).orElse(0L); - } - - public long getAudioBitrate(File f) { - return media(f).map(it -> { - return it.getAudioBitRate(); - }).orElse(0L); + return it.getEncodedDate(); + }).orElse(null); } }