moparisthebest/filebot
1
0
Fork 0
mirror of https://github.com/mitb-archive/filebot synced 2025-03-08 20:39:44 -05:00
Code Issues Releases Wiki Activity

Add MediaCharacteristics.getSubtitleLanguage()

Browse Source
This commit is contained in:
Reinhard Pointner 2019-03-17 12:39:14 +07:00
parent 504bb1132d
commit fd982ab790
3 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source/net/filebot/media/FFProbe.java
View File

@ -69,6 +69,11 @@ public class FFProbe implements MediaCharacteristics {
return getString("subtitle", "codec_name");
}
@Override
public String getSubtitleLanguage() {
return getString("subtitle", "tags", "language");
}
@Override
public Duration getDuration() {
long d = (long) Double.parseDouble(getFormat().get("duration").toString()) * 1000;
@ -133,7 +138,7 @@ public class FFProbe implements MediaCharacteristics {
}
protected String getString(String streamKind, String objectKey, String valueKey) {
return stream(streamKind, objectKey).map(t -> ((Map) t).get(valueKey)).map(Objects::toString).collect(joining(" "));
return stream(streamKind, objectKey).map(t -> ((Map) t).get(valueKey)).map(Objects::toString).collect(joining(" / "));
}
protected Stream<Object> stream(String streamKind, String property) {

2
source/net/filebot/media/MediaCharacteristics.java
View File

@ -13,6 +13,8 @@ public interface MediaCharacteristics extends AutoCloseable {
String getSubtitleCodec();
String getSubtitleLanguage();
Duration getDuration();
Integer getWidth();

13
source/net/filebot/mediainfo/MediaInfo.java
View File

@ -144,22 +144,27 @@ public class MediaInfo implements MediaCharacteristics {
@Override
public String getVideoCodec() {
return get(StreamKind.Video, 0, "CodecID");
return get(StreamKind.General, 0, "Video_Codec_List");
}
@Override
public String getAudioCodec() {
return get(StreamKind.Audio, 0, "CodecID");
return get(StreamKind.General, 0, "Audio_Codec_List");
}
@Override
public String getAudioLanguage() {
return get(StreamKind.General, 0, "AudioLanguageList");
return get(StreamKind.General, 0, "Audio_Language_List");
}
@Override
public String getSubtitleCodec() {
return get(StreamKind.General, 0, "TextCodecList");
return get(StreamKind.General, 0, "Text_Codec_List");
}
@Override
public String getSubtitleLanguage() {
return get(StreamKind.General, 0, "Text_Language_List");
}
@Override