sjs/media
1
0
Fork 0
mirror of https://github.com/samsonjs/media.git synced 2026-03-29 10:05:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #857 from IanDBird/dev-truehd

Browse source 
Add support for TrueHD audio codec in WebMExtractor
This commit is contained in:
ojw28 2015-10-12 12:03:31 +01:00
commit 98426a782f
2 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
library/src/main/java/com/google/android/exoplayer/extractor/webm/WebmExtractor.java
View file

@ -78,6 +78,7 @@ public final class WebmExtractor implements Extractor {
private static final String CODEC_ID_DTS = "A_DTS";
private static final String CODEC_ID_DTS_EXPRESS = "A_DTS/EXPRESS";
private static final String CODEC_ID_DTS_LOSSLESS = "A_DTS/LOSSLESS";
private static final String CODEC_ID_TRUEHD = "A_TRUEHD";
private static final String CODEC_ID_SUBRIP = "S_TEXT/UTF8";
private static final int VORBIS_MAX_INPUT_SIZE = 8192;
@ -1043,6 +1044,7 @@ public final class WebmExtractor implements Extractor {
|| CODEC_ID_DTS.equals(codecId)
|| CODEC_ID_DTS_EXPRESS.equals(codecId)
|| CODEC_ID_DTS_LOSSLESS.equals(codecId)
|| CODEC_ID_TRUEHD.equals(codecId)
|| CODEC_ID_SUBRIP.equals(codecId);
}
@ -1206,6 +1208,9 @@ public final class WebmExtractor implements Extractor {
case CODEC_ID_DTS_LOSSLESS:
mimeType = MimeTypes.AUDIO_DTS_HD;
break;
case CODEC_ID_TRUEHD:
mimeType = MimeTypes.AUDIO_TRUEHD;
break;
case CODEC_ID_SUBRIP:
mimeType = MimeTypes.APPLICATION_SUBRIP;
break;

1
library/src/main/java/com/google/android/exoplayer/util/MimeTypes.java
View file

@ -50,6 +50,7 @@ public final class MimeTypes {
public static final String AUDIO_DTS_HD = BASE_TYPE_AUDIO + "/vnd.dts.hd";
public static final String AUDIO_VORBIS = BASE_TYPE_AUDIO + "/vorbis";
public static final String AUDIO_OPUS = BASE_TYPE_AUDIO + "/opus";
public static final String AUDIO_TRUEHD = BASE_TYPE_AUDIO + "/true-hd";
public static final String TEXT_VTT = BASE_TYPE_TEXT + "/vtt";