From 9e65693e91efb59b978108fb1939dacbfa576295 Mon Sep 17 00:00:00 2001 From: olly Date: Tue, 17 May 2016 02:52:01 -0700 Subject: [PATCH] Misc cleanup. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=122506577 --- .../android/exoplayer/extractor/ogg/OpusReaderTest.java | 3 --- .../com/google/android/exoplayer/extractor/ogg/TestData.java | 4 ++-- .../dash/mpd/MediaPresentationDescriptionParser.java | 2 +- .../exoplayer/extractor/mp4/FragmentedMp4Extractor.java | 2 +- .../google/android/exoplayer/extractor/ogg/OggExtractor.java | 4 +--- .../com/google/android/exoplayer/text/SubtitleParser.java | 2 +- .../google/android/exoplayer/text/eia608/Eia608Subtitle.java | 2 +- 7 files changed, 7 insertions(+), 12 deletions(-) diff --git a/library/src/androidTest/java/com/google/android/exoplayer/extractor/ogg/OpusReaderTest.java b/library/src/androidTest/java/com/google/android/exoplayer/extractor/ogg/OpusReaderTest.java index a0cfe9a00e..0e9e85e833 100644 --- a/library/src/androidTest/java/com/google/android/exoplayer/extractor/ogg/OpusReaderTest.java +++ b/library/src/androidTest/java/com/google/android/exoplayer/extractor/ogg/OpusReaderTest.java @@ -42,7 +42,6 @@ public final class OpusReaderTest extends InstrumentationTestCase { private static final String TEST_FILE = "asset:///ogg/bear.opus"; private OggExtractor extractor; - private OpusReader opusReader; private FakeExtractorOutput extractorOutput; private DefaultExtractorInput extractorInput; @@ -61,8 +60,6 @@ public final class OpusReaderTest extends InstrumentationTestCase { assertTrue(extractor.sniff(extractorInput)); extractorInput.resetPeekPosition(); - opusReader = (OpusReader) extractor.getStreamReader(); - extractorOutput = new FakeExtractorOutput(); extractor.init(extractorOutput); } diff --git a/library/src/androidTest/java/com/google/android/exoplayer/extractor/ogg/TestData.java b/library/src/androidTest/java/com/google/android/exoplayer/extractor/ogg/TestData.java index 014438ee1f..411cbbf08e 100644 --- a/library/src/androidTest/java/com/google/android/exoplayer/extractor/ogg/TestData.java +++ b/library/src/androidTest/java/com/google/android/exoplayer/extractor/ogg/TestData.java @@ -34,7 +34,7 @@ import com.google.android.exoplayer.testutil.TestUtil; 0x4F, 0x67, 0x67, 0x53, // Oggs. 0x00, // Stream revision. headerType, - (int) (granule >> 0) & 0xFF, + (int) (granule) & 0xFF, (int) (granule >> 8) & 0xFF, (int) (granule >> 16) & 0xFF, (int) (granule >> 24) & 0xFF, @@ -46,7 +46,7 @@ import com.google.android.exoplayer.testutil.TestUtil; 0x10, 0x00, 0x00, // MSB of data serial number. - (pageSequenceCounter >> 0) & 0xFF, + (pageSequenceCounter) & 0xFF, (pageSequenceCounter >> 8) & 0xFF, (pageSequenceCounter >> 16) & 0xFF, (pageSequenceCounter >> 24) & 0xFF, diff --git a/library/src/main/java/com/google/android/exoplayer/dash/mpd/MediaPresentationDescriptionParser.java b/library/src/main/java/com/google/android/exoplayer/dash/mpd/MediaPresentationDescriptionParser.java index c74c1fa949..24a7d2d155 100644 --- a/library/src/main/java/com/google/android/exoplayer/dash/mpd/MediaPresentationDescriptionParser.java +++ b/library/src/main/java/com/google/android/exoplayer/dash/mpd/MediaPresentationDescriptionParser.java @@ -58,7 +58,7 @@ import java.util.regex.Pattern; public class MediaPresentationDescriptionParser extends DefaultHandler implements UriLoadable.Parser { - private static final String TAG = "MediaPresentationDescriptionParser"; + private static final String TAG = "MpdParser"; private static final Pattern FRAME_RATE_PATTERN = Pattern.compile("(\\d+)(?:/(\\d+))?"); diff --git a/library/src/main/java/com/google/android/exoplayer/extractor/mp4/FragmentedMp4Extractor.java b/library/src/main/java/com/google/android/exoplayer/extractor/mp4/FragmentedMp4Extractor.java index 01060f0a4c..b71363a33b 100644 --- a/library/src/main/java/com/google/android/exoplayer/extractor/mp4/FragmentedMp4Extractor.java +++ b/library/src/main/java/com/google/android/exoplayer/extractor/mp4/FragmentedMp4Extractor.java @@ -324,7 +324,7 @@ public final class FragmentedMp4Extractor implements Extractor { LeafAtom child = moovLeafChildren.get(i); if (child.type == Atom.TYPE_pssh) { if (schemeDatas == null) { - schemeDatas = new ArrayList(); + schemeDatas = new ArrayList<>(); } byte[] psshData = child.data.data; UUID uuid = PsshAtomUtil.parseUuid(psshData); diff --git a/library/src/main/java/com/google/android/exoplayer/extractor/ogg/OggExtractor.java b/library/src/main/java/com/google/android/exoplayer/extractor/ogg/OggExtractor.java index 6593af3bfa..207107a0df 100644 --- a/library/src/main/java/com/google/android/exoplayer/extractor/ogg/OggExtractor.java +++ b/library/src/main/java/com/google/android/exoplayer/extractor/ogg/OggExtractor.java @@ -54,10 +54,8 @@ public class OggExtractor implements Extractor { } return true; } catch (ParserException e) { - // does not happen - } finally { + return false; } - return false; } @Override diff --git a/library/src/main/java/com/google/android/exoplayer/text/SubtitleParser.java b/library/src/main/java/com/google/android/exoplayer/text/SubtitleParser.java index 730450c272..0d1899f214 100644 --- a/library/src/main/java/com/google/android/exoplayer/text/SubtitleParser.java +++ b/library/src/main/java/com/google/android/exoplayer/text/SubtitleParser.java @@ -31,6 +31,6 @@ public interface SubtitleParser extends * * @param positionUs The current playback position in microseconds. */ - public void setPositionUs(long positionUs); + void setPositionUs(long positionUs); } diff --git a/library/src/main/java/com/google/android/exoplayer/text/eia608/Eia608Subtitle.java b/library/src/main/java/com/google/android/exoplayer/text/eia608/Eia608Subtitle.java index f4d4505d66..993e036a6f 100644 --- a/library/src/main/java/com/google/android/exoplayer/text/eia608/Eia608Subtitle.java +++ b/library/src/main/java/com/google/android/exoplayer/text/eia608/Eia608Subtitle.java @@ -50,7 +50,7 @@ public final class Eia608Subtitle implements Subtitle { @Override public List getCues(long timeUs) { if (caption == null || caption.isEmpty()) { - return Collections.emptyList(); + return Collections.emptyList(); } else { return Collections.singletonList(new Cue(caption)); }