Allow fmp4 in demo app (demuxed only)

This commit is contained in:
Oliver Woodman 2015-06-05 18:45:45 +01:00
parent 4bced734d0
commit ae466cc59b

View File

@ -27,6 +27,7 @@ import com.google.android.exoplayer.demo.player.HlsRendererBuilder;
import com.google.android.exoplayer.demo.player.SmoothStreamingRendererBuilder; import com.google.android.exoplayer.demo.player.SmoothStreamingRendererBuilder;
import com.google.android.exoplayer.drm.UnsupportedDrmException; import com.google.android.exoplayer.drm.UnsupportedDrmException;
import com.google.android.exoplayer.extractor.mp3.Mp3Extractor; import com.google.android.exoplayer.extractor.mp3.Mp3Extractor;
import com.google.android.exoplayer.extractor.mp4.FragmentedMp4Extractor;
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;
@ -262,6 +263,9 @@ public class PlayerActivity extends Activity implements SurfaceHolder.Callback,
new TsExtractor(0, audioCapabilities)); new TsExtractor(0, audioCapabilities));
case TYPE_AAC: case TYPE_AAC:
return new ExtractorRendererBuilder(this, userAgent, contentUri, new AdtsExtractor()); return new ExtractorRendererBuilder(this, userAgent, contentUri, new AdtsExtractor());
case TYPE_FMP4:
return new ExtractorRendererBuilder(this, userAgent, contentUri,
new FragmentedMp4Extractor());
case TYPE_WEBM: case TYPE_WEBM:
return new ExtractorRendererBuilder(this, userAgent, contentUri, new WebmExtractor()); return new ExtractorRendererBuilder(this, userAgent, contentUri, new WebmExtractor());
default: default: