loliball/media3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed an NPE with self-initializing DASH segments.

Browse Source 
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=121660680
This commit is contained in:
cdrolle 2016-05-06 03:10:03 -07:00 committed by Oliver Woodman
parent 27132bb2da
commit cf0a31a7bb
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
library/src/main/java/com/google/android/exoplayer/extractor/DefaultTrackOutput.java
View File

@ -24,6 +24,7 @@ import com.google.android.exoplayer.upstream.Allocation;
import com.google.android.exoplayer.upstream.Allocator; import com.google.android.exoplayer.upstream.Allocator;
import com.google.android.exoplayer.util.Assertions; import com.google.android.exoplayer.util.Assertions;
import com.google.android.exoplayer.util.ParsableByteArray; import com.google.android.exoplayer.util.ParsableByteArray;
import com.google.android.exoplayer.util.Util;
import java.io.EOFException; import java.io.EOFException;
import java.io.IOException; import java.io.IOException;
@ -742,7 +743,7 @@ public final class DefaultTrackOutput implements TrackOutput {
public synchronized void format(Format format) { public synchronized void format(Format format) {
// We suppress changes between equal formats so we can use referential equality in readData. // We suppress changes between equal formats so we can use referential equality in readData.
if (!format.equals(upstreamFormat)) { if (!Util.areEqual(format, upstreamFormat)) {
upstreamFormat = format; upstreamFormat = format;
} }
} }