Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions domain/src/main/java/org/m4m/domain/MediaSource.java
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,7 @@ private void drain() {
public Iterable<MediaFormat> getMediaFormats() {
LinkedList<MediaFormat> result = new LinkedList<MediaFormat>();
for (int i = 0; i < mediaExtractor.getTrackCount(); i++) {
if (mediaExtractor.getTrackFormat(i) == null) continue;
result.add(mediaExtractor.getTrackFormat(i));
}
return result;
Expand Down Expand Up @@ -228,7 +229,8 @@ private long getMaxAllTracksDuration() {
long maxDuration = 0;
int i = 0;
for (MediaFormat ignored : getMediaFormats()) {
if (mediaExtractor.getTrackFormat(i).getDuration() > maxDuration) {
if (mediaExtractor.getTrackFormat(i) != null
&& (mediaExtractor.getTrackFormat(i).getDuration() > maxDuration)) {
maxDuration = mediaExtractor.getTrackFormat(i).getDuration();
}
i++;
Expand Down Expand Up @@ -268,8 +270,12 @@ private boolean isVideoTrack() {
}

private boolean isVideoTrack(int trackId) {
String mimeType = mediaExtractor.getTrackFormat(trackId).getMimeType();
return mimeType.startsWith("video");
if (mediaExtractor.getTrackFormat(trackId) != null) {
String mimeType = mediaExtractor.getTrackFormat(trackId).getMimeType();
return mimeType.startsWith("video");
} else {
return false;
}
}

@Override
Expand Down