From ece3ac63c8201af8eaa041057d53ad9352b8322e Mon Sep 17 00:00:00 2001 From: Oliver Woodman Date: Fri, 22 May 2015 21:50:29 +0100 Subject: [PATCH] webm branch cleanup --- .../exoplayer/demo/webm/DashRendererBuilder.java | 7 +++---- .../exoplayer/demo/webm/FilePickerActivity.java | 6 +++--- .../src/main/.settings/org.eclipse.jdt.core.prefs | 12 ++++++++++++ .../exoplayer/ext/opus/OpusDecoderWrapper.java | 4 ++-- .../src/main/.settings/org.eclipse.jdt.core.prefs | 12 ++++++++++++ .../android/exoplayer/ext/vp9/VpxDecoderWrapper.java | 4 ++-- 6 files changed, 34 insertions(+), 11 deletions(-) create mode 100644 extensions/opus/src/main/.settings/org.eclipse.jdt.core.prefs create mode 100644 extensions/vp9/src/main/.settings/org.eclipse.jdt.core.prefs diff --git a/demo_misc/webm_sw_decoder/src/main/java/com/google/android/exoplayer/demo/webm/DashRendererBuilder.java b/demo_misc/webm_sw_decoder/src/main/java/com/google/android/exoplayer/demo/webm/DashRendererBuilder.java index a32f14eebd..afafc1e639 100644 --- a/demo_misc/webm_sw_decoder/src/main/java/com/google/android/exoplayer/demo/webm/DashRendererBuilder.java +++ b/demo_misc/webm_sw_decoder/src/main/java/com/google/android/exoplayer/demo/webm/DashRendererBuilder.java @@ -67,8 +67,7 @@ public class DashRendererBuilder implements ManifestCallback manifestFetcher = - new ManifestFetcher(manifestUrl, - new DefaultHttpDataSource(userAgent, null), parser); + new ManifestFetcher<>(manifestUrl, new DefaultHttpDataSource(userAgent, null), parser); manifestFetcher.singleLoad(player.getMainHandler().getLooper(), this); } @@ -84,8 +83,8 @@ public class DashRendererBuilder implements ManifestCallback audioRepresentationsList = new ArrayList(); - ArrayList videoRepresentationsList = new ArrayList(); + ArrayList audioRepresentationsList = new ArrayList<>(); + ArrayList videoRepresentationsList = new ArrayList<>(); Period period = manifest.periods.get(0); for (int i = 0; i < period.adaptationSets.size(); i++) { AdaptationSet adaptationSet = period.adaptationSets.get(i); diff --git a/demo_misc/webm_sw_decoder/src/main/java/com/google/android/exoplayer/demo/webm/FilePickerActivity.java b/demo_misc/webm_sw_decoder/src/main/java/com/google/android/exoplayer/demo/webm/FilePickerActivity.java index 480f92f8dd..c7e5817d19 100644 --- a/demo_misc/webm_sw_decoder/src/main/java/com/google/android/exoplayer/demo/webm/FilePickerActivity.java +++ b/demo_misc/webm_sw_decoder/src/main/java/com/google/android/exoplayer/demo/webm/FilePickerActivity.java @@ -53,8 +53,8 @@ public class FilePickerActivity extends ListActivity { private void setDirectory(File directory) { currentPathView.setText(getString(R.string.current_path, directory.getAbsolutePath())); - listItems = new ArrayList(); - itemPaths = new ArrayList(); + listItems = new ArrayList<>(); + itemPaths = new ArrayList<>(); File[] files = directory.listFiles(); if (!directory.getAbsolutePath().equals(root.getAbsolutePath())) { @@ -77,7 +77,7 @@ public class FilePickerActivity extends ListActivity { } } - setListAdapter(new ArrayAdapter(this, R.layout.rows, listItems)); + setListAdapter(new ArrayAdapter<>(this, R.layout.rows, listItems)); } @Override diff --git a/extensions/opus/src/main/.settings/org.eclipse.jdt.core.prefs b/extensions/opus/src/main/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 0000000000..d17b6724d1 --- /dev/null +++ b/extensions/opus/src/main/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,12 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=1.7 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.7 diff --git a/extensions/opus/src/main/java/com/google/android/exoplayer/ext/opus/OpusDecoderWrapper.java b/extensions/opus/src/main/java/com/google/android/exoplayer/ext/opus/OpusDecoderWrapper.java index 2e3ee63494..074fc43f7d 100644 --- a/extensions/opus/src/main/java/com/google/android/exoplayer/ext/opus/OpusDecoderWrapper.java +++ b/extensions/opus/src/main/java/com/google/android/exoplayer/ext/opus/OpusDecoderWrapper.java @@ -70,8 +70,8 @@ import java.util.LinkedList; opusHeader = parseOpusHeader(headerBytes); skipSamples = (codecDelayNs == -1) ? opusHeader.skipSamples : nsToSamples(codecDelayNs); seekPreRoll = (seekPreRoll == -1) ? DEFAULT_SEEK_PRE_ROLL : nsToSamples(seekPreRollNs); - queuedInputBuffers = new LinkedList(); - queuedOutputBuffers = new LinkedList(); + queuedInputBuffers = new LinkedList<>(); + queuedOutputBuffers = new LinkedList<>(); availableInputBuffers = new InputBuffer[NUM_BUFFERS]; availableOutputBuffers = new OutputBuffer[NUM_BUFFERS]; availableInputBufferCount = NUM_BUFFERS; diff --git a/extensions/vp9/src/main/.settings/org.eclipse.jdt.core.prefs b/extensions/vp9/src/main/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 0000000000..d17b6724d1 --- /dev/null +++ b/extensions/vp9/src/main/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,12 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=1.7 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.7 diff --git a/extensions/vp9/src/main/java/com/google/android/exoplayer/ext/vp9/VpxDecoderWrapper.java b/extensions/vp9/src/main/java/com/google/android/exoplayer/ext/vp9/VpxDecoderWrapper.java index 8638204430..c6ce0247c5 100644 --- a/extensions/vp9/src/main/java/com/google/android/exoplayer/ext/vp9/VpxDecoderWrapper.java +++ b/extensions/vp9/src/main/java/com/google/android/exoplayer/ext/vp9/VpxDecoderWrapper.java @@ -52,8 +52,8 @@ import java.util.LinkedList; public VpxDecoderWrapper(boolean outputRgb) { lock = new Object(); this.outputRgb = outputRgb; - queuedInputBuffers = new LinkedList(); - queuedOutputBuffers = new LinkedList(); + queuedInputBuffers = new LinkedList<>(); + queuedOutputBuffers = new LinkedList<>(); availableInputBuffers = new InputBuffer[NUM_BUFFERS]; availableOutputBuffers = new OutputBuffer[NUM_BUFFERS]; availableInputBufferCount = NUM_BUFFERS;