Finalize v2 directory + package name

- The package is renamed to avoid conflicts with v1, should any
app wish to include both v1 and v2 for a period of time. This is
similar to the approach used by some other open source projects
(e.g. okhttp).
- Copyright year is updated everywhere for completeness.
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=126895326

build.gradle

-// Copyright (C) 2014 The Android Open Source Project
+// Copyright (C) 2016 The Android Open Source Project
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

demo/build.gradle

-// Copyright (C) 2014 The Android Open Source Project
+// Copyright (C) 2016 The Android Open Source Project
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

demo/src/main/AndroidManifest.xml

 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 The Android Open Source Project
+<!-- Copyright (C) 2016 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@
 -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.google.android.exoplayer.demo"
+    package="com.google.android.exoplayer2.demo"
     android:versionCode="2000"
     android:versionName="2.0.0"
     android:theme="@style/RootTheme">
@@ -31,7 +31,7 @@
       android:largeHeap="true"
       android:allowBackup="false">
 
-    <activity android:name="com.google.android.exoplayer.demo.SampleChooserActivity"
+    <activity android:name="com.google.android.exoplayer2.demo.SampleChooserActivity"
         android:configChanges="keyboardHidden"
         android:label="@string/application_name">
       <intent-filter>
@@ -52,7 +52,7 @@
       </intent-filter>
     </activity>
 
-    <activity android:name="com.google.android.exoplayer.demo.PlayerActivity"
+    <activity android:name="com.google.android.exoplayer2.demo.PlayerActivity"
         android:configChanges="keyboard|keyboardHidden|orientation|screenSize|screenLayout|smallestScreenSize|uiMode"
         android:launchMode="singleTop"
         android:label="@string/application_name"

