Skip to content

SDK / exoplayer

Go to a project
Commit 8c53590b by ojw28
Options

Merge pull request #858 from IanDBird/dev-mpeg2 

Add support for MPEG2 video codec in WebMExtractor
parents 2d967a1b e933e2d4
Inline Side-by-side
Showing with 6 additions and 0 deletions
library/src/main/java/com/google/android/exoplayer/extractor/webm/WebmExtractor.java
...@@ -64,6 +64,7 @@ public final class WebmExtractor implements Extractor { ...@@ -64,6 +64,7 @@ public final class WebmExtractor implements Extractor {
private static final String DOC_TYPE_MATROSKA = "matroska"; private static final String DOC_TYPE_MATROSKA = "matroska";
private static final String CODEC_ID_VP8 = "V_VP8"; private static final String CODEC_ID_VP8 = "V_VP8";
private static final String CODEC_ID_VP9 = "V_VP9"; private static final String CODEC_ID_VP9 = "V_VP9";
private static final String CODEC_ID_MPEG2 = "V_MPEG2";
private static final String CODEC_ID_MPEG4_SP = "V_MPEG4/ISO/SP"; private static final String CODEC_ID_MPEG4_SP = "V_MPEG4/ISO/SP";
private static final String CODEC_ID_MPEG4_ASP = "V_MPEG4/ISO/ASP"; private static final String CODEC_ID_MPEG4_ASP = "V_MPEG4/ISO/ASP";
private static final String CODEC_ID_MPEG4_AP = "V_MPEG4/ISO/AP"; private static final String CODEC_ID_MPEG4_AP = "V_MPEG4/ISO/AP";
...@@ -1028,6 +1029,7 @@ public final class WebmExtractor implements Extractor { ...@@ -1028,6 +1029,7 @@ public final class WebmExtractor implements Extractor {
private static boolean isCodecSupported(String codecId) { private static boolean isCodecSupported(String codecId) {
return CODEC_ID_VP8.equals(codecId) return CODEC_ID_VP8.equals(codecId)
|| CODEC_ID_VP9.equals(codecId) || CODEC_ID_VP9.equals(codecId)
|| CODEC_ID_MPEG2.equals(codecId)
|| CODEC_ID_MPEG4_SP.equals(codecId) || CODEC_ID_MPEG4_SP.equals(codecId)
|| CODEC_ID_MPEG4_ASP.equals(codecId) || CODEC_ID_MPEG4_ASP.equals(codecId)
|| CODEC_ID_MPEG4_AP.equals(codecId) || CODEC_ID_MPEG4_AP.equals(codecId)
...@@ -1147,6 +1149,9 @@ public final class WebmExtractor implements Extractor { ...@@ -1147,6 +1149,9 @@ public final class WebmExtractor implements Extractor {
case CODEC_ID_VP9: case CODEC_ID_VP9:
mimeType = MimeTypes.VIDEO_VP9; mimeType = MimeTypes.VIDEO_VP9;
break; break;
case CODEC_ID_MPEG2:
mimeType = MimeTypes.VIDEO_MPEG2;
break;
case CODEC_ID_MPEG4_SP: case CODEC_ID_MPEG4_SP:
case CODEC_ID_MPEG4_ASP: case CODEC_ID_MPEG4_ASP:
case CODEC_ID_MPEG4_AP: case CODEC_ID_MPEG4_AP:
......
library/src/main/java/com/google/android/exoplayer/util/MimeTypes.java
...@@ -34,6 +34,7 @@ public final class MimeTypes { ...@@ -34,6 +34,7 @@ public final class MimeTypes {
public static final String VIDEO_VP8 = BASE_TYPE_VIDEO + "/x-vnd.on2.vp8"; public static final String VIDEO_VP8 = BASE_TYPE_VIDEO + "/x-vnd.on2.vp8";
public static final String VIDEO_VP9 = BASE_TYPE_VIDEO + "/x-vnd.on2.vp9"; public static final String VIDEO_VP9 = BASE_TYPE_VIDEO + "/x-vnd.on2.vp9";
public static final String VIDEO_MP4V = BASE_TYPE_VIDEO + "/mp4v-es"; public static final String VIDEO_MP4V = BASE_TYPE_VIDEO + "/mp4v-es";
public static final String VIDEO_MPEG2 = BASE_TYPE_VIDEO + "/mpeg2";
public static final String AUDIO_UNKNOWN = BASE_TYPE_AUDIO + "/x-unknown"; public static final String AUDIO_UNKNOWN = BASE_TYPE_AUDIO + "/x-unknown";
public static final String AUDIO_MP4 = BASE_TYPE_AUDIO + "/mp4"; public static final String AUDIO_MP4 = BASE_TYPE_AUDIO + "/mp4";
......
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