Commit 1cac22d2 by Oliver Woodman

Add support for standalone WebM playbacks.

parent b3594051
...@@ -46,9 +46,10 @@ public class DemoUtil { ...@@ -46,9 +46,10 @@ public class DemoUtil {
public static final int TYPE_HLS = 2; public static final int TYPE_HLS = 2;
public static final int TYPE_MP4 = 3; public static final int TYPE_MP4 = 3;
public static final int TYPE_MP3 = 4; public static final int TYPE_MP3 = 4;
public static final int TYPE_TS = 5; public static final int TYPE_WEBM = 5;
public static final int TYPE_AAC = 6; public static final int TYPE_TS = 6;
public static final int TYPE_OTHER = 7; public static final int TYPE_AAC = 7;
public static final int TYPE_OTHER = 8;
private static final CookieManager defaultCookieManager; private static final CookieManager defaultCookieManager;
......
...@@ -31,6 +31,7 @@ import com.google.android.exoplayer.extractor.mp3.Mp3Extractor; ...@@ -31,6 +31,7 @@ import com.google.android.exoplayer.extractor.mp3.Mp3Extractor;
import com.google.android.exoplayer.extractor.mp4.Mp4Extractor; import com.google.android.exoplayer.extractor.mp4.Mp4Extractor;
import com.google.android.exoplayer.extractor.ts.AdtsExtractor; import com.google.android.exoplayer.extractor.ts.AdtsExtractor;
import com.google.android.exoplayer.extractor.ts.TsExtractor; import com.google.android.exoplayer.extractor.ts.TsExtractor;
import com.google.android.exoplayer.extractor.webm.WebmExtractor;
import com.google.android.exoplayer.metadata.GeobMetadata; import com.google.android.exoplayer.metadata.GeobMetadata;
import com.google.android.exoplayer.metadata.PrivMetadata; import com.google.android.exoplayer.metadata.PrivMetadata;
import com.google.android.exoplayer.metadata.TxxxMetadata; import com.google.android.exoplayer.metadata.TxxxMetadata;
...@@ -242,6 +243,9 @@ public class PlayerActivity extends Activity implements SurfaceHolder.Callback, ...@@ -242,6 +243,9 @@ public class PlayerActivity extends Activity implements SurfaceHolder.Callback,
case DemoUtil.TYPE_AAC: case DemoUtil.TYPE_AAC:
return new ExtractorRendererBuilder(userAgent, contentUri, debugTextView, return new ExtractorRendererBuilder(userAgent, contentUri, debugTextView,
new AdtsExtractor()); new AdtsExtractor());
case DemoUtil.TYPE_WEBM:
return new ExtractorRendererBuilder(userAgent, contentUri, debugTextView,
new WebmExtractor());
default: default:
return new DefaultRendererBuilder(this, contentUri, debugTextView); return new DefaultRendererBuilder(this, contentUri, debugTextView);
} }
......
...@@ -147,6 +147,9 @@ import java.util.Locale; ...@@ -147,6 +147,9 @@ import java.util.Locale;
new Sample("Google Play (MP3 Audio)", new Sample("Google Play (MP3 Audio)",
"http://storage.googleapis.com/exoplayer-test-media-0/play.mp3", "http://storage.googleapis.com/exoplayer-test-media-0/play.mp3",
DemoUtil.TYPE_MP3), DemoUtil.TYPE_MP3),
new Sample("Google Glass (WebM Video with Vorbis Audio)",
"http://demos.webmproject.org/exoplayer/glass_vp9_vorbis.webm",
DemoUtil.TYPE_WEBM),
}; };
private Samples() {} private Samples() {}
......
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