webm branch cleanup

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<MediaPresentationDe
   public void build() {
     MediaPresentationDescriptionParser parser = new MediaPresentationDescriptionParser();
     ManifestFetcher<MediaPresentationDescription> manifestFetcher =
-        new ManifestFetcher<MediaPresentationDescription>(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<MediaPresentationDe
     DefaultBandwidthMeter bandwidthMeter = new DefaultBandwidthMeter(null, null);
 
     // Obtain Representations for playback.
-    ArrayList<Representation> audioRepresentationsList = new ArrayList<Representation>();
-    ArrayList<Representation> videoRepresentationsList = new ArrayList<Representation>();
+    ArrayList<Representation> audioRepresentationsList = new ArrayList<>();
+    ArrayList<Representation> videoRepresentationsList = new ArrayList<>();
     Period period = manifest.periods.get(0);
     for (int i = 0; i < period.adaptationSets.size(); i++) {
       AdaptationSet adaptationSet = period.adaptationSets.get(i);

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<String>();
-    itemPaths = new ArrayList<File>();
+    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<String>(this, R.layout.rows, listItems));
+    setListAdapter(new ArrayAdapter<>(this, R.layout.rows, listItems));
   }
 
   @Override

extensions/opus/src/main/.settings/org.eclipse.jdt.core.prefs

+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

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<InputBuffer>();
-    queuedOutputBuffers = new LinkedList<OutputBuffer>();
+    queuedInputBuffers = new LinkedList<>();
+    queuedOutputBuffers = new LinkedList<>();
     availableInputBuffers = new InputBuffer[NUM_BUFFERS];
     availableOutputBuffers = new OutputBuffer[NUM_BUFFERS];
     availableInputBufferCount = NUM_BUFFERS;

extensions/vp9/src/main/.settings/org.eclipse.jdt.core.prefs

+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

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<InputBuffer>();
-    queuedOutputBuffers = new LinkedList<OutputBuffer>();
+    queuedInputBuffers = new LinkedList<>();
+    queuedOutputBuffers = new LinkedList<>();
     availableInputBuffers = new InputBuffer[NUM_BUFFERS];
     availableOutputBuffers = new OutputBuffer[NUM_BUFFERS];
     availableInputBufferCount = NUM_BUFFERS;