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

Guide V2 + a few related code tweaks

Browse source 
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=133022058
This commit is contained in:
olly 2016-09-13 11:11:01 -07:00 committed by Oliver Woodman
parent 2ebabc54eb
commit 560071683f
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
library/src/main/java/com/google/android/exoplayer2/ExoPlayer.java
View file

@ -44,8 +44,8 @@ import com.google.android.exoplayer2.video.MediaCodecVideoRenderer;
* Components common to all ExoPlayer implementations are: * Components common to all ExoPlayer implementations are:
* <ul> * <ul>
* <li>A <b>{@link MediaSource}</b> that defines the media to be played, loads the media, and from * <li>A <b>{@link MediaSource}</b> that defines the media to be played, loads the media, and from
* which the loaded media can be read. A MediaSource is injected via {@link #prepare} to prepare * which the loaded media can be read. A MediaSource is injected via {@link #prepare} at the start
* the player for playback. The library provides default implementations for regular media files * of playback. The library provides default implementations for regular media files
* ({@link ExtractorMediaSource}), DASH ({@link DashMediaSource}), SmoothStreaming * ({@link ExtractorMediaSource}), DASH ({@link DashMediaSource}), SmoothStreaming
* ({@link SsMediaSource}) and HLS ({@link HlsMediaSource}), implementations for merging * ({@link SsMediaSource}) and HLS ({@link HlsMediaSource}), implementations for merging
* ({@link MergingMediaSource}) and concatenating ({@link ConcatenatingMediaSource}) other * ({@link MergingMediaSource}) and concatenating ({@link ConcatenatingMediaSource}) other

6
library/src/main/java/com/google/android/exoplayer2/ExoPlayerFactory.java
View file

@ -39,9 +39,11 @@ public final class ExoPlayerFactory {
* *
* @param context A {@link Context}. * @param context A {@link Context}.
* @param trackSelector The {@link TrackSelector} that will be used by the instance. * @param trackSelector The {@link TrackSelector} that will be used by the instance.
* @param loadControl The {@link LoadControl} that will be used by the instance.
*/ */
public static SimpleExoPlayer newSimpleInstance(Context context, TrackSelector trackSelector) { public static SimpleExoPlayer newSimpleInstance(Context context, TrackSelector trackSelector,
return newSimpleInstance(context, trackSelector, new DefaultLoadControl(), null); LoadControl loadControl) {
return newSimpleInstance(context, trackSelector, loadControl, null);
} }
/** /**