sjs/media
1
0
Fork 0
mirror of https://github.com/samsonjs/media.git synced 2026-04-27 15:07:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix webm demo

Browse source
This commit is contained in:
Oliver Woodman 2015-05-19 15:03:03 +01:00
parent e3a7fc4da7
commit 4aee221fb3
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
demo_misc/webm_sw_decoder/src/main/java/com/google/android/exoplayer/demo/webm/DashRendererBuilder.java
View file

@ -54,9 +54,9 @@ public class DashRendererBuilder implements ManifestCallback<MediaPresentationDe
private static final int VIDEO_BUFFER_SEGMENTS = 200; private static final int VIDEO_BUFFER_SEGMENTS = 200;
private static final int AUDIO_BUFFER_SEGMENTS = 60; private static final int AUDIO_BUFFER_SEGMENTS = 60;
private String manifestUrl; private final String manifestUrl;
private String userAgent; private final String userAgent;
private VideoPlayer player; private final VideoPlayer player;
public DashRendererBuilder(String manifestUrl, String userAgent, VideoPlayer player) { public DashRendererBuilder(String manifestUrl, String userAgent, VideoPlayer player) {
this.manifestUrl = manifestUrl; this.manifestUrl = manifestUrl;
@ -105,7 +105,7 @@ public class DashRendererBuilder implements ManifestCallback<MediaPresentationDe
// Build the video renderer. // Build the video renderer.
LibvpxVideoTrackRenderer videoRenderer = null; LibvpxVideoTrackRenderer videoRenderer = null;
if (!videoRepresentationsList.isEmpty()) { if (!videoRepresentationsList.isEmpty()) {
DataSource videoDataSource = new DefaultUriDataSource(userAgent, bandwidthMeter); DataSource videoDataSource = new DefaultUriDataSource(player, bandwidthMeter, userAgent);
ChunkSource videoChunkSource; ChunkSource videoChunkSource;
String mimeType = videoRepresentations[0].format.mimeType; String mimeType = videoRepresentations[0].format.mimeType;
if (mimeType.equals(MimeTypes.VIDEO_WEBM)) { if (mimeType.equals(MimeTypes.VIDEO_WEBM)) {
@ -124,7 +124,7 @@ public class DashRendererBuilder implements ManifestCallback<MediaPresentationDe
MultiTrackChunkSource audioChunkSource = null; MultiTrackChunkSource audioChunkSource = null;
TrackRenderer audioRenderer = null; TrackRenderer audioRenderer = null;
if (!audioRepresentationsList.isEmpty()) { if (!audioRepresentationsList.isEmpty()) {
DataSource audioDataSource = new DefaultUriDataSource(userAgent, bandwidthMeter); DataSource audioDataSource = new DefaultUriDataSource(player, bandwidthMeter, userAgent);
ChunkSource[] audioChunkSources = new ChunkSource[audioRepresentationsList.size()]; ChunkSource[] audioChunkSources = new ChunkSource[audioRepresentationsList.size()];
FormatEvaluator audioEvaluator = new FormatEvaluator.FixedEvaluator(); FormatEvaluator audioEvaluator = new FormatEvaluator.FixedEvaluator();
for (int i = 0; i < audioRepresentationsList.size(); i++) { for (int i = 0; i < audioRepresentationsList.size(); i++) {

2
demo_misc/webm_sw_decoder/src/main/java/com/google/android/exoplayer/demo/webm/VideoPlayer.java
View file

@ -160,7 +160,7 @@ public class VideoPlayer extends Activity implements OnClickListener,
mediaController.setEnabled(true); mediaController.setEnabled(true);
ExtractorSampleSource sampleSource = new ExtractorSampleSource( ExtractorSampleSource sampleSource = new ExtractorSampleSource(
Uri.fromFile(new File(filename)), Uri.fromFile(new File(filename)),
new DefaultUriDataSource(Util.getUserAgent(this, "ExoPlayerExtWebMDemo"), null), new DefaultUriDataSource(this, Util.getUserAgent(this, "ExoPlayerExtWebMDemo")),
new WebmExtractor(), 2, EXTRACTOR_BUFFER_SIZE); new WebmExtractor(), 2, EXTRACTOR_BUFFER_SIZE);
TrackRenderer videoRenderer = TrackRenderer videoRenderer =
new LibvpxVideoTrackRenderer(sampleSource, true, handler, this, 50); new LibvpxVideoTrackRenderer(sampleSource, true, handler, this, 50);