demo/src/main/java/com/google/android/exoplayer/demo/EventLogger.java → demo/src/main/java/com/google/android/exoplayer2/demo/EventLogger.java

 /*
- * Copyright (C) 2014 The Android Open Source Project
+ * Copyright (C) 2016 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,23 +13,23 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.android.exoplayer.demo;
-
-import com.google.android.exoplayer.AdaptiveSourceEventListener;
-import com.google.android.exoplayer.CodecCounters;
-import com.google.android.exoplayer.DefaultTrackSelector;
-import com.google.android.exoplayer.DefaultTrackSelector.TrackInfo;
-import com.google.android.exoplayer.ExoPlaybackException;
-import com.google.android.exoplayer.ExoPlayer;
-import com.google.android.exoplayer.Format;
-import com.google.android.exoplayer.SimpleExoPlayer;
-import com.google.android.exoplayer.TrackGroup;
-import com.google.android.exoplayer.TrackGroupArray;
-import com.google.android.exoplayer.TrackRenderer;
-import com.google.android.exoplayer.TrackSelection;
-import com.google.android.exoplayer.drm.StreamingDrmSessionManager;
-import com.google.android.exoplayer.extractor.ExtractorSampleSource;
-import com.google.android.exoplayer.upstream.DataSpec;
+package com.google.android.exoplayer2.demo;
+
+import com.google.android.exoplayer2.AdaptiveSourceEventListener;
+import com.google.android.exoplayer2.CodecCounters;
+import com.google.android.exoplayer2.DefaultTrackSelector;
+import com.google.android.exoplayer2.DefaultTrackSelector.TrackInfo;
+import com.google.android.exoplayer2.ExoPlaybackException;
+import com.google.android.exoplayer2.ExoPlayer;
+import com.google.android.exoplayer2.Format;
+import com.google.android.exoplayer2.SimpleExoPlayer;
+import com.google.android.exoplayer2.TrackGroup;
+import com.google.android.exoplayer2.TrackGroupArray;
+import com.google.android.exoplayer2.TrackRenderer;
+import com.google.android.exoplayer2.TrackSelection;
+import com.google.android.exoplayer2.drm.StreamingDrmSessionManager;
+import com.google.android.exoplayer2.extractor.ExtractorSampleSource;
+import com.google.android.exoplayer2.upstream.DataSpec;
 
 import android.os.SystemClock;
 import android.util.Log;

demo/src/main/java/com/google/android/exoplayer/demo/PlayerActivity.java → demo/src/main/java/com/google/android/exoplayer2/demo/PlayerActivity.java

 /*
- * Copyright (C) 2014 The Android Open Source Project
+ * Copyright (C) 2016 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,46 +13,46 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.android.exoplayer.demo;
-
-import com.google.android.exoplayer.AspectRatioFrameLayout;
-import com.google.android.exoplayer.C;
-import com.google.android.exoplayer.ConcatenatingSampleSourceProvider;
-import com.google.android.exoplayer.DefaultLoadControl;
-import com.google.android.exoplayer.DefaultTrackSelectionPolicy;
-import com.google.android.exoplayer.DefaultTrackSelector;
-import com.google.android.exoplayer.DefaultTrackSelector.TrackInfo;
-import com.google.android.exoplayer.ExoPlaybackException;
-import com.google.android.exoplayer.ExoPlayer;
-import com.google.android.exoplayer.ExoPlayerFactory;
-import com.google.android.exoplayer.MediaCodecTrackRenderer.DecoderInitializationException;
-import com.google.android.exoplayer.MediaCodecUtil.DecoderQueryException;
-import com.google.android.exoplayer.SampleSourceProvider;
-import com.google.android.exoplayer.SimpleExoPlayer;
-import com.google.android.exoplayer.TrackGroupArray;
-import com.google.android.exoplayer.dash.DashSampleSource;
-import com.google.android.exoplayer.drm.DrmSessionManager;
-import com.google.android.exoplayer.drm.StreamingDrmSessionManager;
-import com.google.android.exoplayer.drm.UnsupportedDrmException;
-import com.google.android.exoplayer.extractor.DefaultExtractorsFactory;
-import com.google.android.exoplayer.extractor.ExtractorSampleSource;
-import com.google.android.exoplayer.hls.HlsSampleSource;
-import com.google.android.exoplayer.metadata.id3.ApicFrame;
-import com.google.android.exoplayer.metadata.id3.GeobFrame;
-import com.google.android.exoplayer.metadata.id3.Id3Frame;
-import com.google.android.exoplayer.metadata.id3.PrivFrame;
-import com.google.android.exoplayer.metadata.id3.TextInformationFrame;
-import com.google.android.exoplayer.metadata.id3.TxxxFrame;
-import com.google.android.exoplayer.smoothstreaming.SmoothStreamingSampleSource;
-import com.google.android.exoplayer.text.CaptionStyleCompat;
-import com.google.android.exoplayer.text.Cue;
-import com.google.android.exoplayer.text.SubtitleLayout;
-import com.google.android.exoplayer.upstream.BandwidthMeter;
-import com.google.android.exoplayer.upstream.DataSourceFactory;
-import com.google.android.exoplayer.upstream.DefaultDataSourceFactory;
-import com.google.android.exoplayer.util.DebugTextViewHelper;
-import com.google.android.exoplayer.util.PlayerControl;
-import com.google.android.exoplayer.util.Util;
+package com.google.android.exoplayer2.demo;
+
+import com.google.android.exoplayer2.AspectRatioFrameLayout;
+import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.ConcatenatingSampleSourceProvider;
+import com.google.android.exoplayer2.DefaultLoadControl;
+import com.google.android.exoplayer2.DefaultTrackSelectionPolicy;
+import com.google.android.exoplayer2.DefaultTrackSelector;
+import com.google.android.exoplayer2.DefaultTrackSelector.TrackInfo;
+import com.google.android.exoplayer2.ExoPlaybackException;
+import com.google.android.exoplayer2.ExoPlayer;
+import com.google.android.exoplayer2.ExoPlayerFactory;
+import com.google.android.exoplayer2.MediaCodecTrackRenderer.DecoderInitializationException;
+import com.google.android.exoplayer2.MediaCodecUtil.DecoderQueryException;
+import com.google.android.exoplayer2.SampleSourceProvider;
+import com.google.android.exoplayer2.SimpleExoPlayer;
+import com.google.android.exoplayer2.TrackGroupArray;
+import com.google.android.exoplayer2.dash.DashSampleSource;
+import com.google.android.exoplayer2.drm.DrmSessionManager;
+import com.google.android.exoplayer2.drm.StreamingDrmSessionManager;
+import com.google.android.exoplayer2.drm.UnsupportedDrmException;
+import com.google.android.exoplayer2.extractor.DefaultExtractorsFactory;
+import com.google.android.exoplayer2.extractor.ExtractorSampleSource;
+import com.google.android.exoplayer2.hls.HlsSampleSource;
+import com.google.android.exoplayer2.metadata.id3.ApicFrame;
+import com.google.android.exoplayer2.metadata.id3.GeobFrame;
+import com.google.android.exoplayer2.metadata.id3.Id3Frame;
+import com.google.android.exoplayer2.metadata.id3.PrivFrame;
+import com.google.android.exoplayer2.metadata.id3.TextInformationFrame;
+import com.google.android.exoplayer2.metadata.id3.TxxxFrame;
+import com.google.android.exoplayer2.smoothstreaming.SmoothStreamingSampleSource;
+import com.google.android.exoplayer2.text.CaptionStyleCompat;
+import com.google.android.exoplayer2.text.Cue;
+import com.google.android.exoplayer2.text.SubtitleLayout;
+import com.google.android.exoplayer2.upstream.BandwidthMeter;
+import com.google.android.exoplayer2.upstream.DataSourceFactory;
+import com.google.android.exoplayer2.upstream.DefaultDataSourceFactory;
+import com.google.android.exoplayer2.util.DebugTextViewHelper;
+import com.google.android.exoplayer2.util.PlayerControl;
+import com.google.android.exoplayer2.util.Util;
 
 import android.Manifest.permission;
 import android.annotation.TargetApi;

demo/src/main/java/com/google/android/exoplayer/demo/SampleChooserActivity.java → demo/src/main/java/com/google/android/exoplayer2/demo/SampleChooserActivity.java

 /*
- * Copyright (C) 2014 The Android Open Source Project
+ * Copyright (C) 2016 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,16 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.android.exoplayer.demo;
-
-import com.google.android.exoplayer.C;
-import com.google.android.exoplayer.ParserException;
-import com.google.android.exoplayer.upstream.DataSource;
-import com.google.android.exoplayer.upstream.DataSourceInputStream;
-import com.google.android.exoplayer.upstream.DataSpec;
-import com.google.android.exoplayer.upstream.DefaultDataSource;
-import com.google.android.exoplayer.util.Assertions;
-import com.google.android.exoplayer.util.Util;
+package com.google.android.exoplayer2.demo;
+
+import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.ParserException;
+import com.google.android.exoplayer2.upstream.DataSource;
+import com.google.android.exoplayer2.upstream.DataSourceInputStream;
+import com.google.android.exoplayer2.upstream.DataSpec;
+import com.google.android.exoplayer2.upstream.DefaultDataSource;
+import com.google.android.exoplayer2.util.Assertions;
+import com.google.android.exoplayer2.util.Util;
 
 import android.app.Activity;
 import android.content.Context;

demo/src/main/java/com/google/android/exoplayer/demo/TestMediaDrmCallback.java → demo/src/main/java/com/google/android/exoplayer2/demo/TestMediaDrmCallback.java

 /*
- * Copyright (C) 2014 The Android Open Source Project
+ * Copyright (C) 2016 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.android.exoplayer.demo;
+package com.google.android.exoplayer2.demo;
 
-import com.google.android.exoplayer.drm.MediaDrmCallback;
-import com.google.android.exoplayer.util.Util;
+import com.google.android.exoplayer2.drm.MediaDrmCallback;
+import com.google.android.exoplayer2.util.Util;
 
 import android.annotation.TargetApi;
 import android.media.MediaDrm.KeyRequest;

demo/src/main/java/com/google/android/exoplayer/demo/TrackSelectionHelper.java → demo/src/main/java/com/google/android/exoplayer2/demo/TrackSelectionHelper.java

 /*
- * Copyright (C) 2014 The Android Open Source Project
+ * Copyright (C) 2016 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,16 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.android.exoplayer.demo;
+package com.google.android.exoplayer2.demo;
 
-import com.google.android.exoplayer.DefaultTrackSelector;
-import com.google.android.exoplayer.DefaultTrackSelector.TrackInfo;
-import com.google.android.exoplayer.Format;
-import com.google.android.exoplayer.TrackGroup;
-import com.google.android.exoplayer.TrackGroupArray;
-import com.google.android.exoplayer.TrackRenderer;
-import com.google.android.exoplayer.TrackSelection;
-import com.google.android.exoplayer.util.MimeTypes;
+import com.google.android.exoplayer2.DefaultTrackSelector;
+import com.google.android.exoplayer2.DefaultTrackSelector.TrackInfo;
+import com.google.android.exoplayer2.Format;
+import com.google.android.exoplayer2.TrackGroup;
+import com.google.android.exoplayer2.TrackGroupArray;
+import com.google.android.exoplayer2.TrackRenderer;
+import com.google.android.exoplayer2.TrackSelection;
+import com.google.android.exoplayer2.util.MimeTypes;
 
 import android.annotation.SuppressLint;
 import android.app.Activity;

demo/src/main/res/layout/list_divider.xml

 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2014 The Android Open Source Project
+<!-- Copyright (C) 2016 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.

demo/src/main/res/layout/player_activity.xml

 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2014 The Android Open Source Project
+<!-- Copyright (C) 2016 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@
     android:layout_height="match_parent"
     android:keepScreenOn="true">
 
-  <com.google.android.exoplayer.AspectRatioFrameLayout android:id="@+id/video_frame"
+  <com.google.android.exoplayer2.AspectRatioFrameLayout android:id="@+id/video_frame"
       android:layout_width="match_parent"
       android:layout_height="match_parent"
       android:layout_gravity="center">
@@ -36,11 +36,11 @@
         android:layout_height="match_parent"
         android:background="@android:color/black"/>
 
-    <com.google.android.exoplayer.text.SubtitleLayout android:id="@+id/subtitles"
+    <com.google.android.exoplayer2.text.SubtitleLayout android:id="@+id/subtitles"
         android:layout_width="match_parent"
         android:layout_height="match_parent"/>
 
-  </com.google.android.exoplayer.AspectRatioFrameLayout>
+  </com.google.android.exoplayer2.AspectRatioFrameLayout>
 
   <LinearLayout
       android:layout_width="match_parent"

demo/src/main/res/layout/sample_chooser_activity.xml

 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2014 The Android Open Source Project
+<!-- Copyright (C) 2016 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.

demo/src/main/res/layout/sample_chooser_inline_header.xml

 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2014 The Android Open Source Project
+<!-- Copyright (C) 2016 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.

demo/src/main/res/layout/track_selection_dialog.xml

 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2014 The Android Open Source Project
+<!-- Copyright (C) 2016 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.

demo/src/main/res/values/strings.xml

 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 The Android Open Source Project
+<!-- Copyright (C) 2016 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.

demo/src/main/res/values/styles.xml

 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 The Android Open Source Project
+<!-- Copyright (C) 2016 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.

extensions/ffmpeg/README.md

@@ -5,7 +5,7 @@
 The FFmpeg extension is a [TrackRenderer][] implementation that uses FFmpeg to
 decode audio.
 
-[TrackRenderer]: https://google.github.io/ExoPlayer/doc/reference/com/google/android/exoplayer/TrackRenderer.html
+[TrackRenderer]: https://google.github.io/ExoPlayer/doc/reference/com/google/android/exoplayer2/TrackRenderer.html
 
 ## Build instructions ##
 

extensions/ffmpeg/build.gradle

-// Copyright (C) 2014 The Android Open Source Project
+// Copyright (C) 2016 The Android Open Source Project
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

extensions/ffmpeg/src/main/AndroidManifest.xml

 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 The Android Open Source Project
+<!-- Copyright (C) 2016 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -14,4 +14,4 @@
      limitations under the License.
 -->
 
-<manifest package="com.google.android.exoplayer.ext.ffmpeg"/>
+<manifest package="com.google.android.exoplayer2.ext.ffmpeg"/>

extensions/ffmpeg/src/main/java/com/google/android/exoplayer/ext/ffmpeg/FfmpegAudioTrackRenderer.java → extensions/ffmpeg/src/main/java/com/google/android/exoplayer2/ext/ffmpeg/FfmpegAudioTrackRenderer.java

 /*
- * Copyright (C) 2014 The Android Open Source Project
+ * Copyright (C) 2016 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.android.exoplayer.ext.ffmpeg;
+package com.google.android.exoplayer2.ext.ffmpeg;
 
-import com.google.android.exoplayer.AudioTrackRendererEventListener;
-import com.google.android.exoplayer.C;
-import com.google.android.exoplayer.Format;
-import com.google.android.exoplayer.extensions.AudioDecoderTrackRenderer;
-import com.google.android.exoplayer.util.MimeTypes;
+import com.google.android.exoplayer2.AudioTrackRendererEventListener;
+import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.Format;
+import com.google.android.exoplayer2.extensions.AudioDecoderTrackRenderer;
+import com.google.android.exoplayer2.util.MimeTypes;
 
 import android.os.Handler;
 

extensions/ffmpeg/src/main/java/com/google/android/exoplayer/ext/ffmpeg/FfmpegDecoder.java → extensions/ffmpeg/src/main/java/com/google/android/exoplayer2/ext/ffmpeg/FfmpegDecoder.java

 /*
- * Copyright (C) 2014 The Android Open Source Project
+ * Copyright (C) 2016 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.android.exoplayer.ext.ffmpeg;
+package com.google.android.exoplayer2.ext.ffmpeg;
 
-import com.google.android.exoplayer.DecoderInputBuffer;
-import com.google.android.exoplayer.extensions.SimpleDecoder;
-import com.google.android.exoplayer.extensions.SimpleOutputBuffer;
-import com.google.android.exoplayer.util.MimeTypes;
+import com.google.android.exoplayer2.DecoderInputBuffer;
+import com.google.android.exoplayer2.extensions.SimpleDecoder;
+import com.google.android.exoplayer2.extensions.SimpleOutputBuffer;
+import com.google.android.exoplayer2.util.MimeTypes;
 
 import java.nio.ByteBuffer;
 import java.util.List;

extensions/ffmpeg/src/main/java/com/google/android/exoplayer/ext/ffmpeg/FfmpegDecoderException.java → extensions/ffmpeg/src/main/java/com/google/android/exoplayer2/ext/ffmpeg/FfmpegDecoderException.java

 /*
- * Copyright (C) 2014 The Android Open Source Project
+ * Copyright (C) 2016 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.android.exoplayer.ext.ffmpeg;
+package com.google.android.exoplayer2.ext.ffmpeg;
 
-import com.google.android.exoplayer.extensions.AudioDecoderException;
+import com.google.android.exoplayer2.extensions.AudioDecoderException;
 
 /**
  * Thrown when an FFmpeg decoder error occurs.

extensions/ffmpeg/src/main/jni/Android.mk

 #
-# Copyright (C) 2014 The Android Open Source Project
+# Copyright (C) 2016 The Android Open Source Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

extensions/ffmpeg/src/main/jni/Application.mk

 #
-# Copyright (C) 2014 The Android Open Source Project
+# Copyright (C) 2016 The Android Open Source Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

extensions/ffmpeg/src/main/jni/ffmpeg_jni.cc

 /*
- * Copyright (C) 2014 The Android Open Source Project
+ * Copyright (C) 2016 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -37,11 +37,11 @@ extern "C" {
 #define FUNC(RETURN_TYPE, NAME, ...) \
   extern "C" { \
   JNIEXPORT RETURN_TYPE \
-    Java_com_google_android_exoplayer_ext_ffmpeg_FfmpegDecoder_ ## NAME \
+    Java_com_google_android_exoplayer2_ext_ffmpeg_FfmpegDecoder_ ## NAME \
       (JNIEnv* env, jobject thiz, ##__VA_ARGS__);\
   } \
   JNIEXPORT RETURN_TYPE \
-    Java_com_google_android_exoplayer_ext_ffmpeg_FfmpegDecoder_ ## NAME \
+    Java_com_google_android_exoplayer2_ext_ffmpeg_FfmpegDecoder_ ## NAME \
       (JNIEnv* env, jobject thiz, ##__VA_ARGS__)\
 
 #define ERROR_STRING_BUFFER_LENGTH 256

extensions/flac/README.md

@@ -6,7 +6,7 @@ The Flac Extension is a [TrackRenderer][] implementation that helps you bundle
 libFLAC (the Flac decoding library) into your app and use it along with
 ExoPlayer to play Flac audio on Android devices.
 
-[TrackRenderer]: https://google.github.io/ExoPlayer/doc/reference/com/google/android/exoplayer/TrackRenderer.html
+[TrackRenderer]: https://google.github.io/ExoPlayer/doc/reference/com/google/android/exoplayer2/TrackRenderer.html
 
 ## Build Instructions ##
 

extensions/flac/src/androidTest/AndroidManifest.xml

@@ -16,7 +16,7 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="com.google.android.exoplayer.ext.flac.test">
+    package="com.google.android.exoplayer2.ext.flac.test">
 
   <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="23"/>
 
@@ -27,7 +27,7 @@
   </application>
 
   <instrumentation
-      android:targetPackage="com.google.android.exoplayer.ext.flac.test"
+      android:targetPackage="com.google.android.exoplayer2.ext.flac.test"
       android:name="android.test.InstrumentationTestRunner"
       tools:replace="android:targetPackage"/>
 

extensions/flac/src/androidTest/java/com/google/android/exoplayer/ext/flac/FlacExtractorTest.java → extensions/flac/src/androidTest/java/com/google/android/exoplayer2/ext/flac/FlacExtractorTest.java

@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.android.exoplayer.ext.flac;
+package com.google.android.exoplayer2.ext.flac;
 
-import com.google.android.exoplayer.extractor.Extractor;
-import com.google.android.exoplayer.testutil.TestUtil;
+import com.google.android.exoplayer2.extractor.Extractor;
+import com.google.android.exoplayer2.testutil.TestUtil;
 
 import android.test.InstrumentationTestCase;
 

extensions/flac/src/androidTest/java/com/google/android/exoplayer/ext/flac/FlacPlaybackTest.java → extensions/flac/src/androidTest/java/com/google/android/exoplayer2/ext/flac/FlacPlaybackTest.java

@@ -13,17 +13,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.android.exoplayer.ext.flac;
-
-import com.google.android.exoplayer.DefaultTrackSelectionPolicy;
-import com.google.android.exoplayer.DefaultTrackSelector;
-import com.google.android.exoplayer.ExoPlaybackException;
-import com.google.android.exoplayer.ExoPlayer;
-import com.google.android.exoplayer.ExoPlayerFactory;
-import com.google.android.exoplayer.TrackRenderer;
-import com.google.android.exoplayer.extractor.ExtractorSampleSource;
-import com.google.android.exoplayer.extractor.mkv.MatroskaExtractor;
-import com.google.android.exoplayer.upstream.DefaultDataSourceFactory;
+package com.google.android.exoplayer2.ext.flac;
+
+import com.google.android.exoplayer2.DefaultTrackSelectionPolicy;
+import com.google.android.exoplayer2.DefaultTrackSelector;
+import com.google.android.exoplayer2.ExoPlaybackException;
+import com.google.android.exoplayer2.ExoPlayer;
+import com.google.android.exoplayer2.ExoPlayerFactory;
+import com.google.android.exoplayer2.TrackRenderer;
+import com.google.android.exoplayer2.extractor.ExtractorSampleSource;
+import com.google.android.exoplayer2.extractor.mkv.MatroskaExtractor;
+import com.google.android.exoplayer2.upstream.DefaultDataSourceFactory;
 
 import android.content.Context;
 import android.net.Uri;

extensions/flac/src/main/AndroidManifest.xml

@@ -14,4 +14,4 @@
      limitations under the License.
 -->
 
-<manifest package="com.google.android.exoplayer.ext.flac"/>
+<manifest package="com.google.android.exoplayer2.ext.flac"/>

extensions/flac/src/main/java/com/google/android/exoplayer/ext/flac/FlacDecoder.java → extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/FlacDecoder.java

@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.android.exoplayer.ext.flac;
+package com.google.android.exoplayer2.ext.flac;
 
-import com.google.android.exoplayer.DecoderInputBuffer;
-import com.google.android.exoplayer.extensions.SimpleDecoder;
-import com.google.android.exoplayer.extensions.SimpleOutputBuffer;
-import com.google.android.exoplayer.util.FlacStreamInfo;
+import com.google.android.exoplayer2.DecoderInputBuffer;
+import com.google.android.exoplayer2.extensions.SimpleDecoder;
+import com.google.android.exoplayer2.extensions.SimpleOutputBuffer;
+import com.google.android.exoplayer2.util.FlacStreamInfo;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;

extensions/flac/src/main/java/com/google/android/exoplayer/ext/flac/FlacDecoderException.java → extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/FlacDecoderException.java

@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.android.exoplayer.ext.flac;
+package com.google.android.exoplayer2.ext.flac;
 
-import com.google.android.exoplayer.extensions.AudioDecoderException;
+import com.google.android.exoplayer2.extensions.AudioDecoderException;
 
 /**
  * Thrown when an Flac decoder error occurs.

extensions/flac/src/main/java/com/google/android/exoplayer/ext/flac/FlacExtractor.java → extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/FlacExtractor.java

@@ -13,20 +13,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.android.exoplayer.ext.flac;
-
-import com.google.android.exoplayer.C;
-import com.google.android.exoplayer.Format;
-import com.google.android.exoplayer.extractor.Extractor;
-import com.google.android.exoplayer.extractor.ExtractorInput;
-import com.google.android.exoplayer.extractor.ExtractorOutput;
-import com.google.android.exoplayer.extractor.ExtractorsFactory;
-import com.google.android.exoplayer.extractor.PositionHolder;
-import com.google.android.exoplayer.extractor.SeekMap;
-import com.google.android.exoplayer.extractor.TrackOutput;
-import com.google.android.exoplayer.util.FlacStreamInfo;
-import com.google.android.exoplayer.util.MimeTypes;
-import com.google.android.exoplayer.util.ParsableByteArray;
+package com.google.android.exoplayer2.ext.flac;
+
+import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.Format;
+import com.google.android.exoplayer2.extractor.Extractor;
+import com.google.android.exoplayer2.extractor.ExtractorInput;
+import com.google.android.exoplayer2.extractor.ExtractorOutput;
+import com.google.android.exoplayer2.extractor.ExtractorsFactory;
+import com.google.android.exoplayer2.extractor.PositionHolder;
+import com.google.android.exoplayer2.extractor.SeekMap;
+import com.google.android.exoplayer2.extractor.TrackOutput;
+import com.google.android.exoplayer2.util.FlacStreamInfo;
+import com.google.android.exoplayer2.util.MimeTypes;
+import com.google.android.exoplayer2.util.ParsableByteArray;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;

extensions/flac/src/main/java/com/google/android/exoplayer/ext/flac/FlacJni.java → extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/FlacJni.java

@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.android.exoplayer.ext.flac;
+package com.google.android.exoplayer2.ext.flac;
 
-import com.google.android.exoplayer.C;
-import com.google.android.exoplayer.extractor.ExtractorInput;
-import com.google.android.exoplayer.util.FlacStreamInfo;
+import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.extractor.ExtractorInput;
+import com.google.android.exoplayer2.util.FlacStreamInfo;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;

extensions/flac/src/main/java/com/google/android/exoplayer/ext/flac/LibflacAudioTrackRenderer.java → extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/LibflacAudioTrackRenderer.java

@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.android.exoplayer.ext.flac;
+package com.google.android.exoplayer2.ext.flac;
 
-import com.google.android.exoplayer.AudioTrackRendererEventListener;
-import com.google.android.exoplayer.Format;
-import com.google.android.exoplayer.extensions.AudioDecoderTrackRenderer;
-import com.google.android.exoplayer.util.MimeTypes;
+import com.google.android.exoplayer2.AudioTrackRendererEventListener;
+import com.google.android.exoplayer2.Format;
+import com.google.android.exoplayer2.extensions.AudioDecoderTrackRenderer;
+import com.google.android.exoplayer2.util.MimeTypes;
 
 import android.os.Handler;
 

extensions/flac/src/main/jni/flac_jni.cc

@@ -31,11 +31,11 @@
 #define FUNC(RETURN_TYPE, NAME, ...)                                       \
   extern "C" {                                                             \
   JNIEXPORT RETURN_TYPE                                                    \
-      Java_com_google_android_exoplayer_ext_flac_FlacJni_##NAME( \
+      Java_com_google_android_exoplayer2_ext_flac_FlacJni_##NAME( \
           JNIEnv *env, jobject thiz, ##__VA_ARGS__);                       \
   }                                                                        \
   JNIEXPORT RETURN_TYPE                                                    \
-      Java_com_google_android_exoplayer_ext_flac_FlacJni_##NAME( \
+      Java_com_google_android_exoplayer2_ext_flac_FlacJni_##NAME( \
           JNIEnv *env, jobject thiz, ##__VA_ARGS__)
 
 class JavaDataSource : public DataSource {
@@ -101,7 +101,7 @@ FUNC(jobject, flacDecodeMetadata, jlong jContext) {
       context->parser->getStreamInfo();
 
   jclass cls = env->FindClass(
-      "com/google/android/exoplayer/util/"
+      "com/google/android/exoplayer2/util/"
       "FlacStreamInfo");
   jmethodID constructor = env->GetMethodID(cls, "<init>", "(IIIIIIIJ)V");
 

extensions/flac/src/main/proguard.cfg

@@ -6,6 +6,6 @@
 }
 
 # Some members of this class are being accessed from native methods. Keep them unobfuscated.
--keep class com.google.android.exoplayer.ext.flac.FlacJni {
+-keep class com.google.android.exoplayer2.ext.flac.FlacJni {
     *;
 }

extensions/okhttp/README.md

@@ -4,6 +4,6 @@
 
 The OkHttp Extension is an [HttpDataSource][] implementation using Square's [OkHttp][].
 
-[HttpDataSource]: https://google.github.io/ExoPlayer/doc/reference/com/google/android/exoplayer/upstream/HttpDataSource.html
+[HttpDataSource]: https://google.github.io/ExoPlayer/doc/reference/com/google/android/exoplayer2/upstream/HttpDataSource.html
 [OkHttp]: https://square.github.io/okhttp/
 

extensions/okhttp/build.gradle

-// Copyright (C) 2014 The Android Open Source Project
+// Copyright (C) 2016 The Android Open Source Project
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

extensions/okhttp/src/main/AndroidManifest.xml

 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 The Android Open Source Project
+<!-- Copyright (C) 2016 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -14,4 +14,4 @@
      limitations under the License.
 -->
 
-<manifest package="com.google.android.exoplayer.ext.okhttp"/>
+<manifest package="com.google.android.exoplayer2.ext.okhttp"/>

extensions/okhttp/src/main/java/com/google/android/exoplayer/ext/okhttp/DefaultOkHttpDataSourceFactory.java → extensions/okhttp/src/main/java/com/google/android/exoplayer2/ext/okhttp/DefaultOkHttpDataSourceFactory.java

 /*
- * Copyright (C) 2014 The Android Open Source Project
+ * Copyright (C) 2016 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.android.exoplayer.ext.okhttp;
+package com.google.android.exoplayer2.ext.okhttp;
 
-import com.google.android.exoplayer.upstream.DataSourceFactory;
-import com.google.android.exoplayer.upstream.DefaultDataSource;
-import com.google.android.exoplayer.upstream.TransferListener;
-import com.google.android.exoplayer.util.Predicate;
+import com.google.android.exoplayer2.upstream.DataSourceFactory;
+import com.google.android.exoplayer2.upstream.DefaultDataSource;
+import com.google.android.exoplayer2.upstream.TransferListener;
+import com.google.android.exoplayer2.util.Predicate;
 
 import android.content.Context;
 

extensions/okhttp/src/main/java/com/google/android/exoplayer/ext/okhttp/OkHttpDataSource.java → extensions/okhttp/src/main/java/com/google/android/exoplayer2/ext/okhttp/OkHttpDataSource.java

 /*
- * Copyright (C) 2014 The Android Open Source Project
+ * Copyright (C) 2016 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.android.exoplayer.ext.okhttp;
+package com.google.android.exoplayer2.ext.okhttp;
 
-import com.google.android.exoplayer.C;
-import com.google.android.exoplayer.upstream.DataSpec;
-import com.google.android.exoplayer.upstream.HttpDataSource;
-import com.google.android.exoplayer.upstream.TransferListener;
-import com.google.android.exoplayer.util.Assertions;
-import com.google.android.exoplayer.util.Predicate;
+import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.upstream.DataSpec;
+import com.google.android.exoplayer2.upstream.HttpDataSource;
+import com.google.android.exoplayer2.upstream.TransferListener;
+import com.google.android.exoplayer2.util.Assertions;
+import com.google.android.exoplayer2.util.Predicate;
 
 import android.net.Uri;
 
@@ -71,7 +71,7 @@ public class OkHttpDataSource implements HttpDataSource {
    * @param userAgent The User-Agent string that should be used.
    * @param contentTypePredicate An optional {@link Predicate}. If a content type is rejected by the
    *     predicate then a
-   *     {@link com.google.android.exoplayer.upstream.HttpDataSource.InvalidContentTypeException} is
+   *     {@link com.google.android.exoplayer2.upstream.HttpDataSource.InvalidContentTypeException} is
    *     thrown from {@link #open(DataSpec)}.
    */
   public OkHttpDataSource(OkHttpClient client, String userAgent,
@@ -84,7 +84,7 @@ public class OkHttpDataSource implements HttpDataSource {
    * @param userAgent The User-Agent string that should be used.
    * @param contentTypePredicate An optional {@link Predicate}. If a content type is rejected by the
    *     predicate then a
-   *     {@link com.google.android.exoplayer.upstream.HttpDataSource.InvalidContentTypeException} is
+   *     {@link com.google.android.exoplayer2.upstream.HttpDataSource.InvalidContentTypeException} is
    *     thrown from {@link #open(DataSpec)}.
    * @param listener An optional listener.
    */
@@ -98,7 +98,7 @@ public class OkHttpDataSource implements HttpDataSource {
    * @param userAgent The User-Agent string that should be used.
    * @param contentTypePredicate An optional {@link Predicate}. If a content type is rejected by the
    *     predicate then a
-   *     {@link com.google.android.exoplayer.upstream.HttpDataSource.InvalidContentTypeException} is
+   *     {@link com.google.android.exoplayer2.upstream.HttpDataSource.InvalidContentTypeException} is
    *     thrown from {@link #open(DataSpec)}.
    * @param listener An optional listener.
    * @param cacheControl An optional {@link CacheControl} which sets all requests' Cache-Control

extensions/opus/README.md

@@ -6,7 +6,7 @@ The Opus Extension is a [TrackRenderer][] implementation that helps you bundle
 libopus (the Opus decoding library) into your app and use it along with
 ExoPlayer to play Opus audio on Android devices.
 
-[TrackRenderer]: https://google.github.io/ExoPlayer/doc/reference/com/google/android/exoplayer/TrackRenderer.html
+[TrackRenderer]: https://google.github.io/ExoPlayer/doc/reference/com/google/android/exoplayer2/TrackRenderer.html
 
 ## Build Instructions ##
 

extensions/opus/build.gradle

-// Copyright (C) 2014 The Android Open Source Project
+// Copyright (C) 2016 The Android Open Source Project
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

extensions/opus/src/androidTest/AndroidManifest.xml

@@ -16,7 +16,7 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="com.google.android.exoplayer.ext.opus.test">
+    package="com.google.android.exoplayer2.ext.opus.test">
 
   <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="23"/>
 
@@ -27,7 +27,7 @@
   </application>
 
   <instrumentation
-      android:targetPackage="com.google.android.exoplayer.ext.opus.test"
+      android:targetPackage="com.google.android.exoplayer2.ext.opus.test"
       android:name="android.test.InstrumentationTestRunner"
       tools:replace="android:targetPackage"/>
 

extensions/opus/src/androidTest/java/com/google/android/exoplayer/ext/opus/OpusPlaybackTest.java → extensions/opus/src/androidTest/java/com/google/android/exoplayer2/ext/opus/OpusPlaybackTest.java

@@ -13,17 +13,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.android.exoplayer.ext.opus;
-
-import com.google.android.exoplayer.DefaultTrackSelectionPolicy;
-import com.google.android.exoplayer.DefaultTrackSelector;
-import com.google.android.exoplayer.ExoPlaybackException;
-import com.google.android.exoplayer.ExoPlayer;
-import com.google.android.exoplayer.ExoPlayerFactory;
-import com.google.android.exoplayer.TrackRenderer;
-import com.google.android.exoplayer.extractor.ExtractorSampleSource;
-import com.google.android.exoplayer.extractor.mkv.MatroskaExtractor;
-import com.google.android.exoplayer.upstream.DefaultDataSourceFactory;
+package com.google.android.exoplayer2.ext.opus;
+
+import com.google.android.exoplayer2.DefaultTrackSelectionPolicy;
+import com.google.android.exoplayer2.DefaultTrackSelector;
+import com.google.android.exoplayer2.ExoPlaybackException;
+import com.google.android.exoplayer2.ExoPlayer;
+import com.google.android.exoplayer2.ExoPlayerFactory;
+import com.google.android.exoplayer2.TrackRenderer;
+import com.google.android.exoplayer2.extractor.ExtractorSampleSource;
+import com.google.android.exoplayer2.extractor.mkv.MatroskaExtractor;
+import com.google.android.exoplayer2.upstream.DefaultDataSourceFactory;
 
 import android.content.Context;
 import android.net.Uri;

extensions/opus/src/main/AndroidManifest.xml

 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 The Android Open Source Project
+<!-- Copyright (C) 2016 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -14,4 +14,4 @@
      limitations under the License.
 -->
 
-<manifest package="com.google.android.exoplayer.ext.opus"/>
+<manifest package="com.google.android.exoplayer2.ext.opus"/>

extensions/opus/src/main/java/com/google/android/exoplayer/ext/opus/LibopusAudioTrackRenderer.java → extensions/opus/src/main/java/com/google/android/exoplayer2/ext/opus/LibopusAudioTrackRenderer.java

 /*
- * Copyright (C) 2014 The Android Open Source Project
+ * Copyright (C) 2016 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.android.exoplayer.ext.opus;
+package com.google.android.exoplayer2.ext.opus;
 
-import com.google.android.exoplayer.AudioTrackRendererEventListener;
-import com.google.android.exoplayer.Format;
-import com.google.android.exoplayer.extensions.AudioDecoderTrackRenderer;
-import com.google.android.exoplayer.util.MimeTypes;
+import com.google.android.exoplayer2.AudioTrackRendererEventListener;
+import com.google.android.exoplayer2.Format;
+import com.google.android.exoplayer2.extensions.AudioDecoderTrackRenderer;
+import com.google.android.exoplayer2.util.MimeTypes;
 
 import android.os.Handler;
 

extensions/opus/src/main/java/com/google/android/exoplayer/ext/opus/OpusDecoder.java → extensions/opus/src/main/java/com/google/android/exoplayer2/ext/opus/OpusDecoder.java

 /*
- * Copyright (C) 2014 The Android Open Source Project
+ * Copyright (C) 2016 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.android.exoplayer.ext.opus;
+package com.google.android.exoplayer2.ext.opus;
 
-import com.google.android.exoplayer.C;
-import com.google.android.exoplayer.DecoderInputBuffer;
-import com.google.android.exoplayer.extensions.SimpleDecoder;
-import com.google.android.exoplayer.extensions.SimpleOutputBuffer;
+import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.DecoderInputBuffer;
+import com.google.android.exoplayer2.extensions.SimpleDecoder;
+import com.google.android.exoplayer2.extensions.SimpleOutputBuffer;
 
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;

extensions/opus/src/main/java/com/google/android/exoplayer/ext/opus/OpusDecoderException.java → extensions/opus/src/main/java/com/google/android/exoplayer2/ext/opus/OpusDecoderException.java

 /*
- * Copyright (C) 2014 The Android Open Source Project
+ * Copyright (C) 2016 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.android.exoplayer.ext.opus;
+package com.google.android.exoplayer2.ext.opus;
 
-import com.google.android.exoplayer.extensions.AudioDecoderException;
+import com.google.android.exoplayer2.extensions.AudioDecoderException;
 
 /**
  * Thrown when an Opus decoder error occurs.

extensions/opus/src/main/jni/Android.mk

 #
-# Copyright (C) 2014 The Android Open Source Project
+# Copyright (C) 2016 The Android Open Source Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

extensions/opus/src/main/jni/Application.mk

 #
-# Copyright (C) 2014 The Android Open Source Project
+# Copyright (C) 2016 The Android Open Source Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

extensions/opus/src/main/jni/convert_android_asm.sh

 #!/bin/bash
 #
-# Copyright (C) 2014 The Android Open Source Project
+# Copyright (C) 2016 The Android Open Source Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

extensions/opus/src/main/jni/libopus.mk

 #
-# Copyright (C) 2014 The Android Open Source Project
+# Copyright (C) 2016 The Android Open Source Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

extensions/opus/src/main/jni/opus_jni.cc

 /*
- * Copyright (C) 2014 The Android Open Source Project
+ * Copyright (C) 2016 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -30,11 +30,11 @@
 #define FUNC(RETURN_TYPE, NAME, ...) \
   extern "C" { \
   JNIEXPORT RETURN_TYPE \
-    Java_com_google_android_exoplayer_ext_opus_OpusDecoder_ ## NAME \
+    Java_com_google_android_exoplayer2_ext_opus_OpusDecoder_ ## NAME \
       (JNIEnv* env, jobject thiz, ##__VA_ARGS__);\
   } \
   JNIEXPORT RETURN_TYPE \
-    Java_com_google_android_exoplayer_ext_opus_OpusDecoder_ ## NAME \
+    Java_com_google_android_exoplayer2_ext_opus_OpusDecoder_ ## NAME \
       (JNIEnv* env, jobject thiz, ##__VA_ARGS__)\
 
 jint JNI_OnLoad(JavaVM* vm, void* reserved) {

extensions/vp9/README.md

@@ -6,7 +6,7 @@ The VP9 Extension is a [TrackRenderer][] implementation that helps you bundle
 libvpx (the VP9 decoding library) into your app and use it along with ExoPlayer
 to play VP9 video on Android devices.
 
-[TrackRenderer]: https://google.github.io/ExoPlayer/doc/reference/com/google/android/exoplayer/TrackRenderer.html
+[TrackRenderer]: https://google.github.io/ExoPlayer/doc/reference/com/google/android/exoplayer2/TrackRenderer.html
 
 ## Build Instructions ##
 

extensions/vp9/build.gradle

-// Copyright (C) 2014 The Android Open Source Project
+// Copyright (C) 2016 The Android Open Source Project
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

extensions/vp9/src/androidTest/AndroidManifest.xml

 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 The Android Open Source Project
+<!-- Copyright (C) 2016 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="com.google.android.exoplayer.ext.vp9.test">
+    package="com.google.android.exoplayer2.ext.vp9.test">
 
   <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="23"/>
 
@@ -27,7 +27,7 @@
   </application>
 
   <instrumentation
-      android:targetPackage="com.google.android.exoplayer.ext.vp9.test"
+      android:targetPackage="com.google.android.exoplayer2.ext.vp9.test"
       android:name="android.test.InstrumentationTestRunner"
       tools:replace="android:targetPackage"/>
 

extensions/vp9/src/androidTest/java/com/google/android/exoplayer/ext/vp9/VpxPlaybackTest.java → extensions/vp9/src/androidTest/java/com/google/android/exoplayer2/ext/vp9/VpxPlaybackTest.java

 /*
- * Copyright (C) 2014 The Android Open Source Project
+ * Copyright (C) 2016 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,17 +13,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.android.exoplayer.ext.vp9;
-
-import com.google.android.exoplayer.DefaultTrackSelectionPolicy;
-import com.google.android.exoplayer.DefaultTrackSelector;
-import com.google.android.exoplayer.ExoPlaybackException;
-import com.google.android.exoplayer.ExoPlayer;
-import com.google.android.exoplayer.ExoPlayerFactory;
-import com.google.android.exoplayer.TrackRenderer;
-import com.google.android.exoplayer.extractor.ExtractorSampleSource;
-import com.google.android.exoplayer.extractor.mkv.MatroskaExtractor;
-import com.google.android.exoplayer.upstream.DefaultDataSourceFactory;
+package com.google.android.exoplayer2.ext.vp9;
+
+import com.google.android.exoplayer2.DefaultTrackSelectionPolicy;
+import com.google.android.exoplayer2.DefaultTrackSelector;
+import com.google.android.exoplayer2.ExoPlaybackException;
+import com.google.android.exoplayer2.ExoPlayer;
+import com.google.android.exoplayer2.ExoPlayerFactory;
+import com.google.android.exoplayer2.TrackRenderer;
+import com.google.android.exoplayer2.extractor.ExtractorSampleSource;
+import com.google.android.exoplayer2.extractor.mkv.MatroskaExtractor;
+import com.google.android.exoplayer2.upstream.DefaultDataSourceFactory;
 
 import android.content.Context;
 import android.net.Uri;

extensions/vp9/src/main/AndroidManifest.xml

 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 The Android Open Source Project
+<!-- Copyright (C) 2016 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@
 -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.google.android.exoplayer.ext.vp9">
+    package="com.google.android.exoplayer2.ext.vp9">
 
   <uses-feature android:glEsVersion="0x00020000"/>
 

extensions/vp9/src/main/java/com/google/android/exoplayer/ext/vp9/LibvpxVideoTrackRenderer.java → extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/LibvpxVideoTrackRenderer.java

 /*
- * Copyright (C) 2014 The Android Open Source Project
+ * Copyright (C) 2016 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,21 +13,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.android.exoplayer.ext.vp9;
-
-import com.google.android.exoplayer.C;
-import com.google.android.exoplayer.CodecCounters;
-import com.google.android.exoplayer.DecoderInputBuffer;
-import com.google.android.exoplayer.ExoPlaybackException;
-import com.google.android.exoplayer.ExoPlayer;
-import com.google.android.exoplayer.Format;
-import com.google.android.exoplayer.FormatHolder;
-import com.google.android.exoplayer.TrackRenderer;
-import com.google.android.exoplayer.TrackStream;
-import com.google.android.exoplayer.VideoTrackRendererEventListener;
-import com.google.android.exoplayer.VideoTrackRendererEventListener.EventDispatcher;
-import com.google.android.exoplayer.util.MimeTypes;
-import com.google.android.exoplayer.util.TraceUtil;
+package com.google.android.exoplayer2.ext.vp9;
+
+import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.CodecCounters;
+import com.google.android.exoplayer2.DecoderInputBuffer;
+import com.google.android.exoplayer2.ExoPlaybackException;
+import com.google.android.exoplayer2.ExoPlayer;
+import com.google.android.exoplayer2.Format;
+import com.google.android.exoplayer2.FormatHolder;
+import com.google.android.exoplayer2.TrackRenderer;
+import com.google.android.exoplayer2.TrackStream;
+import com.google.android.exoplayer2.VideoTrackRendererEventListener;
+import com.google.android.exoplayer2.VideoTrackRendererEventListener.EventDispatcher;
+import com.google.android.exoplayer2.util.MimeTypes;
+import com.google.android.exoplayer2.util.TraceUtil;
 
 import android.graphics.Bitmap;
 import android.graphics.Canvas;

extensions/vp9/src/main/java/com/google/android/exoplayer/ext/vp9/VpxDecoder.java → extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxDecoder.java

 /*
- * Copyright (C) 2014 The Android Open Source Project
+ * Copyright (C) 2016 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.android.exoplayer.ext.vp9;
+package com.google.android.exoplayer2.ext.vp9;
 
-import com.google.android.exoplayer.C;
-import com.google.android.exoplayer.DecoderInputBuffer;
-import com.google.android.exoplayer.extensions.SimpleDecoder;
+import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.DecoderInputBuffer;
+import com.google.android.exoplayer2.extensions.SimpleDecoder;
 
 import java.nio.ByteBuffer;
 

extensions/vp9/src/main/java/com/google/android/exoplayer/ext/vp9/VpxDecoderException.java → extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxDecoderException.java

 /*
- * Copyright (C) 2014 The Android Open Source Project
+ * Copyright (C) 2016 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.android.exoplayer.ext.vp9;
+package com.google.android.exoplayer2.ext.vp9;
 
 /**
  * Thrown when a libvpx decoder error occurs.

extensions/vp9/src/main/java/com/google/android/exoplayer/ext/vp9/VpxOutputBuffer.java → extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxOutputBuffer.java

 /*
- * Copyright (C) 2015 The Android Open Source Project
+ * Copyright (C) 2016 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.android.exoplayer.ext.vp9;
+package com.google.android.exoplayer2.ext.vp9;
 
-import com.google.android.exoplayer.extensions.OutputBuffer;
+import com.google.android.exoplayer2.extensions.OutputBuffer;
 
 import java.nio.ByteBuffer;
 

extensions/vp9/src/main/java/com/google/android/exoplayer/ext/vp9/VpxOutputBufferRenderer.java → extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxOutputBufferRenderer.java

 /*
- * Copyright (C) 2015 The Android Open Source Project
+ * Copyright (C) 2016 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.android.exoplayer.ext.vp9;
+package com.google.android.exoplayer2.ext.vp9;
 
 /**
  * Renders the {@link VpxOutputBuffer}.

extensions/vp9/src/main/java/com/google/android/exoplayer/ext/vp9/VpxRenderer.java → extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxRenderer.java

 /*
- * Copyright (C) 2014 The Android Open Source Project
+ * Copyright (C) 2016 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.android.exoplayer.ext.vp9;
+package com.google.android.exoplayer2.ext.vp9;
 
 import android.opengl.GLES20;
 import android.opengl.GLSurfaceView;

extensions/vp9/src/main/java/com/google/android/exoplayer/ext/vp9/VpxVideoSurfaceView.java → extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxVideoSurfaceView.java

 /*
- * Copyright (C) 2014 The Android Open Source Project
+ * Copyright (C) 2016 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.android.exoplayer.ext.vp9;
+package com.google.android.exoplayer2.ext.vp9;
 
 import android.annotation.TargetApi;
 import android.content.Context;

extensions/vp9/src/main/jni/Android.mk

 #
-# Copyright (C) 2014 The Android Open Source Project
+# Copyright (C) 2016 The Android Open Source Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

extensions/vp9/src/main/jni/Application.mk

 #
-# Copyright (C) 2014 The Android Open Source Project
+# Copyright (C) 2016 The Android Open Source Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

extensions/vp9/src/main/jni/generate_libvpx_android_configs.sh

 #!/bin/bash
 #
-# Copyright (C) 2014 The Android Open Source Project
+# Copyright (C) 2016 The Android Open Source Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

extensions/vp9/src/main/jni/libvpx.mk

 #
-# Copyright (C) 2014 The Android Open Source Project
+# Copyright (C) 2016 The Android Open Source Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

extensions/vp9/src/main/jni/vpx_jni.cc

 /*
- * Copyright (C) 2014 The Android Open Source Project
+ * Copyright (C) 2016 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -37,11 +37,11 @@
 #define FUNC(RETURN_TYPE, NAME, ...) \
   extern "C" { \
   JNIEXPORT RETURN_TYPE \
-    Java_com_google_android_exoplayer_ext_vp9_VpxDecoder_ ## NAME \
+    Java_com_google_android_exoplayer2_ext_vp9_VpxDecoder_ ## NAME \
       (JNIEnv* env, jobject thiz, ##__VA_ARGS__);\
   } \
   JNIEXPORT RETURN_TYPE \
-    Java_com_google_android_exoplayer_ext_vp9_VpxDecoder_ ## NAME \
+    Java_com_google_android_exoplayer2_ext_vp9_VpxDecoder_ ## NAME \
       (JNIEnv* env, jobject thiz, ##__VA_ARGS__)\
 
 // JNI references for VpxOutputBuffer class.
@@ -69,7 +69,7 @@ FUNC(jlong, vpxInit) {
 
   // Populate JNI References.
   const jclass outputBufferClass = env->FindClass(
-      "com/google/android/exoplayer/ext/vp9/VpxOutputBuffer");
+      "com/google/android/exoplayer2/ext/vp9/VpxOutputBuffer");
   initForYuvFrame = env->GetMethodID(outputBufferClass, "initForYuvFrame",
                                      "(IIIII)V");
   initForRgbFrame = env->GetMethodID(outputBufferClass, "initForRgbFrame",

extensions/vp9/src/main/proguard.cfg

@@ -6,6 +6,6 @@
 }
 
 # Some members of this class are being accessed from native methods. Keep them unobfuscated.
--keep class com.google.android.exoplayer.ext.vp9.VpxOutputBuffer {
+-keep class com.google.android.exoplayer2.ext.vp9.VpxOutputBuffer {
     *;
 }

library/build.gradle

 import com.android.builder.core.BuilderConstants
 
-// Copyright (C) 2014 The Android Open Source Project
+// Copyright (C) 2016 The Android Open Source Project
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

library/src/androidTest/AndroidManifest.xml

 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 The Android Open Source Project
+<!-- Copyright (C) 2016 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="com.google.android.exoplayer.test">
+    package="com.google.android.exoplayer2.test">
 
   <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="23"/>
 
@@ -27,7 +27,7 @@
   </application>
 
   <instrumentation
-      android:targetPackage="com.google.android.exoplayer.test"
+      android:targetPackage="com.google.android.exoplayer2.test"
       android:name="android.test.InstrumentationTestRunner"
       tools:replace="android:targetPackage"/>
 

library/src/androidTest/java/com/google/android/exoplayer/CTest.java → library/src/androidTest/java/com/google/android/exoplayer2/CTest.java

 /*
- * Copyright (C) 2014 The Android Open Source Project
+ * Copyright (C) 2016 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.android.exoplayer;
+package com.google.android.exoplayer2;
 
 import android.annotation.SuppressLint;
 import android.media.MediaCodec;

library/src/androidTest/java/com/google/android/exoplayer/FormatTest.java → library/src/androidTest/java/com/google/android/exoplayer2/FormatTest.java

 /*
- * Copyright (C) 2014 The Android Open Source Project
+ * Copyright (C) 2016 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,16 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.android.exoplayer;
+package com.google.android.exoplayer2;
 
-import static com.google.android.exoplayer.C.WIDEVINE_UUID;
-import static com.google.android.exoplayer.util.MimeTypes.VIDEO_MP4;
-import static com.google.android.exoplayer.util.MimeTypes.VIDEO_WEBM;
+import static com.google.android.exoplayer2.C.WIDEVINE_UUID;
+import static com.google.android.exoplayer2.util.MimeTypes.VIDEO_MP4;
+import static com.google.android.exoplayer2.util.MimeTypes.VIDEO_WEBM;
 
-import com.google.android.exoplayer.drm.DrmInitData;
-import com.google.android.exoplayer.testutil.TestUtil;
-import com.google.android.exoplayer.util.MimeTypes;
-import com.google.android.exoplayer.util.Util;
+import com.google.android.exoplayer2.drm.DrmInitData;
+import com.google.android.exoplayer2.testutil.TestUtil;
+import com.google.android.exoplayer2.util.MimeTypes;
+import com.google.android.exoplayer2.util.Util;
 
 import android.annotation.SuppressLint;
 import android.annotation.TargetApi;

library/src/androidTest/java/com/google/android/exoplayer/dash/DashChunkSourceTest.java → library/src/androidTest/java/com/google/android/exoplayer2/dash/DashChunkSourceTest.java

 /*
- * Copyright (C) 2014 The Android Open Source Project
+ * Copyright (C) 2016 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.android.exoplayer.dash;
+package com.google.android.exoplayer2.dash;
 
-import com.google.android.exoplayer.Format;
-import com.google.android.exoplayer.testutil.TestUtil;
-import com.google.android.exoplayer.util.MimeTypes;
+import com.google.android.exoplayer2.Format;
+import com.google.android.exoplayer2.testutil.TestUtil;
+import com.google.android.exoplayer2.util.MimeTypes;
 
 import android.test.InstrumentationTestCase;
 

library/src/androidTest/java/com/google/android/exoplayer/dash/mpd/MediaPresentationDescriptionParserTest.java → library/src/androidTest/java/com/google/android/exoplayer2/dash/mpd/MediaPresentationDescriptionParserTest.java

 /*
- * Copyright (C) 2014 The Android Open Source Project
+ * Copyright (C) 2016 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.android.exoplayer.dash.mpd;
+package com.google.android.exoplayer2.dash.mpd;
 
 import android.net.Uri;
 import android.test.InstrumentationTestCase;

library/src/androidTest/java/com/google/android/exoplayer/dash/mpd/RangedUriTest.java → library/src/androidTest/java/com/google/android/exoplayer2/dash/mpd/RangedUriTest.java

 /*
- * Copyright (C) 2014 The Android Open Source Project
+ * Copyright (C) 2016 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.android.exoplayer.dash.mpd;
+package com.google.android.exoplayer2.dash.mpd;
 
 import junit.framework.TestCase;
 

library/src/androidTest/java/com/google/android/exoplayer/dash/mpd/RepresentationTest.java → library/src/androidTest/java/com/google/android/exoplayer2/dash/mpd/RepresentationTest.java

 /*
- * Copyright (C) 2014 The Android Open Source Project
+ * Copyright (C) 2016 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.android.exoplayer.dash.mpd;
+package com.google.android.exoplayer2.dash.mpd;
 
-import com.google.android.exoplayer.Format;
-import com.google.android.exoplayer.dash.mpd.SegmentBase.SingleSegmentBase;
-import com.google.android.exoplayer.util.MimeTypes;
+import com.google.android.exoplayer2.Format;
+import com.google.android.exoplayer2.dash.mpd.SegmentBase.SingleSegmentBase;
+import com.google.android.exoplayer2.util.MimeTypes;
 
 import junit.framework.TestCase;
 

library/src/androidTest/java/com/google/android/exoplayer/dash/mpd/UrlTemplateTest.java → library/src/androidTest/java/com/google/android/exoplayer2/dash/mpd/UrlTemplateTest.java

 /*
- * Copyright (C) 2014 The Android Open Source Project
+ * Copyright (C) 2016 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.android.exoplayer.dash.mpd;
+package com.google.android.exoplayer2.dash.mpd;
 
 import junit.framework.TestCase;
 

library/src/androidTest/java/com/google/android/exoplayer/drm/DrmInitDataTest.java → library/src/androidTest/java/com/google/android/exoplayer2/drm/DrmInitDataTest.java

 /*
- * Copyright (C) 2014 The Android Open Source Project
+ * Copyright (C) 2016 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,15 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.android.exoplayer.drm;
+package com.google.android.exoplayer2.drm;
 
-import static com.google.android.exoplayer.C.PLAYREADY_UUID;
-import static com.google.android.exoplayer.C.WIDEVINE_UUID;
-import static com.google.android.exoplayer.util.MimeTypes.VIDEO_MP4;
+import static com.google.android.exoplayer2.C.PLAYREADY_UUID;
+import static com.google.android.exoplayer2.C.WIDEVINE_UUID;
+import static com.google.android.exoplayer2.util.MimeTypes.VIDEO_MP4;
 
-import com.google.android.exoplayer.C;
-import com.google.android.exoplayer.drm.DrmInitData.SchemeData;
-import com.google.android.exoplayer.testutil.TestUtil;
+import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.drm.DrmInitData.SchemeData;
+import com.google.android.exoplayer2.testutil.TestUtil;
 
 import android.os.Parcel;
 import android.test.MoreAsserts;

library/src/androidTest/java/com/google/android/exoplayer/extractor/DefaultExtractorInputTest.java → library/src/androidTest/java/com/google/android/exoplayer2/extractor/DefaultExtractorInputTest.java

 /*
- * Copyright (C) 2014 The Android Open Source Project
+ * Copyright (C) 2016 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.android.exoplayer.extractor;
+package com.google.android.exoplayer2.extractor;
 
-import com.google.android.exoplayer.C;
-import com.google.android.exoplayer.testutil.FakeDataSource;
-import com.google.android.exoplayer.upstream.DataSpec;
+import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.testutil.FakeDataSource;
+import com.google.android.exoplayer2.upstream.DataSpec;
 
 import android.net.Uri;
 

library/src/androidTest/java/com/google/android/exoplayer/extractor/ExtractorTest.java → library/src/androidTest/java/com/google/android/exoplayer2/extractor/ExtractorTest.java

 /*
- * Copyright (C) 2014 The Android Open Source Project
+ * Copyright (C) 2016 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.android.exoplayer.extractor;
+package com.google.android.exoplayer2.extractor;
 
-import com.google.android.exoplayer.C;
+import com.google.android.exoplayer2.C;
 
 import junit.framework.TestCase;
 

library/src/androidTest/java/com/google/android/exoplayer/extractor/flv/FlvExtractorTest.java → library/src/androidTest/java/com/google/android/exoplayer2/extractor/flv/FlvExtractorTest.java

@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.android.exoplayer.extractor.flv;
+package com.google.android.exoplayer2.extractor.flv;
 
-import com.google.android.exoplayer.extractor.Extractor;
-import com.google.android.exoplayer.testutil.TestUtil;
+import com.google.android.exoplayer2.extractor.Extractor;
+import com.google.android.exoplayer2.testutil.TestUtil;
 
 import android.test.InstrumentationTestCase;
 

library/src/androidTest/java/com/google/android/exoplayer/extractor/mkv/DefaultEbmlReaderTest.java → library/src/androidTest/java/com/google/android/exoplayer2/extractor/mkv/DefaultEbmlReaderTest.java

 /*
- * Copyright (C) 2014 The Android Open Source Project
+ * Copyright (C) 2016 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.android.exoplayer.extractor.mkv;
+package com.google.android.exoplayer2.extractor.mkv;
 
-import com.google.android.exoplayer.extractor.ExtractorInput;
-import com.google.android.exoplayer.testutil.FakeExtractorInput;
-import com.google.android.exoplayer.testutil.TestUtil;
+import com.google.android.exoplayer2.extractor.ExtractorInput;
+import com.google.android.exoplayer2.testutil.FakeExtractorInput;
+import com.google.android.exoplayer2.testutil.TestUtil;
 
 import junit.framework.TestCase;
 

library/src/androidTest/java/com/google/android/exoplayer/extractor/mkv/MatroskaExtractorTest.java → library/src/androidTest/java/com/google/android/exoplayer2/extractor/mkv/MatroskaExtractorTest.java

 /*
- * Copyright (C) 2014 The Android Open Source Project
+ * Copyright (C) 2016 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.android.exoplayer.extractor.mkv;
+package com.google.android.exoplayer2.extractor.mkv;
 
-import com.google.android.exoplayer.extractor.Extractor;
-import com.google.android.exoplayer.testutil.TestUtil;
+import com.google.android.exoplayer2.extractor.Extractor;
+import com.google.android.exoplayer2.testutil.TestUtil;
 
 import android.test.InstrumentationTestCase;
 

library/src/androidTest/java/com/google/android/exoplayer/extractor/mkv/VarintReaderTest.java → library/src/androidTest/java/com/google/android/exoplayer2/extractor/mkv/VarintReaderTest.java

 /*
- * Copyright (C) 2014 The Android Open Source Project
+ * Copyright (C) 2016 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.android.exoplayer.extractor.mkv;
+package com.google.android.exoplayer2.extractor.mkv;
 
-import com.google.android.exoplayer.C;
-import com.google.android.exoplayer.extractor.ExtractorInput;
-import com.google.android.exoplayer.testutil.FakeExtractorInput;
-import com.google.android.exoplayer.testutil.FakeExtractorInput.SimulatedIOException;
+import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.extractor.ExtractorInput;
+import com.google.android.exoplayer2.testutil.FakeExtractorInput;
+import com.google.android.exoplayer2.testutil.FakeExtractorInput.SimulatedIOException;
 
 import junit.framework.TestCase;
 

library/src/androidTest/java/com/google/android/exoplayer/extractor/mp3/Mp3ExtractorTest.java → library/src/androidTest/java/com/google/android/exoplayer2/extractor/mp3/Mp3ExtractorTest.java

@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.android.exoplayer.extractor.mp3;
+package com.google.android.exoplayer2.extractor.mp3;
 
-import com.google.android.exoplayer.extractor.Extractor;
-import com.google.android.exoplayer.testutil.TestUtil;
+import com.google.android.exoplayer2.extractor.Extractor;
+import com.google.android.exoplayer2.testutil.TestUtil;
 
 import android.test.InstrumentationTestCase;
 

library/src/androidTest/java/com/google/android/exoplayer/extractor/mp3/XingSeekerTest.java → library/src/androidTest/java/com/google/android/exoplayer2/extractor/mp3/XingSeekerTest.java

 /*
- * Copyright (C) 2014 The Android Open Source Project
+ * Copyright (C) 2016 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.android.exoplayer.extractor.mp3;
+package com.google.android.exoplayer2.extractor.mp3;
 
-import com.google.android.exoplayer.C;
-import com.google.android.exoplayer.util.MpegAudioHeader;
-import com.google.android.exoplayer.util.ParsableByteArray;
-import com.google.android.exoplayer.util.Util;
+import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.util.MpegAudioHeader;
+import com.google.android.exoplayer2.util.ParsableByteArray;
+import com.google.android.exoplayer2.util.Util;
 
 import android.test.InstrumentationTestCase;
 

library/src/androidTest/java/com/google/android/exoplayer/extractor/mp4/FragmentedMp4ExtractorTest.java → library/src/androidTest/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4ExtractorTest.java

@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.android.exoplayer.extractor.mp4;
+package com.google.android.exoplayer2.extractor.mp4;
 
-import com.google.android.exoplayer.extractor.Extractor;
-import com.google.android.exoplayer.testutil.TestUtil;
+import com.google.android.exoplayer2.extractor.Extractor;
+import com.google.android.exoplayer2.testutil.TestUtil;
 
 import android.test.InstrumentationTestCase;
 

library/src/androidTest/java/com/google/android/exoplayer/extractor/mp4/Mp4ExtractorTest.java → library/src/androidTest/java/com/google/android/exoplayer2/extractor/mp4/Mp4ExtractorTest.java

 /*
- * Copyright (C) 2014 The Android Open Source Project
+ * Copyright (C) 2016 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.android.exoplayer.extractor.mp4;
+package com.google.android.exoplayer2.extractor.mp4;
 
-import com.google.android.exoplayer.extractor.Extractor;
-import com.google.android.exoplayer.testutil.TestUtil;
+import com.google.android.exoplayer2.extractor.Extractor;
+import com.google.android.exoplayer2.testutil.TestUtil;
 
 import android.annotation.TargetApi;
 import android.test.InstrumentationTestCase;

library/src/androidTest/java/com/google/android/exoplayer/extractor/ogg/DefaultOggSeekerTest.java → library/src/androidTest/java/com/google/android/exoplayer2/extractor/ogg/DefaultOggSeekerTest.java

 /*
- * Copyright (C) 2015 The Android Open Source Project
+ * Copyright (C) 2016 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.android.exoplayer.extractor.ogg;
+package com.google.android.exoplayer2.extractor.ogg;
 
-import com.google.android.exoplayer.C;
-import com.google.android.exoplayer.testutil.FakeExtractorInput;
-import com.google.android.exoplayer.util.ParsableByteArray;
+import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.testutil.FakeExtractorInput;
+import com.google.android.exoplayer2.util.ParsableByteArray;
 
 import junit.framework.TestCase;
 

library/src/androidTest/java/com/google/android/exoplayer/extractor/ogg/DefaultOggSeekerUtilMethodsTest.java → library/src/androidTest/java/com/google/android/exoplayer2/extractor/ogg/DefaultOggSeekerUtilMethodsTest.java

 /*
- * Copyright (C) 2015 The Android Open Source Project
+ * Copyright (C) 2016 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.android.exoplayer.extractor.ogg;
+package com.google.android.exoplayer2.extractor.ogg;
 
-import com.google.android.exoplayer.extractor.ExtractorInput;
-import com.google.android.exoplayer.testutil.FakeExtractorInput;
-import com.google.android.exoplayer.testutil.TestUtil;
+import com.google.android.exoplayer2.extractor.ExtractorInput;
+import com.google.android.exoplayer2.testutil.FakeExtractorInput;
+import com.google.android.exoplayer2.testutil.TestUtil;
 
 import junit.framework.TestCase;
 

library/src/androidTest/java/com/google/android/exoplayer/extractor/ogg/OggExtractorTest.java → library/src/androidTest/java/com/google/android/exoplayer2/extractor/ogg/OggExtractorTest.java

@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.android.exoplayer.extractor.ogg;
+package com.google.android.exoplayer2.extractor.ogg;
 
-import com.google.android.exoplayer.extractor.Extractor;
-import com.google.android.exoplayer.testutil.FakeExtractorInput;
-import com.google.android.exoplayer.testutil.TestUtil;
-import com.google.android.exoplayer.testutil.TestUtil.ExtractorFactory;
+import com.google.android.exoplayer2.extractor.Extractor;
+import com.google.android.exoplayer2.testutil.FakeExtractorInput;
+import com.google.android.exoplayer2.testutil.TestUtil;
+import com.google.android.exoplayer2.testutil.TestUtil.ExtractorFactory;
 
 import android.test.InstrumentationTestCase;
 

library/src/androidTest/java/com/google/android/exoplayer/extractor/ogg/OggPacketTest.java → library/src/androidTest/java/com/google/android/exoplayer2/extractor/ogg/OggPacketTest.java

 /*
- * Copyright (C) 2015 The Android Open Source Project
+ * Copyright (C) 2016 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.android.exoplayer.extractor.ogg;
+package com.google.android.exoplayer2.extractor.ogg;
 
-import com.google.android.exoplayer.testutil.FakeExtractorInput;
-import com.google.android.exoplayer.testutil.TestUtil;
-import com.google.android.exoplayer.util.ParsableByteArray;
+import com.google.android.exoplayer2.testutil.FakeExtractorInput;
+import com.google.android.exoplayer2.testutil.TestUtil;
+import com.google.android.exoplayer2.util.ParsableByteArray;
 
 import android.test.InstrumentationTestCase;
 import android.test.MoreAsserts;

library/src/androidTest/java/com/google/android/exoplayer/extractor/ogg/OggPageHeaderTest.java → library/src/androidTest/java/com/google/android/exoplayer2/extractor/ogg/OggPageHeaderTest.java

 /*
- * Copyright (C) 2015 The Android Open Source Project
+ * Copyright (C) 2016 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.android.exoplayer.extractor.ogg;
+package com.google.android.exoplayer2.extractor.ogg;
 
-import com.google.android.exoplayer.testutil.FakeExtractorInput;
-import com.google.android.exoplayer.testutil.FakeExtractorInput.SimulatedIOException;
-import com.google.android.exoplayer.testutil.TestUtil;
+import com.google.android.exoplayer2.testutil.FakeExtractorInput;
+import com.google.android.exoplayer2.testutil.FakeExtractorInput.SimulatedIOException;
+import com.google.android.exoplayer2.testutil.TestUtil;
 
 import junit.framework.TestCase;
 

library/src/androidTest/java/com/google/android/exoplayer/extractor/ogg/OggTestFile.java → library/src/androidTest/java/com/google/android/exoplayer2/extractor/ogg/OggTestFile.java

@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.android.exoplayer.extractor.ogg;
+package com.google.android.exoplayer2.extractor.ogg;
 
-import com.google.android.exoplayer.testutil.TestUtil;
+import com.google.android.exoplayer2.testutil.TestUtil;
 
 import junit.framework.Assert;
 

library/src/androidTest/java/com/google/android/exoplayer/extractor/ogg/TestData.java → library/src/androidTest/java/com/google/android/exoplayer2/extractor/ogg/TestData.java

 /*
- * Copyright (C) 2015 The Android Open Source Project
+ * Copyright (C) 2016 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.android.exoplayer.extractor.ogg;
+package com.google.android.exoplayer2.extractor.ogg;
 
-import com.google.android.exoplayer.testutil.FakeExtractorInput;
-import com.google.android.exoplayer.testutil.TestUtil;
+import com.google.android.exoplayer2.testutil.FakeExtractorInput;
+import com.google.android.exoplayer2.testutil.TestUtil;
 
 /**
  * Provides ogg/vorbis test data in bytes for unit tests.

library/src/androidTest/java/com/google/android/exoplayer/extractor/ogg/VorbisBitArrayTest.java → library/src/androidTest/java/com/google/android/exoplayer2/extractor/ogg/VorbisBitArrayTest.java

 /*
- * Copyright (C) 2015 The Android Open Source Project
+ * Copyright (C) 2016 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.android.exoplayer.extractor.ogg;
+package com.google.android.exoplayer2.extractor.ogg;
 
-import com.google.android.exoplayer.testutil.TestUtil;
+import com.google.android.exoplayer2.testutil.TestUtil;
 
 import junit.framework.TestCase;