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 release branch

Browse source
This commit is contained in:
Oliver Woodman 2018-06-05 22:30:58 +01:00
parent 615b2b1039
commit 97e68ecc31
3 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
library/core/src/main/java/com/google/android/exoplayer2/source/ConcatenatingMediaSource.java
View file

@ -668,7 +668,6 @@ public class ConcatenatingMediaSource extends CompositeMediaSource<MediaSourceHo
public MediaSourceHolder(MediaSource mediaSource) { public MediaSourceHolder(MediaSource mediaSource) {
this.mediaSource = mediaSource; this.mediaSource = mediaSource;
this.uid = System.identityHashCode(this);
this.timeline = new DeferredTimeline(); this.timeline = new DeferredTimeline();
this.activeMediaPeriods = new ArrayList<>(); this.activeMediaPeriods = new ArrayList<>();
this.uid = new Object(); this.uid = new Object();

6
library/core/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java
View file

@ -1173,7 +1173,7 @@ public class DefaultTrackSelector extends MappingTrackSelector {
// MappingTrackSelector implementation. // MappingTrackSelector implementation.
@Override @Override
protected final Pair<@NullableType RendererConfiguration[], @NullableType TrackSelection[]> protected final Pair<RendererConfiguration[], TrackSelection[]>
selectTracks( selectTracks(
MappedTrackInfo mappedTrackInfo, MappedTrackInfo mappedTrackInfo,
int[][][] rendererFormatSupports, int[][][] rendererFormatSupports,
@ -1181,7 +1181,7 @@ public class DefaultTrackSelector extends MappingTrackSelector {
throws ExoPlaybackException { throws ExoPlaybackException {
Parameters params = parametersReference.get(); Parameters params = parametersReference.get();
int rendererCount = mappedTrackInfo.getRendererCount(); int rendererCount = mappedTrackInfo.getRendererCount();
@NullableType TrackSelection[] rendererTrackSelections = TrackSelection[] rendererTrackSelections =
selectAllTracks( selectAllTracks(
mappedTrackInfo, mappedTrackInfo,
rendererFormatSupports, rendererFormatSupports,
@ -1404,7 +1404,7 @@ public class DefaultTrackSelector extends MappingTrackSelector {
String selectedMimeType = null; String selectedMimeType = null;
if (!allowMixedMimeTypes) { if (!allowMixedMimeTypes) {
// Select the mime type for which we have the most adaptive tracks. // Select the mime type for which we have the most adaptive tracks.
HashSet<@NullableType String> seenMimeTypes = new HashSet<>(); HashSet<String> seenMimeTypes = new HashSet<>();
int selectedMimeTypeTrackCount = 0; int selectedMimeTypeTrackCount = 0;
for (int i = 0; i < selectedTrackIndices.size(); i++) { for (int i = 0; i < selectedTrackIndices.size(); i++) {
int trackIndex = selectedTrackIndices.get(i); int trackIndex = selectedTrackIndices.get(i);

4
library/core/src/main/java/com/google/android/exoplayer2/trackselection/MappingTrackSelector.java
View file

@ -383,7 +383,7 @@ public abstract class MappingTrackSelector extends TrackSelector {
rendererFormatSupports, rendererFormatSupports,
unmappedTrackGroupArray); unmappedTrackGroupArray);
Pair<@NullableType RendererConfiguration[], @NullableType TrackSelection[]> result = Pair<RendererConfiguration[], TrackSelection[]> result =
selectTracks( selectTracks(
mappedTrackInfo, rendererFormatSupports, rendererMixedMimeTypeAdaptationSupports); mappedTrackInfo, rendererFormatSupports, rendererMixedMimeTypeAdaptationSupports);
return new TrackSelectorResult(result.first, result.second, mappedTrackInfo); return new TrackSelectorResult(result.first, result.second, mappedTrackInfo);
@ -403,7 +403,7 @@ public abstract class MappingTrackSelector extends TrackSelector {
* RendererCapabilities#getTrackType()} is {@link C#TRACK_TYPE_NONE}. * RendererCapabilities#getTrackType()} is {@link C#TRACK_TYPE_NONE}.
* @throws ExoPlaybackException If an error occurs while selecting the tracks. * @throws ExoPlaybackException If an error occurs while selecting the tracks.
*/ */
protected abstract Pair<@NullableType RendererConfiguration[], @NullableType TrackSelection[]> protected abstract Pair<RendererConfiguration[], TrackSelection[]>
selectTracks( selectTracks(
MappedTrackInfo mappedTrackInfo, MappedTrackInfo mappedTrackInfo,
int[][][] rendererFormatSupports, int[][][] rendererFormatSupports,