summaryrefslogtreecommitdiff
path: root/src/de/danoeh/antennapod/util/ChapterUtils.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/de/danoeh/antennapod/util/ChapterUtils.java')
-rw-r--r--src/de/danoeh/antennapod/util/ChapterUtils.java41
1 files changed, 0 insertions, 41 deletions
diff --git a/src/de/danoeh/antennapod/util/ChapterUtils.java b/src/de/danoeh/antennapod/util/ChapterUtils.java
index 45fc9211c..2d9022eed 100644
--- a/src/de/danoeh/antennapod/util/ChapterUtils.java
+++ b/src/de/danoeh/antennapod/util/ChapterUtils.java
@@ -2,9 +2,7 @@ package de.danoeh.antennapod.util;
import android.util.Log;
-import org.apache.commons.io.FilenameUtils;
import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang3.StringUtils;
import java.io.BufferedInputStream;
import java.io.File;
@@ -14,21 +12,17 @@ import java.io.IOException;
import java.io.InputStream;
import java.net.MalformedURLException;
import java.net.URL;
-import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import de.danoeh.antennapod.BuildConfig;
import de.danoeh.antennapod.feed.Chapter;
-import de.danoeh.antennapod.feed.MP4Chapter;
import de.danoeh.antennapod.util.comparator.ChapterStartTimeComparator;
import de.danoeh.antennapod.util.id3reader.ChapterReader;
import de.danoeh.antennapod.util.id3reader.ID3ReaderException;
import de.danoeh.antennapod.util.playback.Playable;
import de.danoeh.antennapod.util.vorbiscommentreader.VorbisCommentChapterReader;
import de.danoeh.antennapod.util.vorbiscommentreader.VorbisCommentReaderException;
-import wseemann.media.FFmpegChapter;
-import wseemann.media.FFmpegMediaMetadataRetriever;
/**
* Utility class for getting chapter data from media files.
@@ -205,32 +199,6 @@ public class ChapterUtils {
}
}
- private static void readMP4ChaptersFromFileUrl(Playable p) {
- if (!FFmpegMediaMetadataRetriever.LIB_AVAILABLE) {
- if (BuildConfig.DEBUG)
- Log.d(TAG, "FFmpegMediaMetadataRetriever not available on this architecture");
- return;
- }
- if (BuildConfig.DEBUG)
- Log.d(TAG, "Trying to read mp4 chapters from file " + p.getEpisodeTitle());
-
- FFmpegMediaMetadataRetriever retriever = new FFmpegMediaMetadataRetriever();
- retriever.setDataSource(p.getLocalMediaUrl());
- FFmpegChapter[] res = retriever.getChapters();
- retriever.release();
- if (res != null) {
- List<Chapter> chapters = new ArrayList<Chapter>();
- for (FFmpegChapter fFmpegChapter : res) {
- chapters.add(new MP4Chapter(fFmpegChapter));
- }
- Collections.sort(chapters, new ChapterStartTimeComparator());
- processChapters(chapters, p);
- p.setChapters(chapters);
- } else {
- if (BuildConfig.DEBUG) Log.d(TAG, "No mp4 chapters found in " + p.getEpisodeTitle());
- }
- }
-
/**
* Makes sure that chapter does a title and an item attribute.
*/
@@ -299,17 +267,8 @@ public class ChapterUtils {
if (media.getChapters() == null) {
ChapterUtils.readOggChaptersFromPlayableFileUrl(media);
}
- if (media.getChapters() == null && isMP4File(media)) {
- ChapterUtils.readMP4ChaptersFromFileUrl(media);
- }
} else {
Log.e(TAG, "Could not load chapters from file url: local file not available");
}
}
-
- private static boolean isMP4File(Playable media) {
- String ext = FilenameUtils.getExtension(media.getLocalMediaUrl());
- return StringUtils.equals(ext, "m4a") || StringUtils.equals(ext, "mp4")
- || StringUtils.equals(ext, "aac") || StringUtils.equals(ext, "m4p");
- }
}