Skip to content

SDK / exoplayer

Go to a project
Commit 98426a78 by ojw28
Options

Merge pull request #857 from IanDBird/dev-truehd 

Add support for TrueHD audio codec in WebMExtractor
parents 8c53590b ee8a00b6
Inline Side-by-side
Showing with 6 additions and 0 deletions
library/src/main/java/com/google/android/exoplayer/extractor/webm/WebmExtractor.java
...@@ -78,6 +78,7 @@ public final class WebmExtractor implements Extractor { ...@@ -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 = "A_DTS";
private static final String CODEC_ID_DTS_EXPRESS = "A_DTS/EXPRESS"; 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_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 String CODEC_ID_SUBRIP = "S_TEXT/UTF8";
private static final int VORBIS_MAX_INPUT_SIZE = 8192; private static final int VORBIS_MAX_INPUT_SIZE = 8192;
...@@ -1043,6 +1044,7 @@ public final class WebmExtractor implements Extractor { ...@@ -1043,6 +1044,7 @@ public final class WebmExtractor implements Extractor {
|| CODEC_ID_DTS.equals(codecId) || CODEC_ID_DTS.equals(codecId)
|| CODEC_ID_DTS_EXPRESS.equals(codecId) || CODEC_ID_DTS_EXPRESS.equals(codecId)
|| CODEC_ID_DTS_LOSSLESS.equals(codecId) || CODEC_ID_DTS_LOSSLESS.equals(codecId)
|| CODEC_ID_TRUEHD.equals(codecId)
|| CODEC_ID_SUBRIP.equals(codecId); || CODEC_ID_SUBRIP.equals(codecId);
} }
...@@ -1206,6 +1208,9 @@ public final class WebmExtractor implements Extractor { ...@@ -1206,6 +1208,9 @@ public final class WebmExtractor implements Extractor {
case CODEC_ID_DTS_LOSSLESS: case CODEC_ID_DTS_LOSSLESS:
mimeType = MimeTypes.AUDIO_DTS_HD; mimeType = MimeTypes.AUDIO_DTS_HD;
break; break;
case CODEC_ID_TRUEHD:
mimeType = MimeTypes.AUDIO_TRUEHD;
break;
case CODEC_ID_SUBRIP: case CODEC_ID_SUBRIP:
mimeType = MimeTypes.APPLICATION_SUBRIP; mimeType = MimeTypes.APPLICATION_SUBRIP;
break; break;
......
library/src/main/java/com/google/android/exoplayer/util/MimeTypes.java
...@@ -50,6 +50,7 @@ public final class MimeTypes { ...@@ -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_DTS_HD = BASE_TYPE_AUDIO + "/vnd.dts.hd";
public static final String AUDIO_VORBIS = BASE_TYPE_AUDIO + "/vorbis"; 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_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"; public static final String TEXT_VTT = BASE_TYPE_TEXT + "/vtt";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment