diff --git a/build.gradle b/build.gradle index 7e24099ded..d1d0633fe4 100644 --- a/build.gradle +++ b/build.gradle @@ -1,4 +1,4 @@ -// 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. diff --git a/demo/build.gradle b/demo/build.gradle index 7dd176bd0a..89a6b3619b 100644 --- a/demo/build.gradle +++ b/demo/build.gradle @@ -1,4 +1,4 @@ -// 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. diff --git a/demo/src/main/AndroidManifest.xml b/demo/src/main/AndroidManifest.xml index 08458d9f2e..2d27e440b8 100644 --- a/demo/src/main/AndroidManifest.xml +++ b/demo/src/main/AndroidManifest.xml @@ -1,5 +1,5 @@ - @@ -31,7 +31,7 @@ android:largeHeap="true" android:allowBackup="false"> - @@ -52,7 +52,7 @@ - - - + diff --git a/extensions/ffmpeg/src/main/java/com/google/android/exoplayer/ext/ffmpeg/FfmpegAudioTrackRenderer.java b/extensions/ffmpeg/src/main/java/com/google/android/exoplayer2/ext/ffmpeg/FfmpegAudioTrackRenderer.java similarity index 84% rename from extensions/ffmpeg/src/main/java/com/google/android/exoplayer/ext/ffmpeg/FfmpegAudioTrackRenderer.java rename to extensions/ffmpeg/src/main/java/com/google/android/exoplayer2/ext/ffmpeg/FfmpegAudioTrackRenderer.java index 8eb8afbbff..66e1eef1cc 100644 --- a/extensions/ffmpeg/src/main/java/com/google/android/exoplayer/ext/ffmpeg/FfmpegAudioTrackRenderer.java +++ b/extensions/ffmpeg/src/main/java/com/google/android/exoplayer2/ext/ffmpeg/FfmpegAudioTrackRenderer.java @@ -1,5 +1,5 @@ /* - * 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; diff --git a/extensions/ffmpeg/src/main/java/com/google/android/exoplayer/ext/ffmpeg/FfmpegDecoder.java b/extensions/ffmpeg/src/main/java/com/google/android/exoplayer2/ext/ffmpeg/FfmpegDecoder.java similarity index 95% rename from extensions/ffmpeg/src/main/java/com/google/android/exoplayer/ext/ffmpeg/FfmpegDecoder.java rename to extensions/ffmpeg/src/main/java/com/google/android/exoplayer2/ext/ffmpeg/FfmpegDecoder.java index 7a5b2e4223..376385226f 100644 --- a/extensions/ffmpeg/src/main/java/com/google/android/exoplayer/ext/ffmpeg/FfmpegDecoder.java +++ b/extensions/ffmpeg/src/main/java/com/google/android/exoplayer2/ext/ffmpeg/FfmpegDecoder.java @@ -1,5 +1,5 @@ /* - * 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; diff --git a/extensions/ffmpeg/src/main/java/com/google/android/exoplayer/ext/ffmpeg/FfmpegDecoderException.java b/extensions/ffmpeg/src/main/java/com/google/android/exoplayer2/ext/ffmpeg/FfmpegDecoderException.java similarity index 81% rename from extensions/ffmpeg/src/main/java/com/google/android/exoplayer/ext/ffmpeg/FfmpegDecoderException.java rename to extensions/ffmpeg/src/main/java/com/google/android/exoplayer2/ext/ffmpeg/FfmpegDecoderException.java index 46199ff75d..a00c1f9c12 100644 --- a/extensions/ffmpeg/src/main/java/com/google/android/exoplayer/ext/ffmpeg/FfmpegDecoderException.java +++ b/extensions/ffmpeg/src/main/java/com/google/android/exoplayer2/ext/ffmpeg/FfmpegDecoderException.java @@ -1,5 +1,5 @@ /* - * 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. diff --git a/extensions/ffmpeg/src/main/jni/Android.mk b/extensions/ffmpeg/src/main/jni/Android.mk index 99bb6adce3..f435ab7e98 100644 --- a/extensions/ffmpeg/src/main/jni/Android.mk +++ b/extensions/ffmpeg/src/main/jni/Android.mk @@ -1,5 +1,5 @@ # -# 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. diff --git a/extensions/ffmpeg/src/main/jni/Application.mk b/extensions/ffmpeg/src/main/jni/Application.mk index 7dc417cda1..59bf5f8f87 100644 --- a/extensions/ffmpeg/src/main/jni/Application.mk +++ b/extensions/ffmpeg/src/main/jni/Application.mk @@ -1,5 +1,5 @@ # -# 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. diff --git a/extensions/ffmpeg/src/main/jni/ffmpeg_jni.cc b/extensions/ffmpeg/src/main/jni/ffmpeg_jni.cc index 8ebbfd5fb1..c69b4ecd77 100644 --- a/extensions/ffmpeg/src/main/jni/ffmpeg_jni.cc +++ b/extensions/ffmpeg/src/main/jni/ffmpeg_jni.cc @@ -1,5 +1,5 @@ /* - * 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 diff --git a/extensions/flac/README.md b/extensions/flac/README.md index 8a5b295621..c85c8f51d4 100644 --- a/extensions/flac/README.md +++ b/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 ## diff --git a/extensions/flac/src/androidTest/AndroidManifest.xml b/extensions/flac/src/androidTest/AndroidManifest.xml index 764b7e98d1..536f3d2f81 100644 --- a/extensions/flac/src/androidTest/AndroidManifest.xml +++ b/extensions/flac/src/androidTest/AndroidManifest.xml @@ -16,7 +16,7 @@ + package="com.google.android.exoplayer2.ext.flac.test"> @@ -27,7 +27,7 @@ diff --git a/extensions/flac/src/androidTest/java/com/google/android/exoplayer/ext/flac/FlacExtractorTest.java b/extensions/flac/src/androidTest/java/com/google/android/exoplayer2/ext/flac/FlacExtractorTest.java similarity index 86% rename from extensions/flac/src/androidTest/java/com/google/android/exoplayer/ext/flac/FlacExtractorTest.java rename to extensions/flac/src/androidTest/java/com/google/android/exoplayer2/ext/flac/FlacExtractorTest.java index 8706affd94..1ee523b2f3 100644 --- a/extensions/flac/src/androidTest/java/com/google/android/exoplayer/ext/flac/FlacExtractorTest.java +++ b/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; diff --git a/extensions/flac/src/androidTest/java/com/google/android/exoplayer/ext/flac/FlacPlaybackTest.java b/extensions/flac/src/androidTest/java/com/google/android/exoplayer2/ext/flac/FlacPlaybackTest.java similarity index 84% rename from extensions/flac/src/androidTest/java/com/google/android/exoplayer/ext/flac/FlacPlaybackTest.java rename to extensions/flac/src/androidTest/java/com/google/android/exoplayer2/ext/flac/FlacPlaybackTest.java index 6c4ea7e065..f100bcc205 100644 --- a/extensions/flac/src/androidTest/java/com/google/android/exoplayer/ext/flac/FlacPlaybackTest.java +++ b/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; +package com.google.android.exoplayer2.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; +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; diff --git a/extensions/flac/src/main/AndroidManifest.xml b/extensions/flac/src/main/AndroidManifest.xml index 73e3a4b77c..1d68b376ac 100644 --- a/extensions/flac/src/main/AndroidManifest.xml +++ b/extensions/flac/src/main/AndroidManifest.xml @@ -14,4 +14,4 @@ limitations under the License. --> - + diff --git a/extensions/flac/src/main/java/com/google/android/exoplayer/ext/flac/FlacDecoder.java b/extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/FlacDecoder.java similarity index 91% rename from extensions/flac/src/main/java/com/google/android/exoplayer/ext/flac/FlacDecoder.java rename to extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/FlacDecoder.java index 11bb07091a..fe99a1fe9c 100644 --- a/extensions/flac/src/main/java/com/google/android/exoplayer/ext/flac/FlacDecoder.java +++ b/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; diff --git a/extensions/flac/src/main/java/com/google/android/exoplayer/ext/flac/FlacDecoderException.java b/extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/FlacDecoderException.java similarity index 87% rename from extensions/flac/src/main/java/com/google/android/exoplayer/ext/flac/FlacDecoderException.java rename to extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/FlacDecoderException.java index 77524b1a8c..384343cd9d 100644 --- a/extensions/flac/src/main/java/com/google/android/exoplayer/ext/flac/FlacDecoderException.java +++ b/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. diff --git a/extensions/flac/src/main/java/com/google/android/exoplayer/ext/flac/FlacExtractor.java b/extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/FlacExtractor.java similarity index 85% rename from extensions/flac/src/main/java/com/google/android/exoplayer/ext/flac/FlacExtractor.java rename to extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/FlacExtractor.java index 2c81ee5390..0f93334e87 100644 --- a/extensions/flac/src/main/java/com/google/android/exoplayer/ext/flac/FlacExtractor.java +++ b/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; +package com.google.android.exoplayer2.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; +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; diff --git a/extensions/flac/src/main/java/com/google/android/exoplayer/ext/flac/FlacJni.java b/extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/FlacJni.java similarity index 96% rename from extensions/flac/src/main/java/com/google/android/exoplayer/ext/flac/FlacJni.java rename to extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/FlacJni.java index e661fb6f4c..85511acfd7 100644 --- a/extensions/flac/src/main/java/com/google/android/exoplayer/ext/flac/FlacJni.java +++ b/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; diff --git a/extensions/flac/src/main/java/com/google/android/exoplayer/ext/flac/LibflacAudioTrackRenderer.java b/extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/LibflacAudioTrackRenderer.java similarity index 86% rename from extensions/flac/src/main/java/com/google/android/exoplayer/ext/flac/LibflacAudioTrackRenderer.java rename to extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/LibflacAudioTrackRenderer.java index ccc2cbd8b0..f75560d933 100644 --- a/extensions/flac/src/main/java/com/google/android/exoplayer/ext/flac/LibflacAudioTrackRenderer.java +++ b/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; diff --git a/extensions/flac/src/main/jni/flac_jni.cc b/extensions/flac/src/main/jni/flac_jni.cc index c81f9843e3..71be6e46db 100644 --- a/extensions/flac/src/main/jni/flac_jni.cc +++ b/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, "", "(IIIIIIIJ)V"); diff --git a/extensions/flac/src/main/proguard.cfg b/extensions/flac/src/main/proguard.cfg index d951cd9496..4c4ca19854 100644 --- a/extensions/flac/src/main/proguard.cfg +++ b/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 { *; } diff --git a/extensions/okhttp/README.md b/extensions/okhttp/README.md index 688bf8e08a..06cd324be2 100644 --- a/extensions/okhttp/README.md +++ b/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/ diff --git a/extensions/okhttp/build.gradle b/extensions/okhttp/build.gradle index f7c3ce6256..4e5ef1af8f 100644 --- a/extensions/okhttp/build.gradle +++ b/extensions/okhttp/build.gradle @@ -1,4 +1,4 @@ -// 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. diff --git a/extensions/okhttp/src/main/AndroidManifest.xml b/extensions/okhttp/src/main/AndroidManifest.xml index ac81b8840a..eeb181014a 100644 --- a/extensions/okhttp/src/main/AndroidManifest.xml +++ b/extensions/okhttp/src/main/AndroidManifest.xml @@ -1,5 +1,5 @@ - - + diff --git a/extensions/okhttp/src/main/java/com/google/android/exoplayer/ext/okhttp/DefaultOkHttpDataSourceFactory.java b/extensions/okhttp/src/main/java/com/google/android/exoplayer2/ext/okhttp/DefaultOkHttpDataSourceFactory.java similarity index 85% rename from extensions/okhttp/src/main/java/com/google/android/exoplayer/ext/okhttp/DefaultOkHttpDataSourceFactory.java rename to extensions/okhttp/src/main/java/com/google/android/exoplayer2/ext/okhttp/DefaultOkHttpDataSourceFactory.java index 52d077fcfd..394dbf35df 100644 --- a/extensions/okhttp/src/main/java/com/google/android/exoplayer/ext/okhttp/DefaultOkHttpDataSourceFactory.java +++ b/extensions/okhttp/src/main/java/com/google/android/exoplayer2/ext/okhttp/DefaultOkHttpDataSourceFactory.java @@ -1,5 +1,5 @@ /* - * 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; diff --git a/extensions/okhttp/src/main/java/com/google/android/exoplayer/ext/okhttp/OkHttpDataSource.java b/extensions/okhttp/src/main/java/com/google/android/exoplayer2/ext/okhttp/OkHttpDataSource.java similarity index 94% rename from extensions/okhttp/src/main/java/com/google/android/exoplayer/ext/okhttp/OkHttpDataSource.java rename to extensions/okhttp/src/main/java/com/google/android/exoplayer2/ext/okhttp/OkHttpDataSource.java index 7ed77aebe2..9bb4edfa58 100644 --- a/extensions/okhttp/src/main/java/com/google/android/exoplayer/ext/okhttp/OkHttpDataSource.java +++ b/extensions/okhttp/src/main/java/com/google/android/exoplayer2/ext/okhttp/OkHttpDataSource.java @@ -1,5 +1,5 @@ /* - * 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 diff --git a/extensions/opus/README.md b/extensions/opus/README.md index bdf5fb2602..3a2bdcf04a 100644 --- a/extensions/opus/README.md +++ b/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 ## diff --git a/extensions/opus/build.gradle b/extensions/opus/build.gradle index 9ccc1862aa..e170263d74 100644 --- a/extensions/opus/build.gradle +++ b/extensions/opus/build.gradle @@ -1,4 +1,4 @@ -// 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. diff --git a/extensions/opus/src/androidTest/AndroidManifest.xml b/extensions/opus/src/androidTest/AndroidManifest.xml index 7b1516a08a..f4168ba3ec 100644 --- a/extensions/opus/src/androidTest/AndroidManifest.xml +++ b/extensions/opus/src/androidTest/AndroidManifest.xml @@ -16,7 +16,7 @@ + package="com.google.android.exoplayer2.ext.opus.test"> @@ -27,7 +27,7 @@ diff --git a/extensions/opus/src/androidTest/java/com/google/android/exoplayer/ext/opus/OpusPlaybackTest.java b/extensions/opus/src/androidTest/java/com/google/android/exoplayer2/ext/opus/OpusPlaybackTest.java similarity index 84% rename from extensions/opus/src/androidTest/java/com/google/android/exoplayer/ext/opus/OpusPlaybackTest.java rename to extensions/opus/src/androidTest/java/com/google/android/exoplayer2/ext/opus/OpusPlaybackTest.java index 4ab3ecab60..79098c730c 100644 --- a/extensions/opus/src/androidTest/java/com/google/android/exoplayer/ext/opus/OpusPlaybackTest.java +++ b/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; +package com.google.android.exoplayer2.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; +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; diff --git a/extensions/opus/src/main/AndroidManifest.xml b/extensions/opus/src/main/AndroidManifest.xml index c3d7e76b09..220b74d494 100644 --- a/extensions/opus/src/main/AndroidManifest.xml +++ b/extensions/opus/src/main/AndroidManifest.xml @@ -1,5 +1,5 @@ - - + diff --git a/extensions/opus/src/main/java/com/google/android/exoplayer/ext/opus/LibopusAudioTrackRenderer.java b/extensions/opus/src/main/java/com/google/android/exoplayer2/ext/opus/LibopusAudioTrackRenderer.java similarity index 86% rename from extensions/opus/src/main/java/com/google/android/exoplayer/ext/opus/LibopusAudioTrackRenderer.java rename to extensions/opus/src/main/java/com/google/android/exoplayer2/ext/opus/LibopusAudioTrackRenderer.java index d70261e058..7b5cb592be 100644 --- a/extensions/opus/src/main/java/com/google/android/exoplayer/ext/opus/LibopusAudioTrackRenderer.java +++ b/extensions/opus/src/main/java/com/google/android/exoplayer2/ext/opus/LibopusAudioTrackRenderer.java @@ -1,5 +1,5 @@ /* - * 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; diff --git a/extensions/opus/src/main/java/com/google/android/exoplayer/ext/opus/OpusDecoder.java b/extensions/opus/src/main/java/com/google/android/exoplayer2/ext/opus/OpusDecoder.java similarity index 95% rename from extensions/opus/src/main/java/com/google/android/exoplayer/ext/opus/OpusDecoder.java rename to extensions/opus/src/main/java/com/google/android/exoplayer2/ext/opus/OpusDecoder.java index 8f5a70a7f5..f9bbdefeb5 100644 --- a/extensions/opus/src/main/java/com/google/android/exoplayer/ext/opus/OpusDecoder.java +++ b/extensions/opus/src/main/java/com/google/android/exoplayer2/ext/opus/OpusDecoder.java @@ -1,5 +1,5 @@ /* - * 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; diff --git a/extensions/opus/src/main/java/com/google/android/exoplayer/ext/opus/OpusDecoderException.java b/extensions/opus/src/main/java/com/google/android/exoplayer2/ext/opus/OpusDecoderException.java similarity index 81% rename from extensions/opus/src/main/java/com/google/android/exoplayer/ext/opus/OpusDecoderException.java rename to extensions/opus/src/main/java/com/google/android/exoplayer2/ext/opus/OpusDecoderException.java index d1868f6171..8eb4473e6e 100644 --- a/extensions/opus/src/main/java/com/google/android/exoplayer/ext/opus/OpusDecoderException.java +++ b/extensions/opus/src/main/java/com/google/android/exoplayer2/ext/opus/OpusDecoderException.java @@ -1,5 +1,5 @@ /* - * 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. diff --git a/extensions/opus/src/main/jni/Android.mk b/extensions/opus/src/main/jni/Android.mk index 892715e9c6..2ceb8fc4f7 100644 --- a/extensions/opus/src/main/jni/Android.mk +++ b/extensions/opus/src/main/jni/Android.mk @@ -1,5 +1,5 @@ # -# 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. diff --git a/extensions/opus/src/main/jni/Application.mk b/extensions/opus/src/main/jni/Application.mk index 7dc417cda1..59bf5f8f87 100644 --- a/extensions/opus/src/main/jni/Application.mk +++ b/extensions/opus/src/main/jni/Application.mk @@ -1,5 +1,5 @@ # -# 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. diff --git a/extensions/opus/src/main/jni/convert_android_asm.sh b/extensions/opus/src/main/jni/convert_android_asm.sh index c789c66a1a..e8aa255842 100755 --- a/extensions/opus/src/main/jni/convert_android_asm.sh +++ b/extensions/opus/src/main/jni/convert_android_asm.sh @@ -1,6 +1,6 @@ #!/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. diff --git a/extensions/opus/src/main/jni/libopus.mk b/extensions/opus/src/main/jni/libopus.mk index 2eb5476e66..0a5dd15b5a 100644 --- a/extensions/opus/src/main/jni/libopus.mk +++ b/extensions/opus/src/main/jni/libopus.mk @@ -1,5 +1,5 @@ # -# 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. diff --git a/extensions/opus/src/main/jni/opus_jni.cc b/extensions/opus/src/main/jni/opus_jni.cc index b15da26565..8214d0e140 100644 --- a/extensions/opus/src/main/jni/opus_jni.cc +++ b/extensions/opus/src/main/jni/opus_jni.cc @@ -1,5 +1,5 @@ /* - * 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) { diff --git a/extensions/vp9/README.md b/extensions/vp9/README.md index 1937d47b2b..d181bf0585 100644 --- a/extensions/vp9/README.md +++ b/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 ## diff --git a/extensions/vp9/build.gradle b/extensions/vp9/build.gradle index 9ccc1862aa..e170263d74 100644 --- a/extensions/vp9/build.gradle +++ b/extensions/vp9/build.gradle @@ -1,4 +1,4 @@ -// 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. diff --git a/extensions/vp9/src/androidTest/AndroidManifest.xml b/extensions/vp9/src/androidTest/AndroidManifest.xml index a2859b3c3c..9529023996 100644 --- a/extensions/vp9/src/androidTest/AndroidManifest.xml +++ b/extensions/vp9/src/androidTest/AndroidManifest.xml @@ -1,5 +1,5 @@ - + package="com.google.android.exoplayer2.ext.vp9"> diff --git a/extensions/vp9/src/main/java/com/google/android/exoplayer/ext/vp9/LibvpxVideoTrackRenderer.java b/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/LibvpxVideoTrackRenderer.java similarity index 94% rename from extensions/vp9/src/main/java/com/google/android/exoplayer/ext/vp9/LibvpxVideoTrackRenderer.java rename to extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/LibvpxVideoTrackRenderer.java index d02f2bf318..dc91d71968 100644 --- a/extensions/vp9/src/main/java/com/google/android/exoplayer/ext/vp9/LibvpxVideoTrackRenderer.java +++ b/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/LibvpxVideoTrackRenderer.java @@ -1,5 +1,5 @@ /* - * 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; +package com.google.android.exoplayer2.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; +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; diff --git a/extensions/vp9/src/main/java/com/google/android/exoplayer/ext/vp9/VpxDecoder.java b/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxDecoder.java similarity index 93% rename from extensions/vp9/src/main/java/com/google/android/exoplayer/ext/vp9/VpxDecoder.java rename to extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxDecoder.java index acaf6fc3a7..4a657b5a2e 100644 --- a/extensions/vp9/src/main/java/com/google/android/exoplayer/ext/vp9/VpxDecoder.java +++ b/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxDecoder.java @@ -1,5 +1,5 @@ /* - * 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; diff --git a/extensions/vp9/src/main/java/com/google/android/exoplayer/ext/vp9/VpxDecoderException.java b/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxDecoderException.java similarity index 88% rename from extensions/vp9/src/main/java/com/google/android/exoplayer/ext/vp9/VpxDecoderException.java rename to extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxDecoderException.java index 6d08f1b0d1..94ed8e9fdd 100644 --- a/extensions/vp9/src/main/java/com/google/android/exoplayer/ext/vp9/VpxDecoderException.java +++ b/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxDecoderException.java @@ -1,5 +1,5 @@ /* - * 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. diff --git a/extensions/vp9/src/main/java/com/google/android/exoplayer/ext/vp9/VpxOutputBuffer.java b/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxOutputBuffer.java similarity index 95% rename from extensions/vp9/src/main/java/com/google/android/exoplayer/ext/vp9/VpxOutputBuffer.java rename to extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxOutputBuffer.java index 53e8d15e6a..72adce8fcc 100644 --- a/extensions/vp9/src/main/java/com/google/android/exoplayer/ext/vp9/VpxOutputBuffer.java +++ b/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxOutputBuffer.java @@ -1,5 +1,5 @@ /* - * 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; diff --git a/extensions/vp9/src/main/java/com/google/android/exoplayer/ext/vp9/VpxOutputBufferRenderer.java b/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxOutputBufferRenderer.java similarity index 89% rename from extensions/vp9/src/main/java/com/google/android/exoplayer/ext/vp9/VpxOutputBufferRenderer.java rename to extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxOutputBufferRenderer.java index 0ab1fc475e..8f43a0207b 100644 --- a/extensions/vp9/src/main/java/com/google/android/exoplayer/ext/vp9/VpxOutputBufferRenderer.java +++ b/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxOutputBufferRenderer.java @@ -1,5 +1,5 @@ /* - * 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}. diff --git a/extensions/vp9/src/main/java/com/google/android/exoplayer/ext/vp9/VpxRenderer.java b/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxRenderer.java similarity index 98% rename from extensions/vp9/src/main/java/com/google/android/exoplayer/ext/vp9/VpxRenderer.java rename to extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxRenderer.java index 195898182c..9303b09382 100644 --- a/extensions/vp9/src/main/java/com/google/android/exoplayer/ext/vp9/VpxRenderer.java +++ b/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxRenderer.java @@ -1,5 +1,5 @@ /* - * 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; diff --git a/extensions/vp9/src/main/java/com/google/android/exoplayer/ext/vp9/VpxVideoSurfaceView.java b/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxVideoSurfaceView.java similarity index 93% rename from extensions/vp9/src/main/java/com/google/android/exoplayer/ext/vp9/VpxVideoSurfaceView.java rename to extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxVideoSurfaceView.java index 47d0770abe..e7468d8593 100644 --- a/extensions/vp9/src/main/java/com/google/android/exoplayer/ext/vp9/VpxVideoSurfaceView.java +++ b/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxVideoSurfaceView.java @@ -1,5 +1,5 @@ /* - * 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; diff --git a/extensions/vp9/src/main/jni/Android.mk b/extensions/vp9/src/main/jni/Android.mk index f2d8a99a90..8ad32a254a 100644 --- a/extensions/vp9/src/main/jni/Android.mk +++ b/extensions/vp9/src/main/jni/Android.mk @@ -1,5 +1,5 @@ # -# 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. diff --git a/extensions/vp9/src/main/jni/Application.mk b/extensions/vp9/src/main/jni/Application.mk index 7dc417cda1..59bf5f8f87 100644 --- a/extensions/vp9/src/main/jni/Application.mk +++ b/extensions/vp9/src/main/jni/Application.mk @@ -1,5 +1,5 @@ # -# 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. diff --git a/extensions/vp9/src/main/jni/generate_libvpx_android_configs.sh b/extensions/vp9/src/main/jni/generate_libvpx_android_configs.sh index 951dcc0dfe..9b166c3a96 100755 --- a/extensions/vp9/src/main/jni/generate_libvpx_android_configs.sh +++ b/extensions/vp9/src/main/jni/generate_libvpx_android_configs.sh @@ -1,6 +1,6 @@ #!/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. diff --git a/extensions/vp9/src/main/jni/libvpx.mk b/extensions/vp9/src/main/jni/libvpx.mk index 369b3b7f94..6cc706ffa8 100644 --- a/extensions/vp9/src/main/jni/libvpx.mk +++ b/extensions/vp9/src/main/jni/libvpx.mk @@ -1,5 +1,5 @@ # -# 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. diff --git a/extensions/vp9/src/main/jni/vpx_jni.cc b/extensions/vp9/src/main/jni/vpx_jni.cc index a3abe24399..484a23ba6c 100644 --- a/extensions/vp9/src/main/jni/vpx_jni.cc +++ b/extensions/vp9/src/main/jni/vpx_jni.cc @@ -1,5 +1,5 @@ /* - * 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", diff --git a/extensions/vp9/src/main/proguard.cfg b/extensions/vp9/src/main/proguard.cfg index 41a8b85a7e..d64773da2f 100644 --- a/extensions/vp9/src/main/proguard.cfg +++ b/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 { *; } diff --git a/library/build.gradle b/library/build.gradle index 94dd66b7c7..3eb31aaf44 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -1,6 +1,6 @@ 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. diff --git a/library/src/androidTest/AndroidManifest.xml b/library/src/androidTest/AndroidManifest.xml index 6d2b1f6d08..98f2f6acfe 100644 --- a/library/src/androidTest/AndroidManifest.xml +++ b/library/src/androidTest/AndroidManifest.xml @@ -1,5 +1,5 @@ - - + diff --git a/library/src/main/java/com/google/android/exoplayer/AdaptiveSourceEventListener.java b/library/src/main/java/com/google/android/exoplayer2/AdaptiveSourceEventListener.java similarity index 98% rename from library/src/main/java/com/google/android/exoplayer/AdaptiveSourceEventListener.java rename to library/src/main/java/com/google/android/exoplayer2/AdaptiveSourceEventListener.java index 6ce4e13093..d83546fbc3 100644 --- a/library/src/main/java/com/google/android/exoplayer/AdaptiveSourceEventListener.java +++ b/library/src/main/java/com/google/android/exoplayer2/AdaptiveSourceEventListener.java @@ -1,5 +1,5 @@ /* - * 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; +package com.google.android.exoplayer2; -import com.google.android.exoplayer.chunk.FormatEvaluator; -import com.google.android.exoplayer.upstream.DataSpec; -import com.google.android.exoplayer.util.Assertions; +import com.google.android.exoplayer2.chunk.FormatEvaluator; +import com.google.android.exoplayer2.upstream.DataSpec; +import com.google.android.exoplayer2.util.Assertions; import android.os.Handler; import android.os.SystemClock; diff --git a/library/src/main/java/com/google/android/exoplayer/AspectRatioFrameLayout.java b/library/src/main/java/com/google/android/exoplayer2/AspectRatioFrameLayout.java similarity index 96% rename from library/src/main/java/com/google/android/exoplayer/AspectRatioFrameLayout.java rename to library/src/main/java/com/google/android/exoplayer2/AspectRatioFrameLayout.java index 92e9a1f798..54993b4ad2 100644 --- a/library/src/main/java/com/google/android/exoplayer/AspectRatioFrameLayout.java +++ b/library/src/main/java/com/google/android/exoplayer2/AspectRatioFrameLayout.java @@ -1,5 +1,5 @@ /* - * 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.content.Context; import android.util.AttributeSet; diff --git a/library/src/main/java/com/google/android/exoplayer/AudioTrackRendererEventListener.java b/library/src/main/java/com/google/android/exoplayer2/AudioTrackRendererEventListener.java similarity index 96% rename from library/src/main/java/com/google/android/exoplayer/AudioTrackRendererEventListener.java rename to library/src/main/java/com/google/android/exoplayer2/AudioTrackRendererEventListener.java index c04fce2875..49dc79f4c4 100644 --- a/library/src/main/java/com/google/android/exoplayer/AudioTrackRendererEventListener.java +++ b/library/src/main/java/com/google/android/exoplayer2/AudioTrackRendererEventListener.java @@ -13,10 +13,10 @@ * 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 com.google.android.exoplayer.audio.AudioTrack; -import com.google.android.exoplayer.util.Assertions; +import com.google.android.exoplayer2.audio.AudioTrack; +import com.google.android.exoplayer2.util.Assertions; import android.os.Handler; import android.os.SystemClock; diff --git a/library/src/main/java/com/google/android/exoplayer/BehindLiveWindowException.java b/library/src/main/java/com/google/android/exoplayer2/BehindLiveWindowException.java similarity index 89% rename from library/src/main/java/com/google/android/exoplayer/BehindLiveWindowException.java rename to library/src/main/java/com/google/android/exoplayer2/BehindLiveWindowException.java index e175de649c..45938730ed 100644 --- a/library/src/main/java/com/google/android/exoplayer/BehindLiveWindowException.java +++ b/library/src/main/java/com/google/android/exoplayer2/BehindLiveWindowException.java @@ -1,5 +1,5 @@ /* - * 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 java.io.IOException; diff --git a/library/src/main/java/com/google/android/exoplayer/C.java b/library/src/main/java/com/google/android/exoplayer2/C.java similarity index 98% rename from library/src/main/java/com/google/android/exoplayer/C.java rename to library/src/main/java/com/google/android/exoplayer2/C.java index 89fa60c9e8..fed993c360 100644 --- a/library/src/main/java/com/google/android/exoplayer/C.java +++ b/library/src/main/java/com/google/android/exoplayer2/C.java @@ -1,5 +1,5 @@ /* - * 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; +package com.google.android.exoplayer2; -import com.google.android.exoplayer.util.Util; +import com.google.android.exoplayer2.util.Util; import android.media.AudioFormat; import android.media.MediaCodec; diff --git a/library/src/main/java/com/google/android/exoplayer/CodecCounters.java b/library/src/main/java/com/google/android/exoplayer2/CodecCounters.java similarity index 97% rename from library/src/main/java/com/google/android/exoplayer/CodecCounters.java rename to library/src/main/java/com/google/android/exoplayer2/CodecCounters.java index e1c2c7b4ce..73147a8001 100644 --- a/library/src/main/java/com/google/android/exoplayer/CodecCounters.java +++ b/library/src/main/java/com/google/android/exoplayer2/CodecCounters.java @@ -1,5 +1,5 @@ /* - * 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; /** * Maintains codec event counts, for debugging purposes only. diff --git a/library/src/main/java/com/google/android/exoplayer/CompositeSequenceableLoader.java b/library/src/main/java/com/google/android/exoplayer2/CompositeSequenceableLoader.java similarity index 95% rename from library/src/main/java/com/google/android/exoplayer/CompositeSequenceableLoader.java rename to library/src/main/java/com/google/android/exoplayer2/CompositeSequenceableLoader.java index c6f494b34f..3be4f065dd 100644 --- a/library/src/main/java/com/google/android/exoplayer/CompositeSequenceableLoader.java +++ b/library/src/main/java/com/google/android/exoplayer2/CompositeSequenceableLoader.java @@ -1,5 +1,5 @@ /* - * 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; /** * A {@link SequenceableLoader} that encapsulates multiple other {@link SequenceableLoader}s. diff --git a/library/src/main/java/com/google/android/exoplayer/ConcatenatingSampleSourceProvider.java b/library/src/main/java/com/google/android/exoplayer2/ConcatenatingSampleSourceProvider.java similarity index 95% rename from library/src/main/java/com/google/android/exoplayer/ConcatenatingSampleSourceProvider.java rename to library/src/main/java/com/google/android/exoplayer2/ConcatenatingSampleSourceProvider.java index 8a39b80e5b..e3bf6a3cdc 100644 --- a/library/src/main/java/com/google/android/exoplayer/ConcatenatingSampleSourceProvider.java +++ b/library/src/main/java/com/google/android/exoplayer2/ConcatenatingSampleSourceProvider.java @@ -1,5 +1,5 @@ /* - * 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; /** * A {@link SampleSourceProvider} that concatenates multiple {@link SampleSourceProvider}s. diff --git a/library/src/main/java/com/google/android/exoplayer/CryptoInfo.java b/library/src/main/java/com/google/android/exoplayer2/CryptoInfo.java similarity index 95% rename from library/src/main/java/com/google/android/exoplayer/CryptoInfo.java rename to library/src/main/java/com/google/android/exoplayer2/CryptoInfo.java index 6f484a9eb7..56cb7d3bdd 100644 --- a/library/src/main/java/com/google/android/exoplayer/CryptoInfo.java +++ b/library/src/main/java/com/google/android/exoplayer2/CryptoInfo.java @@ -1,5 +1,5 @@ /* - * 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; +package com.google.android.exoplayer2; -import com.google.android.exoplayer.util.Util; +import com.google.android.exoplayer2.util.Util; import android.annotation.TargetApi; diff --git a/library/src/main/java/com/google/android/exoplayer/DecoderInfo.java b/library/src/main/java/com/google/android/exoplayer2/DecoderInfo.java similarity index 96% rename from library/src/main/java/com/google/android/exoplayer/DecoderInfo.java rename to library/src/main/java/com/google/android/exoplayer2/DecoderInfo.java index 84b45b2b75..c3d72fc254 100644 --- a/library/src/main/java/com/google/android/exoplayer/DecoderInfo.java +++ b/library/src/main/java/com/google/android/exoplayer2/DecoderInfo.java @@ -1,5 +1,5 @@ /* - * 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; +package com.google.android.exoplayer2; -import com.google.android.exoplayer.util.Assertions; -import com.google.android.exoplayer.util.MimeTypes; -import com.google.android.exoplayer.util.Util; +import com.google.android.exoplayer2.util.Assertions; +import com.google.android.exoplayer2.util.MimeTypes; +import com.google.android.exoplayer2.util.Util; import android.annotation.TargetApi; import android.media.MediaCodecInfo; diff --git a/library/src/main/java/com/google/android/exoplayer/DecoderInputBuffer.java b/library/src/main/java/com/google/android/exoplayer2/DecoderInputBuffer.java similarity index 96% rename from library/src/main/java/com/google/android/exoplayer/DecoderInputBuffer.java rename to library/src/main/java/com/google/android/exoplayer2/DecoderInputBuffer.java index 08245cb31a..c00e22e8d7 100644 --- a/library/src/main/java/com/google/android/exoplayer/DecoderInputBuffer.java +++ b/library/src/main/java/com/google/android/exoplayer2/DecoderInputBuffer.java @@ -1,5 +1,5 @@ /* - * 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; +package com.google.android.exoplayer2; -import com.google.android.exoplayer.util.Buffer; +import com.google.android.exoplayer2.util.Buffer; import java.nio.ByteBuffer; diff --git a/library/src/main/java/com/google/android/exoplayer/DefaultLoadControl.java b/library/src/main/java/com/google/android/exoplayer2/DefaultLoadControl.java similarity index 95% rename from library/src/main/java/com/google/android/exoplayer/DefaultLoadControl.java rename to library/src/main/java/com/google/android/exoplayer2/DefaultLoadControl.java index c6ddffb3b6..9cee0c8e14 100644 --- a/library/src/main/java/com/google/android/exoplayer/DefaultLoadControl.java +++ b/library/src/main/java/com/google/android/exoplayer2/DefaultLoadControl.java @@ -1,5 +1,5 @@ /* - * 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; +package com.google.android.exoplayer2; -import com.google.android.exoplayer.upstream.Allocator; -import com.google.android.exoplayer.upstream.DefaultAllocator; -import com.google.android.exoplayer.util.Util; +import com.google.android.exoplayer2.upstream.Allocator; +import com.google.android.exoplayer2.upstream.DefaultAllocator; +import com.google.android.exoplayer2.util.Util; /** * The default {@link LoadControl} implementation. diff --git a/library/src/main/java/com/google/android/exoplayer/DefaultTrackSelectionPolicy.java b/library/src/main/java/com/google/android/exoplayer2/DefaultTrackSelectionPolicy.java similarity index 98% rename from library/src/main/java/com/google/android/exoplayer/DefaultTrackSelectionPolicy.java rename to library/src/main/java/com/google/android/exoplayer2/DefaultTrackSelectionPolicy.java index 48b7a5d4a7..999965377f 100644 --- a/library/src/main/java/com/google/android/exoplayer/DefaultTrackSelectionPolicy.java +++ b/library/src/main/java/com/google/android/exoplayer2/DefaultTrackSelectionPolicy.java @@ -1,5 +1,5 @@ /* - * 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; +package com.google.android.exoplayer2; -import com.google.android.exoplayer.util.Util; +import com.google.android.exoplayer2.util.Util; import java.util.Locale; diff --git a/library/src/main/java/com/google/android/exoplayer/DefaultTrackSelector.java b/library/src/main/java/com/google/android/exoplayer2/DefaultTrackSelector.java similarity index 99% rename from library/src/main/java/com/google/android/exoplayer/DefaultTrackSelector.java rename to library/src/main/java/com/google/android/exoplayer2/DefaultTrackSelector.java index 7847c21a27..42619a82fa 100644 --- a/library/src/main/java/com/google/android/exoplayer/DefaultTrackSelector.java +++ b/library/src/main/java/com/google/android/exoplayer2/DefaultTrackSelector.java @@ -1,5 +1,5 @@ /* - * 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; +package com.google.android.exoplayer2; -import com.google.android.exoplayer.util.Assertions; -import com.google.android.exoplayer.util.Util; +import com.google.android.exoplayer2.util.Assertions; +import com.google.android.exoplayer2.util.Util; import android.os.Handler; import android.util.Pair; diff --git a/library/src/main/java/com/google/android/exoplayer/ExoPlaybackException.java b/library/src/main/java/com/google/android/exoplayer2/ExoPlaybackException.java similarity index 95% rename from library/src/main/java/com/google/android/exoplayer/ExoPlaybackException.java rename to library/src/main/java/com/google/android/exoplayer2/ExoPlaybackException.java index d20aca4518..793189886a 100644 --- a/library/src/main/java/com/google/android/exoplayer/ExoPlaybackException.java +++ b/library/src/main/java/com/google/android/exoplayer2/ExoPlaybackException.java @@ -1,5 +1,5 @@ /* - * 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; +package com.google.android.exoplayer2; -import com.google.android.exoplayer.util.Assertions; +import com.google.android.exoplayer2.util.Assertions; import java.io.IOException; diff --git a/library/src/main/java/com/google/android/exoplayer/ExoPlayer.java b/library/src/main/java/com/google/android/exoplayer2/ExoPlayer.java similarity index 99% rename from library/src/main/java/com/google/android/exoplayer/ExoPlayer.java rename to library/src/main/java/com/google/android/exoplayer2/ExoPlayer.java index 75dda93f8c..747d27aebe 100644 --- a/library/src/main/java/com/google/android/exoplayer/ExoPlayer.java +++ b/library/src/main/java/com/google/android/exoplayer2/ExoPlayer.java @@ -1,5 +1,5 @@ /* - * 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; /** * An extensible media player exposing traditional high-level media player functionality, such as diff --git a/library/src/main/java/com/google/android/exoplayer/ExoPlayerFactory.java b/library/src/main/java/com/google/android/exoplayer2/ExoPlayerFactory.java similarity index 97% rename from library/src/main/java/com/google/android/exoplayer/ExoPlayerFactory.java rename to library/src/main/java/com/google/android/exoplayer2/ExoPlayerFactory.java index fc85ef388a..2797f33716 100644 --- a/library/src/main/java/com/google/android/exoplayer/ExoPlayerFactory.java +++ b/library/src/main/java/com/google/android/exoplayer2/ExoPlayerFactory.java @@ -1,5 +1,5 @@ /* - * 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; +package com.google.android.exoplayer2; -import com.google.android.exoplayer.drm.DrmSessionManager; +import com.google.android.exoplayer2.drm.DrmSessionManager; import android.content.Context; import android.os.Looper; diff --git a/library/src/main/java/com/google/android/exoplayer/ExoPlayerImpl.java b/library/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java similarity index 97% rename from library/src/main/java/com/google/android/exoplayer/ExoPlayerImpl.java rename to library/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java index 9fe0283df9..f2485fe0be 100644 --- a/library/src/main/java/com/google/android/exoplayer/ExoPlayerImpl.java +++ b/library/src/main/java/com/google/android/exoplayer2/ExoPlayerImpl.java @@ -1,5 +1,5 @@ /* - * 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; +package com.google.android.exoplayer2; -import com.google.android.exoplayer.ExoPlayerImplInternal.PlaybackInfo; -import com.google.android.exoplayer.util.Assertions; +import com.google.android.exoplayer2.ExoPlayerImplInternal.PlaybackInfo; +import com.google.android.exoplayer2.util.Assertions; import android.annotation.SuppressLint; import android.os.Handler; diff --git a/library/src/main/java/com/google/android/exoplayer/ExoPlayerImplInternal.java b/library/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java similarity index 99% rename from library/src/main/java/com/google/android/exoplayer/ExoPlayerImplInternal.java rename to library/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java index 89b6271883..9b4ad3e1bd 100644 --- a/library/src/main/java/com/google/android/exoplayer/ExoPlayerImplInternal.java +++ b/library/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java @@ -1,5 +1,5 @@ /* - * 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; +package com.google.android.exoplayer2; -import com.google.android.exoplayer.ExoPlayer.ExoPlayerMessage; -import com.google.android.exoplayer.TrackSelector.InvalidationListener; -import com.google.android.exoplayer.util.PriorityHandlerThread; -import com.google.android.exoplayer.util.TraceUtil; -import com.google.android.exoplayer.util.Util; +import com.google.android.exoplayer2.ExoPlayer.ExoPlayerMessage; +import com.google.android.exoplayer2.TrackSelector.InvalidationListener; +import com.google.android.exoplayer2.util.PriorityHandlerThread; +import com.google.android.exoplayer2.util.TraceUtil; +import com.google.android.exoplayer2.util.Util; import android.os.Handler; import android.os.HandlerThread; diff --git a/library/src/main/java/com/google/android/exoplayer/ExoPlayerLibraryInfo.java b/library/src/main/java/com/google/android/exoplayer2/ExoPlayerLibraryInfo.java similarity index 90% rename from library/src/main/java/com/google/android/exoplayer/ExoPlayerLibraryInfo.java rename to library/src/main/java/com/google/android/exoplayer2/ExoPlayerLibraryInfo.java index 24d9694f71..eb16b88423 100644 --- a/library/src/main/java/com/google/android/exoplayer/ExoPlayerLibraryInfo.java +++ b/library/src/main/java/com/google/android/exoplayer2/ExoPlayerLibraryInfo.java @@ -1,5 +1,5 @@ /* - * 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; /** * Information about the ExoPlayer library. @@ -35,13 +35,13 @@ public final class ExoPlayerLibraryInfo { public static final int VERSION_INT = 2000000; /** - * Whether the library was compiled with {@link com.google.android.exoplayer.util.Assertions} + * Whether the library was compiled with {@link com.google.android.exoplayer2.util.Assertions} * checks enabled. */ public static final boolean ASSERTIONS_ENABLED = true; /** - * Whether the library was compiled with {@link com.google.android.exoplayer.util.TraceUtil} + * Whether the library was compiled with {@link com.google.android.exoplayer2.util.TraceUtil} * trace enabled. */ public static final boolean TRACE_ENABLED = true; diff --git a/library/src/main/java/com/google/android/exoplayer/Format.java b/library/src/main/java/com/google/android/exoplayer2/Format.java similarity index 98% rename from library/src/main/java/com/google/android/exoplayer/Format.java rename to library/src/main/java/com/google/android/exoplayer2/Format.java index c96d84572f..49460a80cd 100644 --- a/library/src/main/java/com/google/android/exoplayer/Format.java +++ b/library/src/main/java/com/google/android/exoplayer2/Format.java @@ -1,5 +1,5 @@ /* - * 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; +package com.google.android.exoplayer2; -import com.google.android.exoplayer.drm.DrmInitData; -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.util.MimeTypes; +import com.google.android.exoplayer2.util.Util; import android.annotation.SuppressLint; import android.annotation.TargetApi; diff --git a/library/src/main/java/com/google/android/exoplayer/FormatHolder.java b/library/src/main/java/com/google/android/exoplayer2/FormatHolder.java similarity index 89% rename from library/src/main/java/com/google/android/exoplayer/FormatHolder.java rename to library/src/main/java/com/google/android/exoplayer2/FormatHolder.java index 92fb05d7cd..45ff197372 100644 --- a/library/src/main/java/com/google/android/exoplayer/FormatHolder.java +++ b/library/src/main/java/com/google/android/exoplayer2/FormatHolder.java @@ -1,5 +1,5 @@ /* - * 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; /** * Holds a {@link Format} and corresponding drm scheme initialization data. diff --git a/library/src/main/java/com/google/android/exoplayer/LoadControl.java b/library/src/main/java/com/google/android/exoplayer2/LoadControl.java similarity index 93% rename from library/src/main/java/com/google/android/exoplayer/LoadControl.java rename to library/src/main/java/com/google/android/exoplayer2/LoadControl.java index e28e1b0282..0b6012a827 100644 --- a/library/src/main/java/com/google/android/exoplayer/LoadControl.java +++ b/library/src/main/java/com/google/android/exoplayer2/LoadControl.java @@ -1,5 +1,5 @@ /* - * 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; +package com.google.android.exoplayer2; -import com.google.android.exoplayer.upstream.Allocator; +import com.google.android.exoplayer2.upstream.Allocator; /** * Controls buffering of media. diff --git a/library/src/main/java/com/google/android/exoplayer/MediaClock.java b/library/src/main/java/com/google/android/exoplayer2/MediaClock.java similarity index 88% rename from library/src/main/java/com/google/android/exoplayer/MediaClock.java rename to library/src/main/java/com/google/android/exoplayer2/MediaClock.java index 6cfe50e156..8d1b6a627b 100644 --- a/library/src/main/java/com/google/android/exoplayer/MediaClock.java +++ b/library/src/main/java/com/google/android/exoplayer2/MediaClock.java @@ -1,5 +1,5 @@ /* - * 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; /** * Tracks the progression of media time. diff --git a/library/src/main/java/com/google/android/exoplayer/MediaCodecAudioTrackRenderer.java b/library/src/main/java/com/google/android/exoplayer2/MediaCodecAudioTrackRenderer.java similarity index 96% rename from library/src/main/java/com/google/android/exoplayer/MediaCodecAudioTrackRenderer.java rename to library/src/main/java/com/google/android/exoplayer2/MediaCodecAudioTrackRenderer.java index b484265533..e95f776f4d 100644 --- a/library/src/main/java/com/google/android/exoplayer/MediaCodecAudioTrackRenderer.java +++ b/library/src/main/java/com/google/android/exoplayer2/MediaCodecAudioTrackRenderer.java @@ -1,5 +1,5 @@ /* - * 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; +package com.google.android.exoplayer2; -import com.google.android.exoplayer.AudioTrackRendererEventListener.EventDispatcher; -import com.google.android.exoplayer.MediaCodecUtil.DecoderQueryException; -import com.google.android.exoplayer.audio.AudioCapabilities; -import com.google.android.exoplayer.audio.AudioTrack; -import com.google.android.exoplayer.drm.DrmSessionManager; -import com.google.android.exoplayer.util.MimeTypes; -import com.google.android.exoplayer.util.Util; +import com.google.android.exoplayer2.AudioTrackRendererEventListener.EventDispatcher; +import com.google.android.exoplayer2.MediaCodecUtil.DecoderQueryException; +import com.google.android.exoplayer2.audio.AudioCapabilities; +import com.google.android.exoplayer2.audio.AudioTrack; +import com.google.android.exoplayer2.drm.DrmSessionManager; +import com.google.android.exoplayer2.util.MimeTypes; +import com.google.android.exoplayer2.util.Util; import android.annotation.TargetApi; import android.media.AudioManager; diff --git a/library/src/main/java/com/google/android/exoplayer/MediaCodecSelector.java b/library/src/main/java/com/google/android/exoplayer2/MediaCodecSelector.java similarity index 92% rename from library/src/main/java/com/google/android/exoplayer/MediaCodecSelector.java rename to library/src/main/java/com/google/android/exoplayer2/MediaCodecSelector.java index 292a405179..ec9366de0c 100644 --- a/library/src/main/java/com/google/android/exoplayer/MediaCodecSelector.java +++ b/library/src/main/java/com/google/android/exoplayer2/MediaCodecSelector.java @@ -1,5 +1,5 @@ /* - * 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; +package com.google.android.exoplayer2; -import com.google.android.exoplayer.MediaCodecUtil.DecoderQueryException; +import com.google.android.exoplayer2.MediaCodecUtil.DecoderQueryException; import android.media.MediaCodec; diff --git a/library/src/main/java/com/google/android/exoplayer/MediaCodecTrackRenderer.java b/library/src/main/java/com/google/android/exoplayer2/MediaCodecTrackRenderer.java similarity index 98% rename from library/src/main/java/com/google/android/exoplayer/MediaCodecTrackRenderer.java rename to library/src/main/java/com/google/android/exoplayer2/MediaCodecTrackRenderer.java index ae7d4c9382..5f9743e245 100644 --- a/library/src/main/java/com/google/android/exoplayer/MediaCodecTrackRenderer.java +++ b/library/src/main/java/com/google/android/exoplayer2/MediaCodecTrackRenderer.java @@ -1,5 +1,5 @@ /* - * 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; +package com.google.android.exoplayer2; -import com.google.android.exoplayer.MediaCodecUtil.DecoderQueryException; -import com.google.android.exoplayer.drm.DrmSession; -import com.google.android.exoplayer.drm.DrmSessionManager; -import com.google.android.exoplayer.util.Assertions; -import com.google.android.exoplayer.util.NalUnitUtil; -import com.google.android.exoplayer.util.TraceUtil; -import com.google.android.exoplayer.util.Util; +import com.google.android.exoplayer2.MediaCodecUtil.DecoderQueryException; +import com.google.android.exoplayer2.drm.DrmSession; +import com.google.android.exoplayer2.drm.DrmSessionManager; +import com.google.android.exoplayer2.util.Assertions; +import com.google.android.exoplayer2.util.NalUnitUtil; +import com.google.android.exoplayer2.util.TraceUtil; +import com.google.android.exoplayer2.util.Util; import android.annotation.TargetApi; import android.media.MediaCodec; diff --git a/library/src/main/java/com/google/android/exoplayer/MediaCodecUtil.java b/library/src/main/java/com/google/android/exoplayer2/MediaCodecUtil.java similarity index 99% rename from library/src/main/java/com/google/android/exoplayer/MediaCodecUtil.java rename to library/src/main/java/com/google/android/exoplayer2/MediaCodecUtil.java index cceaeccf87..be277a7c94 100644 --- a/library/src/main/java/com/google/android/exoplayer/MediaCodecUtil.java +++ b/library/src/main/java/com/google/android/exoplayer2/MediaCodecUtil.java @@ -1,5 +1,5 @@ /* - * 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; +package com.google.android.exoplayer2; -import com.google.android.exoplayer.util.MimeTypes; -import com.google.android.exoplayer.util.Util; +import com.google.android.exoplayer2.util.MimeTypes; +import com.google.android.exoplayer2.util.Util; import android.annotation.SuppressLint; import android.annotation.TargetApi; diff --git a/library/src/main/java/com/google/android/exoplayer/MediaCodecVideoTrackRenderer.java b/library/src/main/java/com/google/android/exoplayer2/MediaCodecVideoTrackRenderer.java similarity index 98% rename from library/src/main/java/com/google/android/exoplayer/MediaCodecVideoTrackRenderer.java rename to library/src/main/java/com/google/android/exoplayer2/MediaCodecVideoTrackRenderer.java index f76ed2b03c..3397d129b0 100644 --- a/library/src/main/java/com/google/android/exoplayer/MediaCodecVideoTrackRenderer.java +++ b/library/src/main/java/com/google/android/exoplayer2/MediaCodecVideoTrackRenderer.java @@ -1,5 +1,5 @@ /* - * 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; +package com.google.android.exoplayer2; -import com.google.android.exoplayer.MediaCodecUtil.DecoderQueryException; -import com.google.android.exoplayer.VideoTrackRendererEventListener.EventDispatcher; -import com.google.android.exoplayer.drm.DrmSessionManager; -import com.google.android.exoplayer.util.MimeTypes; -import com.google.android.exoplayer.util.TraceUtil; -import com.google.android.exoplayer.util.Util; +import com.google.android.exoplayer2.MediaCodecUtil.DecoderQueryException; +import com.google.android.exoplayer2.VideoTrackRendererEventListener.EventDispatcher; +import com.google.android.exoplayer2.drm.DrmSessionManager; +import com.google.android.exoplayer2.util.MimeTypes; +import com.google.android.exoplayer2.util.TraceUtil; +import com.google.android.exoplayer2.util.Util; import android.annotation.SuppressLint; import android.annotation.TargetApi; diff --git a/library/src/main/java/com/google/android/exoplayer/MultiSampleSource.java b/library/src/main/java/com/google/android/exoplayer2/MultiSampleSource.java similarity index 98% rename from library/src/main/java/com/google/android/exoplayer/MultiSampleSource.java rename to library/src/main/java/com/google/android/exoplayer2/MultiSampleSource.java index 95357ecf1d..59b77c68df 100644 --- a/library/src/main/java/com/google/android/exoplayer/MultiSampleSource.java +++ b/library/src/main/java/com/google/android/exoplayer2/MultiSampleSource.java @@ -1,5 +1,5 @@ /* - * 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; +package com.google.android.exoplayer2; -import com.google.android.exoplayer.upstream.Allocator; +import com.google.android.exoplayer2.upstream.Allocator; import android.util.Pair; diff --git a/library/src/main/java/com/google/android/exoplayer/ParserException.java b/library/src/main/java/com/google/android/exoplayer2/ParserException.java similarity index 91% rename from library/src/main/java/com/google/android/exoplayer/ParserException.java rename to library/src/main/java/com/google/android/exoplayer2/ParserException.java index d930701be6..eccd28a64e 100644 --- a/library/src/main/java/com/google/android/exoplayer/ParserException.java +++ b/library/src/main/java/com/google/android/exoplayer2/ParserException.java @@ -1,5 +1,5 @@ /* - * 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 java.io.IOException; diff --git a/library/src/main/java/com/google/android/exoplayer/SampleSource.java b/library/src/main/java/com/google/android/exoplayer2/SampleSource.java similarity index 97% rename from library/src/main/java/com/google/android/exoplayer/SampleSource.java rename to library/src/main/java/com/google/android/exoplayer2/SampleSource.java index 26bb5392be..f3eb0a45c8 100644 --- a/library/src/main/java/com/google/android/exoplayer/SampleSource.java +++ b/library/src/main/java/com/google/android/exoplayer2/SampleSource.java @@ -1,5 +1,5 @@ /* - * 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; +package com.google.android.exoplayer2; -import com.google.android.exoplayer.upstream.Allocator; +import com.google.android.exoplayer2.upstream.Allocator; import java.io.IOException; import java.util.List; diff --git a/library/src/main/java/com/google/android/exoplayer/SampleSourceProvider.java b/library/src/main/java/com/google/android/exoplayer2/SampleSourceProvider.java similarity index 94% rename from library/src/main/java/com/google/android/exoplayer/SampleSourceProvider.java rename to library/src/main/java/com/google/android/exoplayer2/SampleSourceProvider.java index 5e2700fd95..8d198cf1cf 100644 --- a/library/src/main/java/com/google/android/exoplayer/SampleSourceProvider.java +++ b/library/src/main/java/com/google/android/exoplayer2/SampleSourceProvider.java @@ -1,5 +1,5 @@ /* - * 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; // TODO[playlists]: Rename this and maybe change the interface once we support multi-period DASH. /** diff --git a/library/src/main/java/com/google/android/exoplayer/SequenceableLoader.java b/library/src/main/java/com/google/android/exoplayer2/SequenceableLoader.java similarity index 94% rename from library/src/main/java/com/google/android/exoplayer/SequenceableLoader.java rename to library/src/main/java/com/google/android/exoplayer2/SequenceableLoader.java index 640acce41f..8b9d663eb9 100644 --- a/library/src/main/java/com/google/android/exoplayer/SequenceableLoader.java +++ b/library/src/main/java/com/google/android/exoplayer2/SequenceableLoader.java @@ -1,5 +1,5 @@ /* - * 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; /** * An loader that can proceed in approximate synchronization with other loaders. diff --git a/library/src/main/java/com/google/android/exoplayer/SimpleExoPlayer.java b/library/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java similarity index 93% rename from library/src/main/java/com/google/android/exoplayer/SimpleExoPlayer.java rename to library/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java index f2fae30a3f..b74a0aefc6 100644 --- a/library/src/main/java/com/google/android/exoplayer/SimpleExoPlayer.java +++ b/library/src/main/java/com/google/android/exoplayer2/SimpleExoPlayer.java @@ -1,5 +1,5 @@ /* - * 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,19 +13,19 @@ * 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 com.google.android.exoplayer.audio.AudioCapabilities; -import com.google.android.exoplayer.drm.DrmSessionManager; -import com.google.android.exoplayer.metadata.MetadataTrackRenderer; -import com.google.android.exoplayer.metadata.MetadataTrackRenderer.MetadataRenderer; -import com.google.android.exoplayer.metadata.id3.Id3Frame; -import com.google.android.exoplayer.metadata.id3.Id3Parser; -import com.google.android.exoplayer.text.Cue; -import com.google.android.exoplayer.text.TextRenderer; -import com.google.android.exoplayer.text.TextTrackRenderer; -import com.google.android.exoplayer.upstream.BandwidthMeter; -import com.google.android.exoplayer.upstream.DefaultBandwidthMeter; +import com.google.android.exoplayer2.audio.AudioCapabilities; +import com.google.android.exoplayer2.drm.DrmSessionManager; +import com.google.android.exoplayer2.metadata.MetadataTrackRenderer; +import com.google.android.exoplayer2.metadata.MetadataTrackRenderer.MetadataRenderer; +import com.google.android.exoplayer2.metadata.id3.Id3Frame; +import com.google.android.exoplayer2.metadata.id3.Id3Parser; +import com.google.android.exoplayer2.text.Cue; +import com.google.android.exoplayer2.text.TextRenderer; +import com.google.android.exoplayer2.text.TextTrackRenderer; +import com.google.android.exoplayer2.upstream.BandwidthMeter; +import com.google.android.exoplayer2.upstream.DefaultBandwidthMeter; import android.annotation.TargetApi; import android.content.Context; @@ -423,7 +423,7 @@ public final class SimpleExoPlayer implements ExoPlayer { // can detect the use of reflection (see http://proguard.sourceforge.net/FAQ.html#forname). try { Class clazz = - Class.forName("com.google.android.exoplayer.ext.vp9.LibvpxVideoTrackRenderer"); + Class.forName("com.google.android.exoplayer2.ext.vp9.LibvpxVideoTrackRenderer"); Constructor constructor = clazz.getConstructor(boolean.class, long.class, Handler.class, VideoTrackRendererEventListener.class, int.class); renderersList.add((TrackRenderer) constructor.newInstance(true, allowedVideoJoiningTimeMs, @@ -437,7 +437,7 @@ public final class SimpleExoPlayer implements ExoPlayer { try { Class clazz = - Class.forName("com.google.android.exoplayer.ext.opus.LibopusAudioTrackRenderer"); + Class.forName("com.google.android.exoplayer2.ext.opus.LibopusAudioTrackRenderer"); Constructor constructor = clazz.getConstructor(Handler.class, AudioTrackRendererEventListener.class); renderersList.add((TrackRenderer) constructor.newInstance(mainHandler, componentListener)); @@ -450,7 +450,7 @@ public final class SimpleExoPlayer implements ExoPlayer { try { Class clazz = - Class.forName("com.google.android.exoplayer.ext.flac.LibflacAudioTrackRenderer"); + Class.forName("com.google.android.exoplayer2.ext.flac.LibflacAudioTrackRenderer"); Constructor constructor = clazz.getConstructor(Handler.class, AudioTrackRendererEventListener.class); renderersList.add((TrackRenderer) constructor.newInstance(mainHandler, componentListener)); @@ -463,7 +463,7 @@ public final class SimpleExoPlayer implements ExoPlayer { try { Class clazz = - Class.forName("com.google.android.exoplayer.ext.ffmpeg.FfmpegAudioTrackRenderer"); + Class.forName("com.google.android.exoplayer2.ext.ffmpeg.FfmpegAudioTrackRenderer"); Constructor constructor = clazz.getConstructor(Handler.class, AudioTrackRendererEventListener.class); renderersList.add((TrackRenderer) constructor.newInstance(mainHandler, componentListener)); diff --git a/library/src/main/java/com/google/android/exoplayer/SingleSampleSource.java b/library/src/main/java/com/google/android/exoplayer2/SingleSampleSource.java similarity index 94% rename from library/src/main/java/com/google/android/exoplayer/SingleSampleSource.java rename to library/src/main/java/com/google/android/exoplayer2/SingleSampleSource.java index 99cd358f64..6da809a999 100644 --- a/library/src/main/java/com/google/android/exoplayer/SingleSampleSource.java +++ b/library/src/main/java/com/google/android/exoplayer2/SingleSampleSource.java @@ -1,5 +1,5 @@ /* - * 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; +package com.google.android.exoplayer2; -import com.google.android.exoplayer.upstream.Allocator; -import com.google.android.exoplayer.upstream.DataSource; -import com.google.android.exoplayer.upstream.DataSourceFactory; -import com.google.android.exoplayer.upstream.DataSpec; -import com.google.android.exoplayer.upstream.Loader; -import com.google.android.exoplayer.upstream.Loader.Loadable; -import com.google.android.exoplayer.util.Assertions; +import com.google.android.exoplayer2.upstream.Allocator; +import com.google.android.exoplayer2.upstream.DataSource; +import com.google.android.exoplayer2.upstream.DataSourceFactory; +import com.google.android.exoplayer2.upstream.DataSpec; +import com.google.android.exoplayer2.upstream.Loader; +import com.google.android.exoplayer2.upstream.Loader.Loadable; +import com.google.android.exoplayer2.util.Assertions; import android.net.Uri; import android.os.Handler; diff --git a/library/src/main/java/com/google/android/exoplayer/StandaloneMediaClock.java b/library/src/main/java/com/google/android/exoplayer2/StandaloneMediaClock.java similarity index 95% rename from library/src/main/java/com/google/android/exoplayer/StandaloneMediaClock.java rename to library/src/main/java/com/google/android/exoplayer2/StandaloneMediaClock.java index 3b6871c811..a078add858 100644 --- a/library/src/main/java/com/google/android/exoplayer/StandaloneMediaClock.java +++ b/library/src/main/java/com/google/android/exoplayer2/StandaloneMediaClock.java @@ -1,5 +1,5 @@ /* - * 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.os.SystemClock; diff --git a/library/src/main/java/com/google/android/exoplayer/TrackGroup.java b/library/src/main/java/com/google/android/exoplayer2/TrackGroup.java similarity index 94% rename from library/src/main/java/com/google/android/exoplayer/TrackGroup.java rename to library/src/main/java/com/google/android/exoplayer2/TrackGroup.java index 9d9612c35b..b34f1860a0 100644 --- a/library/src/main/java/com/google/android/exoplayer/TrackGroup.java +++ b/library/src/main/java/com/google/android/exoplayer2/TrackGroup.java @@ -1,5 +1,5 @@ /* - * 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; +package com.google.android.exoplayer2; -import com.google.android.exoplayer.util.Assertions; +import com.google.android.exoplayer2.util.Assertions; import java.util.Arrays; diff --git a/library/src/main/java/com/google/android/exoplayer/TrackGroupArray.java b/library/src/main/java/com/google/android/exoplayer2/TrackGroupArray.java similarity index 97% rename from library/src/main/java/com/google/android/exoplayer/TrackGroupArray.java rename to library/src/main/java/com/google/android/exoplayer2/TrackGroupArray.java index 444c4f0257..e67f8b0d4b 100644 --- a/library/src/main/java/com/google/android/exoplayer/TrackGroupArray.java +++ b/library/src/main/java/com/google/android/exoplayer2/TrackGroupArray.java @@ -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 java.util.Arrays; diff --git a/library/src/main/java/com/google/android/exoplayer/TrackRenderer.java b/library/src/main/java/com/google/android/exoplayer2/TrackRenderer.java similarity index 98% rename from library/src/main/java/com/google/android/exoplayer/TrackRenderer.java rename to library/src/main/java/com/google/android/exoplayer2/TrackRenderer.java index 57fff44577..780c4b1454 100644 --- a/library/src/main/java/com/google/android/exoplayer/TrackRenderer.java +++ b/library/src/main/java/com/google/android/exoplayer2/TrackRenderer.java @@ -1,5 +1,5 @@ /* - * 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; +package com.google.android.exoplayer2; -import com.google.android.exoplayer.ExoPlayer.ExoPlayerComponent; -import com.google.android.exoplayer.util.Assertions; -import com.google.android.exoplayer.util.MimeTypes; +import com.google.android.exoplayer2.ExoPlayer.ExoPlayerComponent; +import com.google.android.exoplayer2.util.Assertions; +import com.google.android.exoplayer2.util.MimeTypes; import java.io.IOException; diff --git a/library/src/main/java/com/google/android/exoplayer/TrackSelection.java b/library/src/main/java/com/google/android/exoplayer2/TrackSelection.java similarity index 94% rename from library/src/main/java/com/google/android/exoplayer/TrackSelection.java rename to library/src/main/java/com/google/android/exoplayer2/TrackSelection.java index c24c97523a..f7ea588eda 100644 --- a/library/src/main/java/com/google/android/exoplayer/TrackSelection.java +++ b/library/src/main/java/com/google/android/exoplayer2/TrackSelection.java @@ -1,5 +1,5 @@ /* - * 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; +package com.google.android.exoplayer2; -import com.google.android.exoplayer.util.Assertions; +import com.google.android.exoplayer2.util.Assertions; import java.util.Arrays; diff --git a/library/src/main/java/com/google/android/exoplayer/TrackSelectionArray.java b/library/src/main/java/com/google/android/exoplayer2/TrackSelectionArray.java similarity index 95% rename from library/src/main/java/com/google/android/exoplayer/TrackSelectionArray.java rename to library/src/main/java/com/google/android/exoplayer2/TrackSelectionArray.java index c1815b20de..16b2498ec2 100644 --- a/library/src/main/java/com/google/android/exoplayer/TrackSelectionArray.java +++ b/library/src/main/java/com/google/android/exoplayer2/TrackSelectionArray.java @@ -1,5 +1,5 @@ /* - * 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 java.util.Arrays; diff --git a/library/src/main/java/com/google/android/exoplayer/TrackSelectionPolicy.java b/library/src/main/java/com/google/android/exoplayer2/TrackSelectionPolicy.java similarity index 98% rename from library/src/main/java/com/google/android/exoplayer/TrackSelectionPolicy.java rename to library/src/main/java/com/google/android/exoplayer2/TrackSelectionPolicy.java index 8320313526..7a085b2bcc 100644 --- a/library/src/main/java/com/google/android/exoplayer/TrackSelectionPolicy.java +++ b/library/src/main/java/com/google/android/exoplayer2/TrackSelectionPolicy.java @@ -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; /** * Defines a policy for selecting the track rendered by each {@link TrackRenderer}. diff --git a/library/src/main/java/com/google/android/exoplayer/TrackSelector.java b/library/src/main/java/com/google/android/exoplayer2/TrackSelector.java similarity index 96% rename from library/src/main/java/com/google/android/exoplayer/TrackSelector.java rename to library/src/main/java/com/google/android/exoplayer2/TrackSelector.java index 43533dd7f5..d7870bfadb 100644 --- a/library/src/main/java/com/google/android/exoplayer/TrackSelector.java +++ b/library/src/main/java/com/google/android/exoplayer2/TrackSelector.java @@ -1,5 +1,5 @@ /* - * 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.util.Pair; diff --git a/library/src/main/java/com/google/android/exoplayer/TrackStream.java b/library/src/main/java/com/google/android/exoplayer2/TrackStream.java similarity index 95% rename from library/src/main/java/com/google/android/exoplayer/TrackStream.java rename to library/src/main/java/com/google/android/exoplayer2/TrackStream.java index 4224169f67..8540e1f389 100644 --- a/library/src/main/java/com/google/android/exoplayer/TrackStream.java +++ b/library/src/main/java/com/google/android/exoplayer2/TrackStream.java @@ -1,5 +1,5 @@ /* - * 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 java.io.IOException; diff --git a/library/src/main/java/com/google/android/exoplayer/VideoFrameReleaseTimeHelper.java b/library/src/main/java/com/google/android/exoplayer2/VideoFrameReleaseTimeHelper.java similarity index 99% rename from library/src/main/java/com/google/android/exoplayer/VideoFrameReleaseTimeHelper.java rename to library/src/main/java/com/google/android/exoplayer2/VideoFrameReleaseTimeHelper.java index 31f84cf07f..5ed9190963 100644 --- a/library/src/main/java/com/google/android/exoplayer/VideoFrameReleaseTimeHelper.java +++ b/library/src/main/java/com/google/android/exoplayer2/VideoFrameReleaseTimeHelper.java @@ -1,5 +1,5 @@ /* - * 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.TargetApi; import android.content.Context; diff --git a/library/src/main/java/com/google/android/exoplayer/VideoTrackRendererEventListener.java b/library/src/main/java/com/google/android/exoplayer2/VideoTrackRendererEventListener.java similarity index 98% rename from library/src/main/java/com/google/android/exoplayer/VideoTrackRendererEventListener.java rename to library/src/main/java/com/google/android/exoplayer2/VideoTrackRendererEventListener.java index d7dbec5bb1..cb3ac98deb 100644 --- a/library/src/main/java/com/google/android/exoplayer/VideoTrackRendererEventListener.java +++ b/library/src/main/java/com/google/android/exoplayer2/VideoTrackRendererEventListener.java @@ -13,9 +13,9 @@ * 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 com.google.android.exoplayer.util.Assertions; +import com.google.android.exoplayer2.util.Assertions; import android.os.Handler; import android.os.SystemClock; diff --git a/library/src/main/java/com/google/android/exoplayer/audio/AudioCapabilities.java b/library/src/main/java/com/google/android/exoplayer2/audio/AudioCapabilities.java similarity index 97% rename from library/src/main/java/com/google/android/exoplayer/audio/AudioCapabilities.java rename to library/src/main/java/com/google/android/exoplayer2/audio/AudioCapabilities.java index 33ff498aa7..18afd202d9 100644 --- a/library/src/main/java/com/google/android/exoplayer/audio/AudioCapabilities.java +++ b/library/src/main/java/com/google/android/exoplayer2/audio/AudioCapabilities.java @@ -1,5 +1,5 @@ /* - * 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.audio; +package com.google.android.exoplayer2.audio; import android.annotation.SuppressLint; import android.annotation.TargetApi; diff --git a/library/src/main/java/com/google/android/exoplayer/audio/AudioCapabilitiesReceiver.java b/library/src/main/java/com/google/android/exoplayer2/audio/AudioCapabilitiesReceiver.java similarity index 94% rename from library/src/main/java/com/google/android/exoplayer/audio/AudioCapabilitiesReceiver.java rename to library/src/main/java/com/google/android/exoplayer2/audio/AudioCapabilitiesReceiver.java index 68bae41cf3..393d7eabc4 100644 --- a/library/src/main/java/com/google/android/exoplayer/audio/AudioCapabilitiesReceiver.java +++ b/library/src/main/java/com/google/android/exoplayer2/audio/AudioCapabilitiesReceiver.java @@ -1,5 +1,5 @@ /* - * 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.audio; +package com.google.android.exoplayer2.audio; -import com.google.android.exoplayer.util.Assertions; -import com.google.android.exoplayer.util.Util; +import com.google.android.exoplayer2.util.Assertions; +import com.google.android.exoplayer2.util.Util; import android.content.BroadcastReceiver; import android.content.Context; diff --git a/library/src/main/java/com/google/android/exoplayer/audio/AudioTrack.java b/library/src/main/java/com/google/android/exoplayer2/audio/AudioTrack.java similarity index 99% rename from library/src/main/java/com/google/android/exoplayer/audio/AudioTrack.java rename to library/src/main/java/com/google/android/exoplayer2/audio/AudioTrack.java index ff2b330f50..e8edc06fbb 100644 --- a/library/src/main/java/com/google/android/exoplayer/audio/AudioTrack.java +++ b/library/src/main/java/com/google/android/exoplayer2/audio/AudioTrack.java @@ -1,5 +1,5 @@ /* - * 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.audio; +package com.google.android.exoplayer2.audio; -import com.google.android.exoplayer.C; -import com.google.android.exoplayer.util.Ac3Util; -import com.google.android.exoplayer.util.Assertions; -import com.google.android.exoplayer.util.DtsUtil; -import com.google.android.exoplayer.util.MimeTypes; -import com.google.android.exoplayer.util.Util; +import com.google.android.exoplayer2.C; +import com.google.android.exoplayer2.util.Ac3Util; +import com.google.android.exoplayer2.util.Assertions; +import com.google.android.exoplayer2.util.DtsUtil; +import com.google.android.exoplayer2.util.MimeTypes; +import com.google.android.exoplayer2.util.Util; import android.annotation.TargetApi; import android.media.AudioFormat; diff --git a/library/src/main/java/com/google/android/exoplayer/chunk/BaseMediaChunk.java b/library/src/main/java/com/google/android/exoplayer2/chunk/BaseMediaChunk.java similarity index 88% rename from library/src/main/java/com/google/android/exoplayer/chunk/BaseMediaChunk.java rename to library/src/main/java/com/google/android/exoplayer2/chunk/BaseMediaChunk.java index 17e43b3087..993b6fe12f 100644 --- a/library/src/main/java/com/google/android/exoplayer/chunk/BaseMediaChunk.java +++ b/library/src/main/java/com/google/android/exoplayer2/chunk/BaseMediaChunk.java @@ -1,5 +1,5 @@ /* - * 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.chunk; +package com.google.android.exoplayer2.chunk; -import com.google.android.exoplayer.Format; -import com.google.android.exoplayer.extractor.DefaultTrackOutput; -import com.google.android.exoplayer.upstream.DataSource; -import com.google.android.exoplayer.upstream.DataSpec; +import com.google.android.exoplayer2.Format; +import com.google.android.exoplayer2.extractor.DefaultTrackOutput; +import com.google.android.exoplayer2.upstream.DataSource; +import com.google.android.exoplayer2.upstream.DataSpec; /** * A base implementation of {@link MediaChunk}, for chunks that contain a single track. diff --git a/library/src/main/java/com/google/android/exoplayer/chunk/Chunk.java b/library/src/main/java/com/google/android/exoplayer2/chunk/Chunk.java similarity index 88% rename from library/src/main/java/com/google/android/exoplayer/chunk/Chunk.java rename to library/src/main/java/com/google/android/exoplayer2/chunk/Chunk.java index 1e5d3aed8a..d4b749f896 100644 --- a/library/src/main/java/com/google/android/exoplayer/chunk/Chunk.java +++ b/library/src/main/java/com/google/android/exoplayer2/chunk/Chunk.java @@ -1,5 +1,5 @@ /* - * 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.chunk; +package com.google.android.exoplayer2.chunk; -import com.google.android.exoplayer.C; -import com.google.android.exoplayer.Format; -import com.google.android.exoplayer.upstream.DataSource; -import com.google.android.exoplayer.upstream.DataSpec; -import com.google.android.exoplayer.upstream.Loader.Loadable; -import com.google.android.exoplayer.util.Assertions; +import com.google.android.exoplayer2.C; +import com.google.android.exoplayer2.Format; +import com.google.android.exoplayer2.upstream.DataSource; +import com.google.android.exoplayer2.upstream.DataSpec; +import com.google.android.exoplayer2.upstream.Loader.Loadable; +import com.google.android.exoplayer2.util.Assertions; /** * An abstract base class for {@link Loadable} implementations that load chunks of data required diff --git a/library/src/main/java/com/google/android/exoplayer/chunk/ChunkExtractorWrapper.java b/library/src/main/java/com/google/android/exoplayer2/chunk/ChunkExtractorWrapper.java similarity index 87% rename from library/src/main/java/com/google/android/exoplayer/chunk/ChunkExtractorWrapper.java rename to library/src/main/java/com/google/android/exoplayer2/chunk/ChunkExtractorWrapper.java index 76b15c55ba..d19e039d79 100644 --- a/library/src/main/java/com/google/android/exoplayer/chunk/ChunkExtractorWrapper.java +++ b/library/src/main/java/com/google/android/exoplayer2/chunk/ChunkExtractorWrapper.java @@ -1,5 +1,5 @@ /* - * 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.chunk; +package com.google.android.exoplayer2.chunk; -import com.google.android.exoplayer.Format; -import com.google.android.exoplayer.drm.DrmInitData; -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.SeekMap; -import com.google.android.exoplayer.extractor.TrackOutput; -import com.google.android.exoplayer.util.Assertions; -import com.google.android.exoplayer.util.ParsableByteArray; +import com.google.android.exoplayer2.Format; +import com.google.android.exoplayer2.drm.DrmInitData; +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.SeekMap; +import com.google.android.exoplayer2.extractor.TrackOutput; +import com.google.android.exoplayer2.util.Assertions; +import com.google.android.exoplayer2.util.ParsableByteArray; import java.io.IOException; diff --git a/library/src/main/java/com/google/android/exoplayer/chunk/ChunkHolder.java b/library/src/main/java/com/google/android/exoplayer2/chunk/ChunkHolder.java similarity index 90% rename from library/src/main/java/com/google/android/exoplayer/chunk/ChunkHolder.java rename to library/src/main/java/com/google/android/exoplayer2/chunk/ChunkHolder.java index 7fac1fde51..d07469ae0e 100644 --- a/library/src/main/java/com/google/android/exoplayer/chunk/ChunkHolder.java +++ b/library/src/main/java/com/google/android/exoplayer2/chunk/ChunkHolder.java @@ -1,5 +1,5 @@ /* - * 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.chunk; +package com.google.android.exoplayer2.chunk; /** * Holds a chunk or an indication that the end of the stream has been reached. diff --git a/library/src/main/java/com/google/android/exoplayer/chunk/ChunkSource.java b/library/src/main/java/com/google/android/exoplayer2/chunk/ChunkSource.java similarity index 97% rename from library/src/main/java/com/google/android/exoplayer/chunk/ChunkSource.java rename to library/src/main/java/com/google/android/exoplayer2/chunk/ChunkSource.java index d12d4354bb..6891eccb7a 100644 --- a/library/src/main/java/com/google/android/exoplayer/chunk/ChunkSource.java +++ b/library/src/main/java/com/google/android/exoplayer2/chunk/ChunkSource.java @@ -1,5 +1,5 @@ /* - * 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.chunk; +package com.google.android.exoplayer2.chunk; import java.io.IOException; import java.util.List; diff --git a/library/src/main/java/com/google/android/exoplayer/chunk/ChunkTrackStream.java b/library/src/main/java/com/google/android/exoplayer2/chunk/ChunkTrackStream.java similarity index 94% rename from library/src/main/java/com/google/android/exoplayer/chunk/ChunkTrackStream.java rename to library/src/main/java/com/google/android/exoplayer2/chunk/ChunkTrackStream.java index 9e2d2d33f6..7a4fbcf2a4 100644 --- a/library/src/main/java/com/google/android/exoplayer/chunk/ChunkTrackStream.java +++ b/library/src/main/java/com/google/android/exoplayer2/chunk/ChunkTrackStream.java @@ -1,5 +1,5 @@ /* - * 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,19 +13,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.android.exoplayer.chunk; +package com.google.android.exoplayer2.chunk; -import com.google.android.exoplayer.AdaptiveSourceEventListener.EventDispatcher; -import com.google.android.exoplayer.C; -import com.google.android.exoplayer.DecoderInputBuffer; -import com.google.android.exoplayer.Format; -import com.google.android.exoplayer.FormatHolder; -import com.google.android.exoplayer.SequenceableLoader; -import com.google.android.exoplayer.TrackStream; -import com.google.android.exoplayer.extractor.DefaultTrackOutput; -import com.google.android.exoplayer.upstream.Allocator; -import com.google.android.exoplayer.upstream.Loader; -import com.google.android.exoplayer.util.Assertions; +import com.google.android.exoplayer2.AdaptiveSourceEventListener.EventDispatcher; +import com.google.android.exoplayer2.C; +import com.google.android.exoplayer2.DecoderInputBuffer; +import com.google.android.exoplayer2.Format; +import com.google.android.exoplayer2.FormatHolder; +import com.google.android.exoplayer2.SequenceableLoader; +import com.google.android.exoplayer2.TrackStream; +import com.google.android.exoplayer2.extractor.DefaultTrackOutput; +import com.google.android.exoplayer2.upstream.Allocator; +import com.google.android.exoplayer2.upstream.Loader; +import com.google.android.exoplayer2.util.Assertions; import java.io.IOException; import java.util.Collections; diff --git a/library/src/main/java/com/google/android/exoplayer/chunk/ContainerMediaChunk.java b/library/src/main/java/com/google/android/exoplayer2/chunk/ContainerMediaChunk.java similarity index 84% rename from library/src/main/java/com/google/android/exoplayer/chunk/ContainerMediaChunk.java rename to library/src/main/java/com/google/android/exoplayer2/chunk/ContainerMediaChunk.java index ac880a135f..7ac2baaa2b 100644 --- a/library/src/main/java/com/google/android/exoplayer/chunk/ContainerMediaChunk.java +++ b/library/src/main/java/com/google/android/exoplayer2/chunk/ContainerMediaChunk.java @@ -1,5 +1,5 @@ /* - * 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,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.android.exoplayer.chunk; +package com.google.android.exoplayer2.chunk; -import com.google.android.exoplayer.Format; -import com.google.android.exoplayer.chunk.ChunkExtractorWrapper.SingleTrackMetadataOutput; -import com.google.android.exoplayer.extractor.DefaultExtractorInput; -import com.google.android.exoplayer.extractor.DefaultTrackOutput; -import com.google.android.exoplayer.extractor.Extractor; -import com.google.android.exoplayer.extractor.ExtractorInput; -import com.google.android.exoplayer.extractor.SeekMap; -import com.google.android.exoplayer.upstream.DataSource; -import com.google.android.exoplayer.upstream.DataSpec; -import com.google.android.exoplayer.util.Util; +import com.google.android.exoplayer2.Format; +import com.google.android.exoplayer2.chunk.ChunkExtractorWrapper.SingleTrackMetadataOutput; +import com.google.android.exoplayer2.extractor.DefaultExtractorInput; +import com.google.android.exoplayer2.extractor.DefaultTrackOutput; +import com.google.android.exoplayer2.extractor.Extractor; +import com.google.android.exoplayer2.extractor.ExtractorInput; +import com.google.android.exoplayer2.extractor.SeekMap; +import com.google.android.exoplayer2.upstream.DataSource; +import com.google.android.exoplayer2.upstream.DataSpec; +import com.google.android.exoplayer2.util.Util; import java.io.IOException; diff --git a/library/src/main/java/com/google/android/exoplayer/chunk/DataChunk.java b/library/src/main/java/com/google/android/exoplayer2/chunk/DataChunk.java similarity index 92% rename from library/src/main/java/com/google/android/exoplayer/chunk/DataChunk.java rename to library/src/main/java/com/google/android/exoplayer2/chunk/DataChunk.java index 7a0ed06314..1fe3bc0eae 100644 --- a/library/src/main/java/com/google/android/exoplayer/chunk/DataChunk.java +++ b/library/src/main/java/com/google/android/exoplayer2/chunk/DataChunk.java @@ -1,5 +1,5 @@ /* - * 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.chunk; +package com.google.android.exoplayer2.chunk; -import com.google.android.exoplayer.C; -import com.google.android.exoplayer.Format; -import com.google.android.exoplayer.upstream.DataSource; -import com.google.android.exoplayer.upstream.DataSpec; +import com.google.android.exoplayer2.C; +import com.google.android.exoplayer2.Format; +import com.google.android.exoplayer2.upstream.DataSource; +import com.google.android.exoplayer2.upstream.DataSpec; import java.io.IOException; import java.util.Arrays; diff --git a/library/src/main/java/com/google/android/exoplayer/chunk/FormatEvaluator.java b/library/src/main/java/com/google/android/exoplayer2/chunk/FormatEvaluator.java similarity index 98% rename from library/src/main/java/com/google/android/exoplayer/chunk/FormatEvaluator.java rename to library/src/main/java/com/google/android/exoplayer2/chunk/FormatEvaluator.java index 973f4a3b2d..2aa2277be6 100644 --- a/library/src/main/java/com/google/android/exoplayer/chunk/FormatEvaluator.java +++ b/library/src/main/java/com/google/android/exoplayer2/chunk/FormatEvaluator.java @@ -1,5 +1,5 @@ /* - * 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.chunk; +package com.google.android.exoplayer2.chunk; -import com.google.android.exoplayer.Format; -import com.google.android.exoplayer.upstream.BandwidthMeter; +import com.google.android.exoplayer2.Format; +import com.google.android.exoplayer2.upstream.BandwidthMeter; import java.util.List; import java.util.Random; diff --git a/library/src/main/java/com/google/android/exoplayer/chunk/InitializationChunk.java b/library/src/main/java/com/google/android/exoplayer2/chunk/InitializationChunk.java similarity index 84% rename from library/src/main/java/com/google/android/exoplayer/chunk/InitializationChunk.java rename to library/src/main/java/com/google/android/exoplayer2/chunk/InitializationChunk.java index a953105ccc..b207f4a511 100644 --- a/library/src/main/java/com/google/android/exoplayer/chunk/InitializationChunk.java +++ b/library/src/main/java/com/google/android/exoplayer2/chunk/InitializationChunk.java @@ -1,5 +1,5 @@ /* - * 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,20 +13,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.android.exoplayer.chunk; +package com.google.android.exoplayer2.chunk; -import com.google.android.exoplayer.C; -import com.google.android.exoplayer.Format; -import com.google.android.exoplayer.chunk.ChunkExtractorWrapper.SingleTrackMetadataOutput; -import com.google.android.exoplayer.extractor.DefaultExtractorInput; -import com.google.android.exoplayer.extractor.Extractor; -import com.google.android.exoplayer.extractor.ExtractorInput; -import com.google.android.exoplayer.extractor.SeekMap; -import com.google.android.exoplayer.extractor.TrackOutput; -import com.google.android.exoplayer.upstream.DataSource; -import com.google.android.exoplayer.upstream.DataSpec; -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.Format; +import com.google.android.exoplayer2.chunk.ChunkExtractorWrapper.SingleTrackMetadataOutput; +import com.google.android.exoplayer2.extractor.DefaultExtractorInput; +import com.google.android.exoplayer2.extractor.Extractor; +import com.google.android.exoplayer2.extractor.ExtractorInput; +import com.google.android.exoplayer2.extractor.SeekMap; +import com.google.android.exoplayer2.extractor.TrackOutput; +import com.google.android.exoplayer2.upstream.DataSource; +import com.google.android.exoplayer2.upstream.DataSpec; +import com.google.android.exoplayer2.util.ParsableByteArray; +import com.google.android.exoplayer2.util.Util; import java.io.IOException; diff --git a/library/src/main/java/com/google/android/exoplayer/chunk/MediaChunk.java b/library/src/main/java/com/google/android/exoplayer2/chunk/MediaChunk.java similarity index 84% rename from library/src/main/java/com/google/android/exoplayer/chunk/MediaChunk.java rename to library/src/main/java/com/google/android/exoplayer2/chunk/MediaChunk.java index e7d2f5479e..cbde6def15 100644 --- a/library/src/main/java/com/google/android/exoplayer/chunk/MediaChunk.java +++ b/library/src/main/java/com/google/android/exoplayer2/chunk/MediaChunk.java @@ -1,5 +1,5 @@ /* - * 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.chunk; +package com.google.android.exoplayer2.chunk; -import com.google.android.exoplayer.C; -import com.google.android.exoplayer.Format; -import com.google.android.exoplayer.upstream.DataSource; -import com.google.android.exoplayer.upstream.DataSpec; -import com.google.android.exoplayer.util.Assertions; +import com.google.android.exoplayer2.C; +import com.google.android.exoplayer2.Format; +import com.google.android.exoplayer2.upstream.DataSource; +import com.google.android.exoplayer2.upstream.DataSpec; +import com.google.android.exoplayer2.util.Assertions; /** * An abstract base class for {@link Chunk}s that contain media samples. diff --git a/library/src/main/java/com/google/android/exoplayer/chunk/SingleSampleMediaChunk.java b/library/src/main/java/com/google/android/exoplayer2/chunk/SingleSampleMediaChunk.java similarity index 85% rename from library/src/main/java/com/google/android/exoplayer/chunk/SingleSampleMediaChunk.java rename to library/src/main/java/com/google/android/exoplayer2/chunk/SingleSampleMediaChunk.java index 8d1b85d552..1525b216e7 100644 --- a/library/src/main/java/com/google/android/exoplayer/chunk/SingleSampleMediaChunk.java +++ b/library/src/main/java/com/google/android/exoplayer2/chunk/SingleSampleMediaChunk.java @@ -1,5 +1,5 @@ /* - * 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.chunk; +package com.google.android.exoplayer2.chunk; -import com.google.android.exoplayer.C; -import com.google.android.exoplayer.Format; -import com.google.android.exoplayer.extractor.DefaultExtractorInput; -import com.google.android.exoplayer.extractor.DefaultTrackOutput; -import com.google.android.exoplayer.extractor.ExtractorInput; -import com.google.android.exoplayer.upstream.DataSource; -import com.google.android.exoplayer.upstream.DataSpec; -import com.google.android.exoplayer.util.Util; +import com.google.android.exoplayer2.C; +import com.google.android.exoplayer2.Format; +import com.google.android.exoplayer2.extractor.DefaultExtractorInput; +import com.google.android.exoplayer2.extractor.DefaultTrackOutput; +import com.google.android.exoplayer2.extractor.ExtractorInput; +import com.google.android.exoplayer2.upstream.DataSource; +import com.google.android.exoplayer2.upstream.DataSpec; +import com.google.android.exoplayer2.util.Util; import java.io.IOException; diff --git a/library/src/main/java/com/google/android/exoplayer/dash/DashChunkSource.java b/library/src/main/java/com/google/android/exoplayer2/dash/DashChunkSource.java similarity index 90% rename from library/src/main/java/com/google/android/exoplayer/dash/DashChunkSource.java rename to library/src/main/java/com/google/android/exoplayer2/dash/DashChunkSource.java index 7537e68e98..566d7003fb 100644 --- a/library/src/main/java/com/google/android/exoplayer/dash/DashChunkSource.java +++ b/library/src/main/java/com/google/android/exoplayer2/dash/DashChunkSource.java @@ -1,5 +1,5 @@ /* - * 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,38 +13,38 @@ * 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.BehindLiveWindowException; -import com.google.android.exoplayer.C; -import com.google.android.exoplayer.Format; -import com.google.android.exoplayer.Format.DecreasingBandwidthComparator; -import com.google.android.exoplayer.TrackGroup; -import com.google.android.exoplayer.chunk.Chunk; -import com.google.android.exoplayer.chunk.ChunkExtractorWrapper; -import com.google.android.exoplayer.chunk.ChunkHolder; -import com.google.android.exoplayer.chunk.ChunkSource; -import com.google.android.exoplayer.chunk.ContainerMediaChunk; -import com.google.android.exoplayer.chunk.FormatEvaluator; -import com.google.android.exoplayer.chunk.FormatEvaluator.Evaluation; -import com.google.android.exoplayer.chunk.InitializationChunk; -import com.google.android.exoplayer.chunk.MediaChunk; -import com.google.android.exoplayer.chunk.SingleSampleMediaChunk; -import com.google.android.exoplayer.dash.mpd.AdaptationSet; -import com.google.android.exoplayer.dash.mpd.MediaPresentationDescription; -import com.google.android.exoplayer.dash.mpd.Period; -import com.google.android.exoplayer.dash.mpd.RangedUri; -import com.google.android.exoplayer.dash.mpd.Representation; -import com.google.android.exoplayer.extractor.ChunkIndex; -import com.google.android.exoplayer.extractor.SeekMap; -import com.google.android.exoplayer.extractor.mkv.MatroskaExtractor; -import com.google.android.exoplayer.extractor.mp4.FragmentedMp4Extractor; -import com.google.android.exoplayer.upstream.DataSource; -import com.google.android.exoplayer.upstream.DataSpec; -import com.google.android.exoplayer.upstream.HttpDataSource.InvalidResponseCodeException; -import com.google.android.exoplayer.upstream.Loader; -import com.google.android.exoplayer.util.MimeTypes; -import com.google.android.exoplayer.util.Util; +import com.google.android.exoplayer2.BehindLiveWindowException; +import com.google.android.exoplayer2.C; +import com.google.android.exoplayer2.Format; +import com.google.android.exoplayer2.Format.DecreasingBandwidthComparator; +import com.google.android.exoplayer2.TrackGroup; +import com.google.android.exoplayer2.chunk.Chunk; +import com.google.android.exoplayer2.chunk.ChunkExtractorWrapper; +import com.google.android.exoplayer2.chunk.ChunkHolder; +import com.google.android.exoplayer2.chunk.ChunkSource; +import com.google.android.exoplayer2.chunk.ContainerMediaChunk; +import com.google.android.exoplayer2.chunk.FormatEvaluator; +import com.google.android.exoplayer2.chunk.FormatEvaluator.Evaluation; +import com.google.android.exoplayer2.chunk.InitializationChunk; +import com.google.android.exoplayer2.chunk.MediaChunk; +import com.google.android.exoplayer2.chunk.SingleSampleMediaChunk; +import com.google.android.exoplayer2.dash.mpd.AdaptationSet; +import com.google.android.exoplayer2.dash.mpd.MediaPresentationDescription; +import com.google.android.exoplayer2.dash.mpd.Period; +import com.google.android.exoplayer2.dash.mpd.RangedUri; +import com.google.android.exoplayer2.dash.mpd.Representation; +import com.google.android.exoplayer2.extractor.ChunkIndex; +import com.google.android.exoplayer2.extractor.SeekMap; +import com.google.android.exoplayer2.extractor.mkv.MatroskaExtractor; +import com.google.android.exoplayer2.extractor.mp4.FragmentedMp4Extractor; +import com.google.android.exoplayer2.upstream.DataSource; +import com.google.android.exoplayer2.upstream.DataSpec; +import com.google.android.exoplayer2.upstream.HttpDataSource.InvalidResponseCodeException; +import com.google.android.exoplayer2.upstream.Loader; +import com.google.android.exoplayer2.util.MimeTypes; +import com.google.android.exoplayer2.util.Util; import android.os.SystemClock; diff --git a/library/src/main/java/com/google/android/exoplayer/dash/DashSampleSource.java b/library/src/main/java/com/google/android/exoplayer2/dash/DashSampleSource.java similarity index 90% rename from library/src/main/java/com/google/android/exoplayer/dash/DashSampleSource.java rename to library/src/main/java/com/google/android/exoplayer2/dash/DashSampleSource.java index dfe4748c46..a49a42bdf9 100644 --- a/library/src/main/java/com/google/android/exoplayer/dash/DashSampleSource.java +++ b/library/src/main/java/com/google/android/exoplayer2/dash/DashSampleSource.java @@ -1,5 +1,5 @@ /* - * 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,38 +13,38 @@ * 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.AdaptiveSourceEventListener; -import com.google.android.exoplayer.AdaptiveSourceEventListener.EventDispatcher; -import com.google.android.exoplayer.C; -import com.google.android.exoplayer.CompositeSequenceableLoader; -import com.google.android.exoplayer.Format; -import com.google.android.exoplayer.ParserException; -import com.google.android.exoplayer.SampleSource; -import com.google.android.exoplayer.SampleSourceProvider; -import com.google.android.exoplayer.SequenceableLoader; -import com.google.android.exoplayer.TrackGroup; -import com.google.android.exoplayer.TrackGroupArray; -import com.google.android.exoplayer.TrackSelection; -import com.google.android.exoplayer.TrackStream; -import com.google.android.exoplayer.chunk.ChunkTrackStream; -import com.google.android.exoplayer.chunk.FormatEvaluator; -import com.google.android.exoplayer.chunk.FormatEvaluator.AdaptiveEvaluator; -import com.google.android.exoplayer.dash.mpd.AdaptationSet; -import com.google.android.exoplayer.dash.mpd.MediaPresentationDescription; -import com.google.android.exoplayer.dash.mpd.MediaPresentationDescriptionParser; -import com.google.android.exoplayer.dash.mpd.Period; -import com.google.android.exoplayer.dash.mpd.Representation; -import com.google.android.exoplayer.dash.mpd.UtcTimingElement; -import com.google.android.exoplayer.upstream.Allocator; -import com.google.android.exoplayer.upstream.BandwidthMeter; -import com.google.android.exoplayer.upstream.DataSource; -import com.google.android.exoplayer.upstream.DataSourceFactory; -import com.google.android.exoplayer.upstream.Loader; -import com.google.android.exoplayer.upstream.ParsingLoadable; -import com.google.android.exoplayer.util.Assertions; -import com.google.android.exoplayer.util.Util; +import com.google.android.exoplayer2.AdaptiveSourceEventListener; +import com.google.android.exoplayer2.AdaptiveSourceEventListener.EventDispatcher; +import com.google.android.exoplayer2.C; +import com.google.android.exoplayer2.CompositeSequenceableLoader; +import com.google.android.exoplayer2.Format; +import com.google.android.exoplayer2.ParserException; +import com.google.android.exoplayer2.SampleSource; +import com.google.android.exoplayer2.SampleSourceProvider; +import com.google.android.exoplayer2.SequenceableLoader; +import com.google.android.exoplayer2.TrackGroup; +import com.google.android.exoplayer2.TrackGroupArray; +import com.google.android.exoplayer2.TrackSelection; +import com.google.android.exoplayer2.TrackStream; +import com.google.android.exoplayer2.chunk.ChunkTrackStream; +import com.google.android.exoplayer2.chunk.FormatEvaluator; +import com.google.android.exoplayer2.chunk.FormatEvaluator.AdaptiveEvaluator; +import com.google.android.exoplayer2.dash.mpd.AdaptationSet; +import com.google.android.exoplayer2.dash.mpd.MediaPresentationDescription; +import com.google.android.exoplayer2.dash.mpd.MediaPresentationDescriptionParser; +import com.google.android.exoplayer2.dash.mpd.Period; +import com.google.android.exoplayer2.dash.mpd.Representation; +import com.google.android.exoplayer2.dash.mpd.UtcTimingElement; +import com.google.android.exoplayer2.upstream.Allocator; +import com.google.android.exoplayer2.upstream.BandwidthMeter; +import com.google.android.exoplayer2.upstream.DataSource; +import com.google.android.exoplayer2.upstream.DataSourceFactory; +import com.google.android.exoplayer2.upstream.Loader; +import com.google.android.exoplayer2.upstream.ParsingLoadable; +import com.google.android.exoplayer2.util.Assertions; +import com.google.android.exoplayer2.util.Util; import android.net.Uri; import android.os.Handler; diff --git a/library/src/main/java/com/google/android/exoplayer/dash/DashSegmentIndex.java b/library/src/main/java/com/google/android/exoplayer2/dash/DashSegmentIndex.java similarity index 95% rename from library/src/main/java/com/google/android/exoplayer/dash/DashSegmentIndex.java rename to library/src/main/java/com/google/android/exoplayer2/dash/DashSegmentIndex.java index 2625a0188f..9d784cf908 100644 --- a/library/src/main/java/com/google/android/exoplayer/dash/DashSegmentIndex.java +++ b/library/src/main/java/com/google/android/exoplayer2/dash/DashSegmentIndex.java @@ -1,5 +1,5 @@ /* - * 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.dash; +package com.google.android.exoplayer2.dash; -import com.google.android.exoplayer.C; -import com.google.android.exoplayer.dash.mpd.RangedUri; +import com.google.android.exoplayer2.C; +import com.google.android.exoplayer2.dash.mpd.RangedUri; /** * Indexes the segments within a media stream. diff --git a/library/src/main/java/com/google/android/exoplayer/dash/DashWrappingSegmentIndex.java b/library/src/main/java/com/google/android/exoplayer2/dash/DashWrappingSegmentIndex.java similarity index 89% rename from library/src/main/java/com/google/android/exoplayer/dash/DashWrappingSegmentIndex.java rename to library/src/main/java/com/google/android/exoplayer2/dash/DashWrappingSegmentIndex.java index 5542232e08..65b9c0a78e 100644 --- a/library/src/main/java/com/google/android/exoplayer/dash/DashWrappingSegmentIndex.java +++ b/library/src/main/java/com/google/android/exoplayer2/dash/DashWrappingSegmentIndex.java @@ -1,5 +1,5 @@ /* - * 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.dash; +package com.google.android.exoplayer2.dash; -import com.google.android.exoplayer.dash.mpd.RangedUri; -import com.google.android.exoplayer.extractor.ChunkIndex; +import com.google.android.exoplayer2.dash.mpd.RangedUri; +import com.google.android.exoplayer2.extractor.ChunkIndex; /** * An implementation of {@link DashSegmentIndex} that wraps a {@link ChunkIndex} parsed from a diff --git a/library/src/main/java/com/google/android/exoplayer/dash/mpd/AdaptationSet.java b/library/src/main/java/com/google/android/exoplayer2/dash/mpd/AdaptationSet.java similarity index 91% rename from library/src/main/java/com/google/android/exoplayer/dash/mpd/AdaptationSet.java rename to library/src/main/java/com/google/android/exoplayer2/dash/mpd/AdaptationSet.java index 3b8a42f99d..3fe157964f 100644 --- a/library/src/main/java/com/google/android/exoplayer/dash/mpd/AdaptationSet.java +++ b/library/src/main/java/com/google/android/exoplayer2/dash/mpd/AdaptationSet.java @@ -1,5 +1,5 @@ /* - * 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 java.util.Collections; import java.util.List; diff --git a/library/src/main/java/com/google/android/exoplayer/dash/mpd/DashSingleSegmentIndex.java b/library/src/main/java/com/google/android/exoplayer2/dash/mpd/DashSingleSegmentIndex.java similarity index 90% rename from library/src/main/java/com/google/android/exoplayer/dash/mpd/DashSingleSegmentIndex.java rename to library/src/main/java/com/google/android/exoplayer2/dash/mpd/DashSingleSegmentIndex.java index fe8db6ffbd..e41289f93a 100644 --- a/library/src/main/java/com/google/android/exoplayer/dash/mpd/DashSingleSegmentIndex.java +++ b/library/src/main/java/com/google/android/exoplayer2/dash/mpd/DashSingleSegmentIndex.java @@ -1,5 +1,5 @@ /* - * 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.dash.mpd; +package com.google.android.exoplayer2.dash.mpd; -import com.google.android.exoplayer.dash.DashSegmentIndex; +import com.google.android.exoplayer2.dash.DashSegmentIndex; /** * A {@link DashSegmentIndex} that defines a single segment. diff --git a/library/src/main/java/com/google/android/exoplayer/dash/mpd/MediaPresentationDescription.java b/library/src/main/java/com/google/android/exoplayer2/dash/mpd/MediaPresentationDescription.java similarity index 95% rename from library/src/main/java/com/google/android/exoplayer/dash/mpd/MediaPresentationDescription.java rename to library/src/main/java/com/google/android/exoplayer2/dash/mpd/MediaPresentationDescription.java index a2d66215e7..6937d4d3d9 100644 --- a/library/src/main/java/com/google/android/exoplayer/dash/mpd/MediaPresentationDescription.java +++ b/library/src/main/java/com/google/android/exoplayer2/dash/mpd/MediaPresentationDescription.java @@ -1,5 +1,5 @@ /* - * 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; diff --git a/library/src/main/java/com/google/android/exoplayer/dash/mpd/MediaPresentationDescriptionParser.java b/library/src/main/java/com/google/android/exoplayer2/dash/mpd/MediaPresentationDescriptionParser.java similarity index 96% rename from library/src/main/java/com/google/android/exoplayer/dash/mpd/MediaPresentationDescriptionParser.java rename to library/src/main/java/com/google/android/exoplayer2/dash/mpd/MediaPresentationDescriptionParser.java index 1e70183915..d2c689fa3e 100644 --- a/library/src/main/java/com/google/android/exoplayer/dash/mpd/MediaPresentationDescriptionParser.java +++ b/library/src/main/java/com/google/android/exoplayer2/dash/mpd/MediaPresentationDescriptionParser.java @@ -1,5 +1,5 @@ /* - * 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,24 +13,24 @@ * 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.C; -import com.google.android.exoplayer.Format; -import com.google.android.exoplayer.ParserException; -import com.google.android.exoplayer.dash.mpd.SegmentBase.SegmentList; -import com.google.android.exoplayer.dash.mpd.SegmentBase.SegmentTemplate; -import com.google.android.exoplayer.dash.mpd.SegmentBase.SegmentTimelineElement; -import com.google.android.exoplayer.dash.mpd.SegmentBase.SingleSegmentBase; -import com.google.android.exoplayer.drm.DrmInitData; -import com.google.android.exoplayer.drm.DrmInitData.SchemeData; -import com.google.android.exoplayer.extractor.mp4.PsshAtomUtil; -import com.google.android.exoplayer.upstream.ParsingLoadable; -import com.google.android.exoplayer.util.Assertions; -import com.google.android.exoplayer.util.MimeTypes; -import com.google.android.exoplayer.util.ParserUtil; -import com.google.android.exoplayer.util.UriUtil; -import com.google.android.exoplayer.util.Util; +import com.google.android.exoplayer2.C; +import com.google.android.exoplayer2.Format; +import com.google.android.exoplayer2.ParserException; +import com.google.android.exoplayer2.dash.mpd.SegmentBase.SegmentList; +import com.google.android.exoplayer2.dash.mpd.SegmentBase.SegmentTemplate; +import com.google.android.exoplayer2.dash.mpd.SegmentBase.SegmentTimelineElement; +import com.google.android.exoplayer2.dash.mpd.SegmentBase.SingleSegmentBase; +import com.google.android.exoplayer2.drm.DrmInitData; +import com.google.android.exoplayer2.drm.DrmInitData.SchemeData; +import com.google.android.exoplayer2.extractor.mp4.PsshAtomUtil; +import com.google.android.exoplayer2.upstream.ParsingLoadable; +import com.google.android.exoplayer2.util.Assertions; +import com.google.android.exoplayer2.util.MimeTypes; +import com.google.android.exoplayer2.util.ParserUtil; +import com.google.android.exoplayer2.util.UriUtil; +import com.google.android.exoplayer2.util.Util; import android.net.Uri; import android.text.TextUtils; diff --git a/library/src/main/java/com/google/android/exoplayer/dash/mpd/Period.java b/library/src/main/java/com/google/android/exoplayer2/dash/mpd/Period.java similarity index 94% rename from library/src/main/java/com/google/android/exoplayer/dash/mpd/Period.java rename to library/src/main/java/com/google/android/exoplayer2/dash/mpd/Period.java index f8398fdd3e..58fd533b08 100644 --- a/library/src/main/java/com/google/android/exoplayer/dash/mpd/Period.java +++ b/library/src/main/java/com/google/android/exoplayer2/dash/mpd/Period.java @@ -1,5 +1,5 @@ /* - * 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 java.util.Collections; import java.util.List; diff --git a/library/src/main/java/com/google/android/exoplayer/dash/mpd/RangedUri.java b/library/src/main/java/com/google/android/exoplayer2/dash/mpd/RangedUri.java similarity index 95% rename from library/src/main/java/com/google/android/exoplayer/dash/mpd/RangedUri.java rename to library/src/main/java/com/google/android/exoplayer2/dash/mpd/RangedUri.java index 22a8bfdee5..f034dc6eed 100644 --- a/library/src/main/java/com/google/android/exoplayer/dash/mpd/RangedUri.java +++ b/library/src/main/java/com/google/android/exoplayer2/dash/mpd/RangedUri.java @@ -1,5 +1,5 @@ /* - * 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.dash.mpd; +package com.google.android.exoplayer2.dash.mpd; -import com.google.android.exoplayer.util.Assertions; -import com.google.android.exoplayer.util.UriUtil; +import com.google.android.exoplayer2.util.Assertions; +import com.google.android.exoplayer2.util.UriUtil; import android.net.Uri; diff --git a/library/src/main/java/com/google/android/exoplayer/dash/mpd/Representation.java b/library/src/main/java/com/google/android/exoplayer2/dash/mpd/Representation.java similarity index 96% rename from library/src/main/java/com/google/android/exoplayer/dash/mpd/Representation.java rename to library/src/main/java/com/google/android/exoplayer2/dash/mpd/Representation.java index 37a926b2c6..e08dd56cee 100644 --- a/library/src/main/java/com/google/android/exoplayer/dash/mpd/Representation.java +++ b/library/src/main/java/com/google/android/exoplayer2/dash/mpd/Representation.java @@ -1,5 +1,5 @@ /* - * 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.dash.mpd; +package com.google.android.exoplayer2.dash.mpd; -import com.google.android.exoplayer.Format; -import com.google.android.exoplayer.dash.DashSegmentIndex; -import com.google.android.exoplayer.dash.mpd.SegmentBase.MultiSegmentBase; -import com.google.android.exoplayer.dash.mpd.SegmentBase.SingleSegmentBase; +import com.google.android.exoplayer2.Format; +import com.google.android.exoplayer2.dash.DashSegmentIndex; +import com.google.android.exoplayer2.dash.mpd.SegmentBase.MultiSegmentBase; +import com.google.android.exoplayer2.dash.mpd.SegmentBase.SingleSegmentBase; import android.net.Uri; diff --git a/library/src/main/java/com/google/android/exoplayer/dash/mpd/SegmentBase.java b/library/src/main/java/com/google/android/exoplayer2/dash/mpd/SegmentBase.java similarity index 98% rename from library/src/main/java/com/google/android/exoplayer/dash/mpd/SegmentBase.java rename to library/src/main/java/com/google/android/exoplayer2/dash/mpd/SegmentBase.java index 359162edbf..e8b38d9469 100644 --- a/library/src/main/java/com/google/android/exoplayer/dash/mpd/SegmentBase.java +++ b/library/src/main/java/com/google/android/exoplayer2/dash/mpd/SegmentBase.java @@ -1,5 +1,5 @@ /* - * 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.C; -import com.google.android.exoplayer.dash.DashSegmentIndex; -import com.google.android.exoplayer.util.Util; +import com.google.android.exoplayer2.C; +import com.google.android.exoplayer2.dash.DashSegmentIndex; +import com.google.android.exoplayer2.util.Util; import java.util.List; diff --git a/library/src/main/java/com/google/android/exoplayer/dash/mpd/UrlTemplate.java b/library/src/main/java/com/google/android/exoplayer2/dash/mpd/UrlTemplate.java similarity index 98% rename from library/src/main/java/com/google/android/exoplayer/dash/mpd/UrlTemplate.java rename to library/src/main/java/com/google/android/exoplayer2/dash/mpd/UrlTemplate.java index 97e4b72915..86c119e16f 100644 --- a/library/src/main/java/com/google/android/exoplayer/dash/mpd/UrlTemplate.java +++ b/library/src/main/java/com/google/android/exoplayer2/dash/mpd/UrlTemplate.java @@ -1,5 +1,5 @@ /* - * 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 java.util.Locale; diff --git a/library/src/main/java/com/google/android/exoplayer/dash/mpd/UtcTimingElement.java b/library/src/main/java/com/google/android/exoplayer2/dash/mpd/UtcTimingElement.java similarity index 90% rename from library/src/main/java/com/google/android/exoplayer/dash/mpd/UtcTimingElement.java rename to library/src/main/java/com/google/android/exoplayer2/dash/mpd/UtcTimingElement.java index 025cec3413..071afa29af 100644 --- a/library/src/main/java/com/google/android/exoplayer/dash/mpd/UtcTimingElement.java +++ b/library/src/main/java/com/google/android/exoplayer2/dash/mpd/UtcTimingElement.java @@ -1,5 +1,5 @@ /* - * 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; /** * Represents a UTCTiming element. diff --git a/library/src/main/java/com/google/android/exoplayer/drm/DrmInitData.java b/library/src/main/java/com/google/android/exoplayer2/drm/DrmInitData.java similarity index 95% rename from library/src/main/java/com/google/android/exoplayer/drm/DrmInitData.java rename to library/src/main/java/com/google/android/exoplayer2/drm/DrmInitData.java index f76795024a..26245cf87f 100644 --- a/library/src/main/java/com/google/android/exoplayer/drm/DrmInitData.java +++ b/library/src/main/java/com/google/android/exoplayer2/drm/DrmInitData.java @@ -1,5 +1,5 @@ /* - * 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.drm; +package com.google.android.exoplayer2.drm; -import com.google.android.exoplayer.C; -import com.google.android.exoplayer.drm.DrmInitData.SchemeData; -import com.google.android.exoplayer.util.Assertions; -import com.google.android.exoplayer.util.Util; +import com.google.android.exoplayer2.C; +import com.google.android.exoplayer2.drm.DrmInitData.SchemeData; +import com.google.android.exoplayer2.util.Assertions; +import com.google.android.exoplayer2.util.Util; import android.os.Parcel; import android.os.Parcelable; diff --git a/library/src/main/java/com/google/android/exoplayer/drm/DrmSession.java b/library/src/main/java/com/google/android/exoplayer2/drm/DrmSession.java similarity index 96% rename from library/src/main/java/com/google/android/exoplayer/drm/DrmSession.java rename to library/src/main/java/com/google/android/exoplayer2/drm/DrmSession.java index bd2a267067..3cc1cac4df 100644 --- a/library/src/main/java/com/google/android/exoplayer/drm/DrmSession.java +++ b/library/src/main/java/com/google/android/exoplayer2/drm/DrmSession.java @@ -1,5 +1,5 @@ /* - * 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.drm; +package com.google.android.exoplayer2.drm; import android.annotation.TargetApi; import android.media.MediaCrypto; diff --git a/library/src/main/java/com/google/android/exoplayer/drm/DrmSessionManager.java b/library/src/main/java/com/google/android/exoplayer2/drm/DrmSessionManager.java similarity index 92% rename from library/src/main/java/com/google/android/exoplayer/drm/DrmSessionManager.java rename to library/src/main/java/com/google/android/exoplayer2/drm/DrmSessionManager.java index 940c347c2b..95d22032d9 100644 --- a/library/src/main/java/com/google/android/exoplayer/drm/DrmSessionManager.java +++ b/library/src/main/java/com/google/android/exoplayer2/drm/DrmSessionManager.java @@ -1,5 +1,5 @@ /* - * 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.drm; +package com.google.android.exoplayer2.drm; import android.annotation.TargetApi; import android.os.Looper; diff --git a/library/src/main/java/com/google/android/exoplayer/drm/KeysExpiredException.java b/library/src/main/java/com/google/android/exoplayer2/drm/KeysExpiredException.java similarity index 87% rename from library/src/main/java/com/google/android/exoplayer/drm/KeysExpiredException.java rename to library/src/main/java/com/google/android/exoplayer2/drm/KeysExpiredException.java index 75945a7ec1..e5e1089fa9 100644 --- a/library/src/main/java/com/google/android/exoplayer/drm/KeysExpiredException.java +++ b/library/src/main/java/com/google/android/exoplayer2/drm/KeysExpiredException.java @@ -1,5 +1,5 @@ /* - * 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.drm; +package com.google.android.exoplayer2.drm; /** * Thrown when the drm keys loaded into an open session expire. diff --git a/library/src/main/java/com/google/android/exoplayer/drm/MediaDrmCallback.java b/library/src/main/java/com/google/android/exoplayer2/drm/MediaDrmCallback.java similarity index 93% rename from library/src/main/java/com/google/android/exoplayer/drm/MediaDrmCallback.java rename to library/src/main/java/com/google/android/exoplayer2/drm/MediaDrmCallback.java index 30757e75b4..2a3274d6a1 100644 --- a/library/src/main/java/com/google/android/exoplayer/drm/MediaDrmCallback.java +++ b/library/src/main/java/com/google/android/exoplayer2/drm/MediaDrmCallback.java @@ -1,5 +1,5 @@ /* - * 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.drm; +package com.google.android.exoplayer2.drm; import android.annotation.TargetApi; import android.media.MediaDrm; diff --git a/library/src/main/java/com/google/android/exoplayer/drm/StreamingDrmSessionManager.java b/library/src/main/java/com/google/android/exoplayer2/drm/StreamingDrmSessionManager.java similarity index 97% rename from library/src/main/java/com/google/android/exoplayer/drm/StreamingDrmSessionManager.java rename to library/src/main/java/com/google/android/exoplayer2/drm/StreamingDrmSessionManager.java index a670484d13..6085ff8c7b 100644 --- a/library/src/main/java/com/google/android/exoplayer/drm/StreamingDrmSessionManager.java +++ b/library/src/main/java/com/google/android/exoplayer2/drm/StreamingDrmSessionManager.java @@ -1,5 +1,5 @@ /* - * 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.drm; +package com.google.android.exoplayer2.drm; -import com.google.android.exoplayer.C; -import com.google.android.exoplayer.drm.DrmInitData.SchemeData; -import com.google.android.exoplayer.extractor.mp4.PsshAtomUtil; -import com.google.android.exoplayer.util.Assertions; -import com.google.android.exoplayer.util.Util; +import com.google.android.exoplayer2.C; +import com.google.android.exoplayer2.drm.DrmInitData.SchemeData; +import com.google.android.exoplayer2.extractor.mp4.PsshAtomUtil; +import com.google.android.exoplayer2.util.Assertions; +import com.google.android.exoplayer2.util.Util; import android.annotation.SuppressLint; import android.annotation.TargetApi; diff --git a/library/src/main/java/com/google/android/exoplayer/drm/UnsupportedDrmException.java b/library/src/main/java/com/google/android/exoplayer2/drm/UnsupportedDrmException.java similarity index 92% rename from library/src/main/java/com/google/android/exoplayer/drm/UnsupportedDrmException.java rename to library/src/main/java/com/google/android/exoplayer2/drm/UnsupportedDrmException.java index b5f2d12211..d4d4ca5286 100644 --- a/library/src/main/java/com/google/android/exoplayer/drm/UnsupportedDrmException.java +++ b/library/src/main/java/com/google/android/exoplayer2/drm/UnsupportedDrmException.java @@ -1,5 +1,5 @@ /* - * 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.drm; +package com.google.android.exoplayer2.drm; /** * Thrown when the requested DRM scheme is not supported. diff --git a/library/src/main/java/com/google/android/exoplayer/extensions/AudioDecoderException.java b/library/src/main/java/com/google/android/exoplayer2/extensions/AudioDecoderException.java similarity index 94% rename from library/src/main/java/com/google/android/exoplayer/extensions/AudioDecoderException.java rename to library/src/main/java/com/google/android/exoplayer2/extensions/AudioDecoderException.java index 52c1cad4f5..0f15335770 100644 --- a/library/src/main/java/com/google/android/exoplayer/extensions/AudioDecoderException.java +++ b/library/src/main/java/com/google/android/exoplayer2/extensions/AudioDecoderException.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.android.exoplayer.extensions; +package com.google.android.exoplayer2.extensions; /** * Thrown when a decoder error occurs. diff --git a/library/src/main/java/com/google/android/exoplayer/extensions/AudioDecoderTrackRenderer.java b/library/src/main/java/com/google/android/exoplayer2/extensions/AudioDecoderTrackRenderer.java similarity index 93% rename from library/src/main/java/com/google/android/exoplayer/extensions/AudioDecoderTrackRenderer.java rename to library/src/main/java/com/google/android/exoplayer2/extensions/AudioDecoderTrackRenderer.java index a1389d13a7..2486a62bc3 100644 --- a/library/src/main/java/com/google/android/exoplayer/extensions/AudioDecoderTrackRenderer.java +++ b/library/src/main/java/com/google/android/exoplayer2/extensions/AudioDecoderTrackRenderer.java @@ -13,22 +13,22 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.android.exoplayer.extensions; +package com.google.android.exoplayer2.extensions; -import com.google.android.exoplayer.AudioTrackRendererEventListener; -import com.google.android.exoplayer.AudioTrackRendererEventListener.EventDispatcher; -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.Format; -import com.google.android.exoplayer.FormatHolder; -import com.google.android.exoplayer.MediaClock; -import com.google.android.exoplayer.TrackRenderer; -import com.google.android.exoplayer.TrackStream; -import com.google.android.exoplayer.audio.AudioTrack; -import com.google.android.exoplayer.util.MimeTypes; -import com.google.android.exoplayer.util.TraceUtil; +import com.google.android.exoplayer2.AudioTrackRendererEventListener; +import com.google.android.exoplayer2.AudioTrackRendererEventListener.EventDispatcher; +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.Format; +import com.google.android.exoplayer2.FormatHolder; +import com.google.android.exoplayer2.MediaClock; +import com.google.android.exoplayer2.TrackRenderer; +import com.google.android.exoplayer2.TrackStream; +import com.google.android.exoplayer2.audio.AudioTrack; +import com.google.android.exoplayer2.util.MimeTypes; +import com.google.android.exoplayer2.util.TraceUtil; import android.media.PlaybackParams; import android.os.Handler; diff --git a/library/src/main/java/com/google/android/exoplayer/extensions/Decoder.java b/library/src/main/java/com/google/android/exoplayer2/extensions/Decoder.java similarity index 95% rename from library/src/main/java/com/google/android/exoplayer/extensions/Decoder.java rename to library/src/main/java/com/google/android/exoplayer2/extensions/Decoder.java index 38eb4f07f5..79e0e5849e 100644 --- a/library/src/main/java/com/google/android/exoplayer/extensions/Decoder.java +++ b/library/src/main/java/com/google/android/exoplayer2/extensions/Decoder.java @@ -1,5 +1,5 @@ /* - * 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.extensions; +package com.google.android.exoplayer2.extensions; /** * A media decoder. diff --git a/library/src/main/java/com/google/android/exoplayer/extensions/OutputBuffer.java b/library/src/main/java/com/google/android/exoplayer2/extensions/OutputBuffer.java similarity index 87% rename from library/src/main/java/com/google/android/exoplayer/extensions/OutputBuffer.java rename to library/src/main/java/com/google/android/exoplayer2/extensions/OutputBuffer.java index dd6896bb26..22aaf4fc73 100644 --- a/library/src/main/java/com/google/android/exoplayer/extensions/OutputBuffer.java +++ b/library/src/main/java/com/google/android/exoplayer2/extensions/OutputBuffer.java @@ -1,5 +1,5 @@ /* - * 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.extensions; +package com.google.android.exoplayer2.extensions; -import com.google.android.exoplayer.util.Buffer; +import com.google.android.exoplayer2.util.Buffer; /** * Output buffer decoded by a {@link Decoder}. diff --git a/library/src/main/java/com/google/android/exoplayer/extensions/SimpleDecoder.java b/library/src/main/java/com/google/android/exoplayer2/extensions/SimpleDecoder.java similarity index 97% rename from library/src/main/java/com/google/android/exoplayer/extensions/SimpleDecoder.java rename to library/src/main/java/com/google/android/exoplayer2/extensions/SimpleDecoder.java index 0bdcfccf2a..f782e30737 100644 --- a/library/src/main/java/com/google/android/exoplayer/extensions/SimpleDecoder.java +++ b/library/src/main/java/com/google/android/exoplayer2/extensions/SimpleDecoder.java @@ -1,5 +1,5 @@ /* - * 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.extensions; +package com.google.android.exoplayer2.extensions; -import com.google.android.exoplayer.C; -import com.google.android.exoplayer.DecoderInputBuffer; -import com.google.android.exoplayer.util.Assertions; +import com.google.android.exoplayer2.C; +import com.google.android.exoplayer2.DecoderInputBuffer; +import com.google.android.exoplayer2.util.Assertions; import java.util.LinkedList; diff --git a/library/src/main/java/com/google/android/exoplayer/extensions/SimpleOutputBuffer.java b/library/src/main/java/com/google/android/exoplayer2/extensions/SimpleOutputBuffer.java similarity index 97% rename from library/src/main/java/com/google/android/exoplayer/extensions/SimpleOutputBuffer.java rename to library/src/main/java/com/google/android/exoplayer2/extensions/SimpleOutputBuffer.java index d7d6de6980..706af6d060 100644 --- a/library/src/main/java/com/google/android/exoplayer/extensions/SimpleOutputBuffer.java +++ b/library/src/main/java/com/google/android/exoplayer2/extensions/SimpleOutputBuffer.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.android.exoplayer.extensions; +package com.google.android.exoplayer2.extensions; import java.nio.ByteBuffer; diff --git a/library/src/main/java/com/google/android/exoplayer/extractor/ChunkIndex.java b/library/src/main/java/com/google/android/exoplayer2/extractor/ChunkIndex.java similarity index 93% rename from library/src/main/java/com/google/android/exoplayer/extractor/ChunkIndex.java rename to library/src/main/java/com/google/android/exoplayer2/extractor/ChunkIndex.java index 2a173f8f72..4ce430c5ff 100644 --- a/library/src/main/java/com/google/android/exoplayer/extractor/ChunkIndex.java +++ b/library/src/main/java/com/google/android/exoplayer2/extractor/ChunkIndex.java @@ -1,5 +1,5 @@ /* - * 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.util.Util; +import com.google.android.exoplayer2.util.Util; /** * Defines chunks of samples within a media stream. diff --git a/library/src/main/java/com/google/android/exoplayer/extractor/DefaultExtractorInput.java b/library/src/main/java/com/google/android/exoplayer2/extractor/DefaultExtractorInput.java similarity index 97% rename from library/src/main/java/com/google/android/exoplayer/extractor/DefaultExtractorInput.java rename to library/src/main/java/com/google/android/exoplayer2/extractor/DefaultExtractorInput.java index 1e4937ba88..d78ddb7a12 100644 --- a/library/src/main/java/com/google/android/exoplayer/extractor/DefaultExtractorInput.java +++ b/library/src/main/java/com/google/android/exoplayer2/extractor/DefaultExtractorInput.java @@ -1,5 +1,5 @@ /* - * 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.upstream.DataSource; -import com.google.android.exoplayer.util.Assertions; +import com.google.android.exoplayer2.C; +import com.google.android.exoplayer2.upstream.DataSource; +import com.google.android.exoplayer2.util.Assertions; import java.io.EOFException; import java.io.IOException; diff --git a/library/src/main/java/com/google/android/exoplayer/extractor/DefaultExtractorsFactory.java b/library/src/main/java/com/google/android/exoplayer2/extractor/DefaultExtractorsFactory.java similarity index 68% rename from library/src/main/java/com/google/android/exoplayer/extractor/DefaultExtractorsFactory.java rename to library/src/main/java/com/google/android/exoplayer2/extractor/DefaultExtractorsFactory.java index 41716a3a25..2f43f900f7 100644 --- a/library/src/main/java/com/google/android/exoplayer/extractor/DefaultExtractorsFactory.java +++ b/library/src/main/java/com/google/android/exoplayer2/extractor/DefaultExtractorsFactory.java @@ -1,5 +1,5 @@ /* - * 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.extractor; +package com.google.android.exoplayer2.extractor; import java.util.ArrayList; import java.util.List; @@ -22,17 +22,17 @@ import java.util.List; * An {@link ExtractorsFactory} that provides an array of extractors for the following formats: * *
    - *
  • MP4, including M4A ({@link com.google.android.exoplayer.extractor.mp4.Mp4Extractor})
    • - *
  • fMP4 ({@link com.google.android.exoplayer.extractor.mp4.FragmentedMp4Extractor})
    • - *
  • Matroska and WebM ({@link com.google.android.exoplayer.extractor.mkv.MatroskaExtractor}) + *
  • MP4, including M4A ({@link com.google.android.exoplayer2.extractor.mp4.Mp4Extractor})
    • + *
  • fMP4 ({@link com.google.android.exoplayer2.extractor.mp4.FragmentedMp4Extractor})
    • + *
  • Matroska and WebM ({@link com.google.android.exoplayer2.extractor.mkv.MatroskaExtractor}) *
    • - *
  • Ogg Vorbis/FLAC ({@link com.google.android.exoplayer.extractor.ogg.OggExtractor}
    • - *
  • MP3 ({@link com.google.android.exoplayer.extractor.mp3.Mp3Extractor})
    • - *
  • AAC ({@link com.google.android.exoplayer.extractor.ts.AdtsExtractor})
    • - *
  • MPEG TS ({@link com.google.android.exoplayer.extractor.ts.TsExtractor})
    • - *
  • MPEG PS ({@link com.google.android.exoplayer.extractor.ts.PsExtractor})
    • - *
  • FLV ({@link com.google.android.exoplayer.extractor.flv.FlvExtractor})
    • - *
  • WAV ({@link com.google.android.exoplayer.extractor.wav.WavExtractor})
    • + *
  • Ogg Vorbis/FLAC ({@link com.google.android.exoplayer2.extractor.ogg.OggExtractor}
    • + *
  • MP3 ({@link com.google.android.exoplayer2.extractor.mp3.Mp3Extractor})
    • + *
  • AAC ({@link com.google.android.exoplayer2.extractor.ts.AdtsExtractor})
    • + *
  • MPEG TS ({@link com.google.android.exoplayer2.extractor.ts.TsExtractor})
    • + *
  • MPEG PS ({@link com.google.android.exoplayer2.extractor.ts.PsExtractor})
    • + *
  • FLV ({@link com.google.android.exoplayer2.extractor.flv.FlvExtractor})
    • + *
  • WAV ({@link com.google.android.exoplayer2.extractor.wav.WavExtractor})
    • *
  • FLAC (only available if the FLAC extension is built and included)
    • *
*/ @@ -54,77 +54,77 @@ public final class DefaultExtractorsFactory implements ExtractorsFactory { // reflection (see http://proguard.sourceforge.net/FAQ.html#forname). try { extractorClasses.add( - Class.forName("com.google.android.exoplayer.extractor.mkv.MatroskaExtractor") + Class.forName("com.google.android.exoplayer2.extractor.mkv.MatroskaExtractor") .asSubclass(Extractor.class)); } catch (ClassNotFoundException e) { // Extractor not found. } try { extractorClasses.add( - Class.forName("com.google.android.exoplayer.extractor.mp4.FragmentedMp4Extractor") + Class.forName("com.google.android.exoplayer2.extractor.mp4.FragmentedMp4Extractor") .asSubclass(Extractor.class)); } catch (ClassNotFoundException e) { // Extractor not found. } try { extractorClasses.add( - Class.forName("com.google.android.exoplayer.extractor.mp4.Mp4Extractor") + Class.forName("com.google.android.exoplayer2.extractor.mp4.Mp4Extractor") .asSubclass(Extractor.class)); } catch (ClassNotFoundException e) { // Extractor not found. } try { extractorClasses.add( - Class.forName("com.google.android.exoplayer.extractor.mp3.Mp3Extractor") + Class.forName("com.google.android.exoplayer2.extractor.mp3.Mp3Extractor") .asSubclass(Extractor.class)); } catch (ClassNotFoundException e) { // Extractor not found. } try { extractorClasses.add( - Class.forName("com.google.android.exoplayer.extractor.ts.AdtsExtractor") + Class.forName("com.google.android.exoplayer2.extractor.ts.AdtsExtractor") .asSubclass(Extractor.class)); } catch (ClassNotFoundException e) { // Extractor not found. } try { extractorClasses.add( - Class.forName("com.google.android.exoplayer.extractor.ts.TsExtractor") + Class.forName("com.google.android.exoplayer2.extractor.ts.TsExtractor") .asSubclass(Extractor.class)); } catch (ClassNotFoundException e) { // Extractor not found. } try { extractorClasses.add( - Class.forName("com.google.android.exoplayer.extractor.flv.FlvExtractor") + Class.forName("com.google.android.exoplayer2.extractor.flv.FlvExtractor") .asSubclass(Extractor.class)); } catch (ClassNotFoundException e) { // Extractor not found. } try { extractorClasses.add( - Class.forName("com.google.android.exoplayer.extractor.ogg.OggExtractor") + Class.forName("com.google.android.exoplayer2.extractor.ogg.OggExtractor") .asSubclass(Extractor.class)); } catch (ClassNotFoundException e) { // Extractor not found. } try { extractorClasses.add( - Class.forName("com.google.android.exoplayer.extractor.ts.PsExtractor") + Class.forName("com.google.android.exoplayer2.extractor.ts.PsExtractor") .asSubclass(Extractor.class)); } catch (ClassNotFoundException e) { // Extractor not found. } try { extractorClasses.add( - Class.forName("com.google.android.exoplayer.extractor.wav.WavExtractor") + Class.forName("com.google.android.exoplayer2.extractor.wav.WavExtractor") .asSubclass(Extractor.class)); } catch (ClassNotFoundException e) { // Extractor not found. } try { extractorClasses.add( - Class.forName("com.google.android.exoplayer.ext.flac.FlacExtractor") + Class.forName("com.google.android.exoplayer2.ext.flac.FlacExtractor") .asSubclass(Extractor.class)); } catch (ClassNotFoundException e) { // Extractor not found. diff --git a/library/src/main/java/com/google/android/exoplayer/extractor/DefaultTrackOutput.java b/library/src/main/java/com/google/android/exoplayer2/extractor/DefaultTrackOutput.java similarity index 98% rename from library/src/main/java/com/google/android/exoplayer/extractor/DefaultTrackOutput.java rename to library/src/main/java/com/google/android/exoplayer2/extractor/DefaultTrackOutput.java index 2466dfbe9b..43e0b88815 100644 --- a/library/src/main/java/com/google/android/exoplayer/extractor/DefaultTrackOutput.java +++ b/library/src/main/java/com/google/android/exoplayer2/extractor/DefaultTrackOutput.java @@ -1,5 +1,5 @@ /* - * 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,18 +13,18 @@ * 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.DecoderInputBuffer; -import com.google.android.exoplayer.Format; -import com.google.android.exoplayer.FormatHolder; -import com.google.android.exoplayer.TrackStream; -import com.google.android.exoplayer.upstream.Allocation; -import com.google.android.exoplayer.upstream.Allocator; -import com.google.android.exoplayer.util.Assertions; -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.DecoderInputBuffer; +import com.google.android.exoplayer2.Format; +import com.google.android.exoplayer2.FormatHolder; +import com.google.android.exoplayer2.TrackStream; +import com.google.android.exoplayer2.upstream.Allocation; +import com.google.android.exoplayer2.upstream.Allocator; +import com.google.android.exoplayer2.util.Assertions; +import com.google.android.exoplayer2.util.ParsableByteArray; +import com.google.android.exoplayer2.util.Util; import java.io.EOFException; import java.io.IOException; diff --git a/library/src/main/java/com/google/android/exoplayer/extractor/DummyTrackOutput.java b/library/src/main/java/com/google/android/exoplayer2/extractor/DummyTrackOutput.java similarity index 85% rename from library/src/main/java/com/google/android/exoplayer/extractor/DummyTrackOutput.java rename to library/src/main/java/com/google/android/exoplayer2/extractor/DummyTrackOutput.java index 39e13c50de..8e13895713 100644 --- a/library/src/main/java/com/google/android/exoplayer/extractor/DummyTrackOutput.java +++ b/library/src/main/java/com/google/android/exoplayer2/extractor/DummyTrackOutput.java @@ -1,5 +1,5 @@ /* - * 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; +package com.google.android.exoplayer2.extractor; -import com.google.android.exoplayer.C; -import com.google.android.exoplayer.Format; -import com.google.android.exoplayer.util.ParsableByteArray; +import com.google.android.exoplayer2.C; +import com.google.android.exoplayer2.Format; +import com.google.android.exoplayer2.util.ParsableByteArray; import java.io.EOFException; import java.io.IOException; diff --git a/library/src/main/java/com/google/android/exoplayer/extractor/Extractor.java b/library/src/main/java/com/google/android/exoplayer2/extractor/Extractor.java similarity index 96% rename from library/src/main/java/com/google/android/exoplayer/extractor/Extractor.java rename to library/src/main/java/com/google/android/exoplayer2/extractor/Extractor.java index 95f3dbe940..6e80e1d6dd 100644 --- a/library/src/main/java/com/google/android/exoplayer/extractor/Extractor.java +++ b/library/src/main/java/com/google/android/exoplayer2/extractor/Extractor.java @@ -1,5 +1,5 @@ /* - * 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 java.io.IOException; diff --git a/library/src/main/java/com/google/android/exoplayer/extractor/ExtractorInput.java b/library/src/main/java/com/google/android/exoplayer2/extractor/ExtractorInput.java similarity index 98% rename from library/src/main/java/com/google/android/exoplayer/extractor/ExtractorInput.java rename to library/src/main/java/com/google/android/exoplayer2/extractor/ExtractorInput.java index e61e8ea03c..fcdedb683a 100644 --- a/library/src/main/java/com/google/android/exoplayer/extractor/ExtractorInput.java +++ b/library/src/main/java/com/google/android/exoplayer2/extractor/ExtractorInput.java @@ -1,5 +1,5 @@ /* - * 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 java.io.EOFException; import java.io.IOException; diff --git a/library/src/main/java/com/google/android/exoplayer/extractor/ExtractorOutput.java b/library/src/main/java/com/google/android/exoplayer2/extractor/ExtractorOutput.java similarity index 93% rename from library/src/main/java/com/google/android/exoplayer/extractor/ExtractorOutput.java rename to library/src/main/java/com/google/android/exoplayer2/extractor/ExtractorOutput.java index dd85243788..2d440ba198 100644 --- a/library/src/main/java/com/google/android/exoplayer/extractor/ExtractorOutput.java +++ b/library/src/main/java/com/google/android/exoplayer2/extractor/ExtractorOutput.java @@ -1,5 +1,5 @@ /* - * 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.extractor; +package com.google.android.exoplayer2.extractor; /** * Receives stream level data extracted by an {@link Extractor}. diff --git a/library/src/main/java/com/google/android/exoplayer/extractor/ExtractorSampleSource.java b/library/src/main/java/com/google/android/exoplayer2/extractor/ExtractorSampleSource.java similarity index 94% rename from library/src/main/java/com/google/android/exoplayer/extractor/ExtractorSampleSource.java rename to library/src/main/java/com/google/android/exoplayer2/extractor/ExtractorSampleSource.java index 04c57cffeb..a4ce1ac83b 100644 --- a/library/src/main/java/com/google/android/exoplayer/extractor/ExtractorSampleSource.java +++ b/library/src/main/java/com/google/android/exoplayer2/extractor/ExtractorSampleSource.java @@ -1,5 +1,5 @@ /* - * 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,31 +13,31 @@ * 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.DecoderInputBuffer; -import com.google.android.exoplayer.Format; -import com.google.android.exoplayer.FormatHolder; -import com.google.android.exoplayer.ParserException; -import com.google.android.exoplayer.SampleSource; -import com.google.android.exoplayer.SampleSourceProvider; -import com.google.android.exoplayer.SequenceableLoader; -import com.google.android.exoplayer.TrackGroup; -import com.google.android.exoplayer.TrackGroupArray; -import com.google.android.exoplayer.TrackSelection; -import com.google.android.exoplayer.TrackStream; -import com.google.android.exoplayer.extractor.DefaultTrackOutput.UpstreamFormatChangedListener; -import com.google.android.exoplayer.upstream.Allocator; -import com.google.android.exoplayer.upstream.BandwidthMeter; -import com.google.android.exoplayer.upstream.DataSource; -import com.google.android.exoplayer.upstream.DataSourceFactory; -import com.google.android.exoplayer.upstream.DataSpec; -import com.google.android.exoplayer.upstream.Loader; -import com.google.android.exoplayer.upstream.Loader.Loadable; -import com.google.android.exoplayer.util.Assertions; -import com.google.android.exoplayer.util.ConditionVariable; -import com.google.android.exoplayer.util.Util; +import com.google.android.exoplayer2.C; +import com.google.android.exoplayer2.DecoderInputBuffer; +import com.google.android.exoplayer2.Format; +import com.google.android.exoplayer2.FormatHolder; +import com.google.android.exoplayer2.ParserException; +import com.google.android.exoplayer2.SampleSource; +import com.google.android.exoplayer2.SampleSourceProvider; +import com.google.android.exoplayer2.SequenceableLoader; +import com.google.android.exoplayer2.TrackGroup; +import com.google.android.exoplayer2.TrackGroupArray; +import com.google.android.exoplayer2.TrackSelection; +import com.google.android.exoplayer2.TrackStream; +import com.google.android.exoplayer2.extractor.DefaultTrackOutput.UpstreamFormatChangedListener; +import com.google.android.exoplayer2.upstream.Allocator; +import com.google.android.exoplayer2.upstream.BandwidthMeter; +import com.google.android.exoplayer2.upstream.DataSource; +import com.google.android.exoplayer2.upstream.DataSourceFactory; +import com.google.android.exoplayer2.upstream.DataSpec; +import com.google.android.exoplayer2.upstream.Loader; +import com.google.android.exoplayer2.upstream.Loader.Loadable; +import com.google.android.exoplayer2.util.Assertions; +import com.google.android.exoplayer2.util.ConditionVariable; +import com.google.android.exoplayer2.util.Util; import android.net.Uri; import android.os.Handler; diff --git a/library/src/main/java/com/google/android/exoplayer/extractor/ExtractorsFactory.java b/library/src/main/java/com/google/android/exoplayer2/extractor/ExtractorsFactory.java similarity index 88% rename from library/src/main/java/com/google/android/exoplayer/extractor/ExtractorsFactory.java rename to library/src/main/java/com/google/android/exoplayer2/extractor/ExtractorsFactory.java index 85a1cc38fd..b89990ff10 100644 --- a/library/src/main/java/com/google/android/exoplayer/extractor/ExtractorsFactory.java +++ b/library/src/main/java/com/google/android/exoplayer2/extractor/ExtractorsFactory.java @@ -1,5 +1,5 @@ /* - * 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.extractor; +package com.google.android.exoplayer2.extractor; /** * Factory for arrays of {@link Extractor}s. diff --git a/library/src/main/java/com/google/android/exoplayer/extractor/GaplessInfoHolder.java b/library/src/main/java/com/google/android/exoplayer2/extractor/GaplessInfoHolder.java similarity index 95% rename from library/src/main/java/com/google/android/exoplayer/extractor/GaplessInfoHolder.java rename to library/src/main/java/com/google/android/exoplayer2/extractor/GaplessInfoHolder.java index 0836679d3c..c804075b98 100644 --- a/library/src/main/java/com/google/android/exoplayer/extractor/GaplessInfoHolder.java +++ b/library/src/main/java/com/google/android/exoplayer2/extractor/GaplessInfoHolder.java @@ -1,5 +1,5 @@ /* - * 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.Format; +import com.google.android.exoplayer2.Format; import java.util.regex.Matcher; import java.util.regex.Pattern; diff --git a/library/src/main/java/com/google/android/exoplayer/extractor/PositionHolder.java b/library/src/main/java/com/google/android/exoplayer2/extractor/PositionHolder.java similarity index 87% rename from library/src/main/java/com/google/android/exoplayer/extractor/PositionHolder.java rename to library/src/main/java/com/google/android/exoplayer2/extractor/PositionHolder.java index 2c947323b7..d1f5d76468 100644 --- a/library/src/main/java/com/google/android/exoplayer/extractor/PositionHolder.java +++ b/library/src/main/java/com/google/android/exoplayer2/extractor/PositionHolder.java @@ -1,5 +1,5 @@ /* - * 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.extractor; +package com.google.android.exoplayer2.extractor; /** * Holds a position in the stream. diff --git a/library/src/main/java/com/google/android/exoplayer/extractor/SeekMap.java b/library/src/main/java/com/google/android/exoplayer2/extractor/SeekMap.java similarity index 94% rename from library/src/main/java/com/google/android/exoplayer/extractor/SeekMap.java rename to library/src/main/java/com/google/android/exoplayer2/extractor/SeekMap.java index efdbebaa45..7fb57bc5ea 100644 --- a/library/src/main/java/com/google/android/exoplayer/extractor/SeekMap.java +++ b/library/src/main/java/com/google/android/exoplayer2/extractor/SeekMap.java @@ -1,5 +1,5 @@ /* - * 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; /** * Maps seek positions (in microseconds) to corresponding positions (byte offsets) in the stream. diff --git a/library/src/main/java/com/google/android/exoplayer/extractor/TrackOutput.java b/library/src/main/java/com/google/android/exoplayer2/extractor/TrackOutput.java similarity index 92% rename from library/src/main/java/com/google/android/exoplayer/extractor/TrackOutput.java rename to library/src/main/java/com/google/android/exoplayer2/extractor/TrackOutput.java index c5ef1ab165..bb12d2aa3c 100644 --- a/library/src/main/java/com/google/android/exoplayer/extractor/TrackOutput.java +++ b/library/src/main/java/com/google/android/exoplayer2/extractor/TrackOutput.java @@ -1,5 +1,5 @@ /* - * 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.Format; -import com.google.android.exoplayer.util.ParsableByteArray; +import com.google.android.exoplayer2.C; +import com.google.android.exoplayer2.Format; +import com.google.android.exoplayer2.util.ParsableByteArray; import java.io.EOFException; import java.io.IOException; diff --git a/library/src/main/java/com/google/android/exoplayer/extractor/flv/AudioTagPayloadReader.java b/library/src/main/java/com/google/android/exoplayer2/extractor/flv/AudioTagPayloadReader.java similarity index 88% rename from library/src/main/java/com/google/android/exoplayer/extractor/flv/AudioTagPayloadReader.java rename to library/src/main/java/com/google/android/exoplayer2/extractor/flv/AudioTagPayloadReader.java index e76d6ccaa5..2f10c8f9df 100644 --- a/library/src/main/java/com/google/android/exoplayer/extractor/flv/AudioTagPayloadReader.java +++ b/library/src/main/java/com/google/android/exoplayer2/extractor/flv/AudioTagPayloadReader.java @@ -1,5 +1,5 @@ /* - * 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.extractor.flv; +package com.google.android.exoplayer2.extractor.flv; -import com.google.android.exoplayer.C; -import com.google.android.exoplayer.Format; -import com.google.android.exoplayer.extractor.TrackOutput; -import com.google.android.exoplayer.util.CodecSpecificDataUtil; -import com.google.android.exoplayer.util.MimeTypes; -import com.google.android.exoplayer.util.ParsableByteArray; +import com.google.android.exoplayer2.C; +import com.google.android.exoplayer2.Format; +import com.google.android.exoplayer2.extractor.TrackOutput; +import com.google.android.exoplayer2.util.CodecSpecificDataUtil; +import com.google.android.exoplayer2.util.MimeTypes; +import com.google.android.exoplayer2.util.ParsableByteArray; import android.util.Pair; diff --git a/library/src/main/java/com/google/android/exoplayer/extractor/flv/FlvExtractor.java b/library/src/main/java/com/google/android/exoplayer2/extractor/flv/FlvExtractor.java similarity index 94% rename from library/src/main/java/com/google/android/exoplayer/extractor/flv/FlvExtractor.java rename to library/src/main/java/com/google/android/exoplayer2/extractor/flv/FlvExtractor.java index 843e751432..c34b346cce 100644 --- a/library/src/main/java/com/google/android/exoplayer/extractor/flv/FlvExtractor.java +++ b/library/src/main/java/com/google/android/exoplayer2/extractor/flv/FlvExtractor.java @@ -1,5 +1,5 @@ /* - * 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.extractor.flv; +package com.google.android.exoplayer2.extractor.flv; -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.util.ParsableByteArray; -import com.google.android.exoplayer.util.Util; +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.util.ParsableByteArray; +import com.google.android.exoplayer2.util.Util; import java.io.IOException; diff --git a/library/src/main/java/com/google/android/exoplayer/extractor/flv/ScriptTagPayloadReader.java b/library/src/main/java/com/google/android/exoplayer2/extractor/flv/ScriptTagPayloadReader.java similarity index 95% rename from library/src/main/java/com/google/android/exoplayer/extractor/flv/ScriptTagPayloadReader.java rename to library/src/main/java/com/google/android/exoplayer2/extractor/flv/ScriptTagPayloadReader.java index 9e8f23790f..54632890f6 100644 --- a/library/src/main/java/com/google/android/exoplayer/extractor/flv/ScriptTagPayloadReader.java +++ b/library/src/main/java/com/google/android/exoplayer2/extractor/flv/ScriptTagPayloadReader.java @@ -1,5 +1,5 @@ /* - * 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.flv; +package com.google.android.exoplayer2.extractor.flv; -import com.google.android.exoplayer.C; -import com.google.android.exoplayer.ParserException; -import com.google.android.exoplayer.extractor.TrackOutput; -import com.google.android.exoplayer.util.ParsableByteArray; +import com.google.android.exoplayer2.C; +import com.google.android.exoplayer2.ParserException; +import com.google.android.exoplayer2.extractor.TrackOutput; +import com.google.android.exoplayer2.util.ParsableByteArray; import java.util.ArrayList; import java.util.Date; diff --git a/library/src/main/java/com/google/android/exoplayer/extractor/flv/TagPayloadReader.java b/library/src/main/java/com/google/android/exoplayer2/extractor/flv/TagPayloadReader.java similarity index 90% rename from library/src/main/java/com/google/android/exoplayer/extractor/flv/TagPayloadReader.java rename to library/src/main/java/com/google/android/exoplayer2/extractor/flv/TagPayloadReader.java index 81275dad1a..728c7b5df7 100644 --- a/library/src/main/java/com/google/android/exoplayer/extractor/flv/TagPayloadReader.java +++ b/library/src/main/java/com/google/android/exoplayer2/extractor/flv/TagPayloadReader.java @@ -1,5 +1,5 @@ /* - * 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.flv; +package com.google.android.exoplayer2.extractor.flv; -import com.google.android.exoplayer.ParserException; -import com.google.android.exoplayer.extractor.TrackOutput; -import com.google.android.exoplayer.util.ParsableByteArray; +import com.google.android.exoplayer2.ParserException; +import com.google.android.exoplayer2.extractor.TrackOutput; +import com.google.android.exoplayer2.util.ParsableByteArray; /** * Extracts individual samples from FLV tags, preserving original order. diff --git a/library/src/main/java/com/google/android/exoplayer/extractor/flv/VideoTagPayloadReader.java b/library/src/main/java/com/google/android/exoplayer2/extractor/flv/VideoTagPayloadReader.java similarity index 92% rename from library/src/main/java/com/google/android/exoplayer/extractor/flv/VideoTagPayloadReader.java rename to library/src/main/java/com/google/android/exoplayer2/extractor/flv/VideoTagPayloadReader.java index 66cd7d7bf0..49bf2ba574 100644 --- a/library/src/main/java/com/google/android/exoplayer/extractor/flv/VideoTagPayloadReader.java +++ b/library/src/main/java/com/google/android/exoplayer2/extractor/flv/VideoTagPayloadReader.java @@ -1,5 +1,5 @@ /* - * 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.extractor.flv; +package com.google.android.exoplayer2.extractor.flv; -import com.google.android.exoplayer.C; -import com.google.android.exoplayer.Format; -import com.google.android.exoplayer.ParserException; -import com.google.android.exoplayer.extractor.TrackOutput; -import com.google.android.exoplayer.util.Assertions; -import com.google.android.exoplayer.util.MimeTypes; -import com.google.android.exoplayer.util.NalUnitUtil; -import com.google.android.exoplayer.util.ParsableByteArray; +import com.google.android.exoplayer2.C; +import com.google.android.exoplayer2.Format; +import com.google.android.exoplayer2.ParserException; +import com.google.android.exoplayer2.extractor.TrackOutput; +import com.google.android.exoplayer2.util.Assertions; +import com.google.android.exoplayer2.util.MimeTypes; +import com.google.android.exoplayer2.util.NalUnitUtil; +import com.google.android.exoplayer2.util.ParsableByteArray; import java.util.ArrayList; import java.util.List; diff --git a/library/src/main/java/com/google/android/exoplayer/extractor/mkv/DefaultEbmlReader.java b/library/src/main/java/com/google/android/exoplayer2/extractor/mkv/DefaultEbmlReader.java similarity index 96% rename from library/src/main/java/com/google/android/exoplayer/extractor/mkv/DefaultEbmlReader.java rename to library/src/main/java/com/google/android/exoplayer2/extractor/mkv/DefaultEbmlReader.java index cf7b7827ec..4054c67414 100644 --- a/library/src/main/java/com/google/android/exoplayer/extractor/mkv/DefaultEbmlReader.java +++ b/library/src/main/java/com/google/android/exoplayer2/extractor/mkv/DefaultEbmlReader.java @@ -1,5 +1,5 @@ /* - * 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.ParserException; -import com.google.android.exoplayer.extractor.ExtractorInput; -import com.google.android.exoplayer.util.Assertions; +import com.google.android.exoplayer2.C; +import com.google.android.exoplayer2.ParserException; +import com.google.android.exoplayer2.extractor.ExtractorInput; +import com.google.android.exoplayer2.util.Assertions; import java.io.EOFException; import java.io.IOException; diff --git a/library/src/main/java/com/google/android/exoplayer/extractor/mkv/EbmlReader.java b/library/src/main/java/com/google/android/exoplayer2/extractor/mkv/EbmlReader.java similarity index 91% rename from library/src/main/java/com/google/android/exoplayer/extractor/mkv/EbmlReader.java rename to library/src/main/java/com/google/android/exoplayer2/extractor/mkv/EbmlReader.java index 04d7784298..cabeb51226 100644 --- a/library/src/main/java/com/google/android/exoplayer/extractor/mkv/EbmlReader.java +++ b/library/src/main/java/com/google/android/exoplayer2/extractor/mkv/EbmlReader.java @@ -1,5 +1,5 @@ /* - * 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.ParserException; -import com.google.android.exoplayer.extractor.ExtractorInput; +import com.google.android.exoplayer2.ParserException; +import com.google.android.exoplayer2.extractor.ExtractorInput; import java.io.IOException; diff --git a/library/src/main/java/com/google/android/exoplayer/extractor/mkv/EbmlReaderOutput.java b/library/src/main/java/com/google/android/exoplayer2/extractor/mkv/EbmlReaderOutput.java similarity index 94% rename from library/src/main/java/com/google/android/exoplayer/extractor/mkv/EbmlReaderOutput.java rename to library/src/main/java/com/google/android/exoplayer2/extractor/mkv/EbmlReaderOutput.java index b002a9c888..7321d127a6 100644 --- a/library/src/main/java/com/google/android/exoplayer/extractor/mkv/EbmlReaderOutput.java +++ b/library/src/main/java/com/google/android/exoplayer2/extractor/mkv/EbmlReaderOutput.java @@ -1,5 +1,5 @@ /* - * 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.ParserException; -import com.google.android.exoplayer.extractor.ExtractorInput; +import com.google.android.exoplayer2.ParserException; +import com.google.android.exoplayer2.extractor.ExtractorInput; import java.io.IOException; diff --git a/library/src/main/java/com/google/android/exoplayer/extractor/mkv/MatroskaExtractor.java b/library/src/main/java/com/google/android/exoplayer2/extractor/mkv/MatroskaExtractor.java similarity index 98% rename from library/src/main/java/com/google/android/exoplayer/extractor/mkv/MatroskaExtractor.java rename to library/src/main/java/com/google/android/exoplayer2/extractor/mkv/MatroskaExtractor.java index 66d2030e33..72aa5fcc95 100644 --- a/library/src/main/java/com/google/android/exoplayer/extractor/mkv/MatroskaExtractor.java +++ b/library/src/main/java/com/google/android/exoplayer2/extractor/mkv/MatroskaExtractor.java @@ -1,5 +1,5 @@ /* - * 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,26 +13,26 @@ * 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.Format; -import com.google.android.exoplayer.ParserException; -import com.google.android.exoplayer.drm.DrmInitData; -import com.google.android.exoplayer.drm.DrmInitData.SchemeData; -import com.google.android.exoplayer.extractor.ChunkIndex; -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.LongArray; -import com.google.android.exoplayer.util.MimeTypes; -import com.google.android.exoplayer.util.NalUnitUtil; -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.Format; +import com.google.android.exoplayer2.ParserException; +import com.google.android.exoplayer2.drm.DrmInitData; +import com.google.android.exoplayer2.drm.DrmInitData.SchemeData; +import com.google.android.exoplayer2.extractor.ChunkIndex; +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.LongArray; +import com.google.android.exoplayer2.util.MimeTypes; +import com.google.android.exoplayer2.util.NalUnitUtil; +import com.google.android.exoplayer2.util.ParsableByteArray; +import com.google.android.exoplayer2.util.Util; import android.util.Pair; import android.util.SparseArray; diff --git a/library/src/main/java/com/google/android/exoplayer/extractor/mkv/Sniffer.java b/library/src/main/java/com/google/android/exoplayer2/extractor/mkv/Sniffer.java similarity index 90% rename from library/src/main/java/com/google/android/exoplayer/extractor/mkv/Sniffer.java rename to library/src/main/java/com/google/android/exoplayer2/extractor/mkv/Sniffer.java index 04c3162ef7..16a35168ff 100644 --- a/library/src/main/java/com/google/android/exoplayer/extractor/mkv/Sniffer.java +++ b/library/src/main/java/com/google/android/exoplayer2/extractor/mkv/Sniffer.java @@ -1,5 +1,5 @@ /* - * 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.Extractor; -import com.google.android.exoplayer.extractor.ExtractorInput; -import com.google.android.exoplayer.util.ParsableByteArray; +import com.google.android.exoplayer2.C; +import com.google.android.exoplayer2.extractor.Extractor; +import com.google.android.exoplayer2.extractor.ExtractorInput; +import com.google.android.exoplayer2.util.ParsableByteArray; import java.io.IOException; diff --git a/library/src/main/java/com/google/android/exoplayer/extractor/mkv/VarintReader.java b/library/src/main/java/com/google/android/exoplayer2/extractor/mkv/VarintReader.java similarity index 86% rename from library/src/main/java/com/google/android/exoplayer/extractor/mkv/VarintReader.java rename to library/src/main/java/com/google/android/exoplayer2/extractor/mkv/VarintReader.java index ac45be856d..3a9ebcd0a1 100644 --- a/library/src/main/java/com/google/android/exoplayer/extractor/mkv/VarintReader.java +++ b/library/src/main/java/com/google/android/exoplayer2/extractor/mkv/VarintReader.java @@ -1,7 +1,22 @@ -package com.google.android.exoplayer.extractor.mkv; +/* + * 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.google.android.exoplayer2.extractor.mkv; -import com.google.android.exoplayer.C; -import com.google.android.exoplayer.extractor.ExtractorInput; +import com.google.android.exoplayer2.C; +import com.google.android.exoplayer2.extractor.ExtractorInput; import java.io.EOFException; import java.io.IOException; diff --git a/library/src/main/java/com/google/android/exoplayer/extractor/mp3/ConstantBitrateSeeker.java b/library/src/main/java/com/google/android/exoplayer2/extractor/mp3/ConstantBitrateSeeker.java similarity index 92% rename from library/src/main/java/com/google/android/exoplayer/extractor/mp3/ConstantBitrateSeeker.java rename to library/src/main/java/com/google/android/exoplayer2/extractor/mp3/ConstantBitrateSeeker.java index b0face3f04..a561ba5d45 100644 --- a/library/src/main/java/com/google/android/exoplayer/extractor/mp3/ConstantBitrateSeeker.java +++ b/library/src/main/java/com/google/android/exoplayer2/extractor/mp3/ConstantBitrateSeeker.java @@ -1,5 +1,5 @@ /* - * 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.mp3; +package com.google.android.exoplayer2.extractor.mp3; -import com.google.android.exoplayer.C; +import com.google.android.exoplayer2.C; /** * MP3 seeker that doesn't rely on metadata and seeks assuming the source has a constant bitrate. diff --git a/library/src/main/java/com/google/android/exoplayer/extractor/mp3/Id3Util.java b/library/src/main/java/com/google/android/exoplayer2/extractor/mp3/Id3Util.java similarity index 96% rename from library/src/main/java/com/google/android/exoplayer/extractor/mp3/Id3Util.java rename to library/src/main/java/com/google/android/exoplayer2/extractor/mp3/Id3Util.java index 819a00a647..9ca68c4b20 100644 --- a/library/src/main/java/com/google/android/exoplayer/extractor/mp3/Id3Util.java +++ b/library/src/main/java/com/google/android/exoplayer2/extractor/mp3/Id3Util.java @@ -1,5 +1,5 @@ /* - * 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.extractor.ExtractorInput; -import com.google.android.exoplayer.extractor.GaplessInfoHolder; -import com.google.android.exoplayer.util.ParsableByteArray; -import com.google.android.exoplayer.util.Util; +import com.google.android.exoplayer2.extractor.ExtractorInput; +import com.google.android.exoplayer2.extractor.GaplessInfoHolder; +import com.google.android.exoplayer2.util.ParsableByteArray; +import com.google.android.exoplayer2.util.Util; import android.util.Pair; diff --git a/library/src/main/java/com/google/android/exoplayer/extractor/mp3/Mp3Extractor.java b/library/src/main/java/com/google/android/exoplayer2/extractor/mp3/Mp3Extractor.java similarity index 93% rename from library/src/main/java/com/google/android/exoplayer/extractor/mp3/Mp3Extractor.java rename to library/src/main/java/com/google/android/exoplayer2/extractor/mp3/Mp3Extractor.java index 0cc6646a61..0aa6f7798c 100644 --- a/library/src/main/java/com/google/android/exoplayer/extractor/mp3/Mp3Extractor.java +++ b/library/src/main/java/com/google/android/exoplayer2/extractor/mp3/Mp3Extractor.java @@ -1,5 +1,5 @@ /* - * 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,22 +13,22 @@ * 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.Format; -import com.google.android.exoplayer.ParserException; -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.GaplessInfoHolder; -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.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.Format; +import com.google.android.exoplayer2.ParserException; +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.GaplessInfoHolder; +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.MpegAudioHeader; +import com.google.android.exoplayer2.util.ParsableByteArray; +import com.google.android.exoplayer2.util.Util; import java.io.EOFException; import java.io.IOException; diff --git a/library/src/main/java/com/google/android/exoplayer/extractor/mp3/VbriSeeker.java b/library/src/main/java/com/google/android/exoplayer2/extractor/mp3/VbriSeeker.java similarity index 92% rename from library/src/main/java/com/google/android/exoplayer/extractor/mp3/VbriSeeker.java rename to library/src/main/java/com/google/android/exoplayer2/extractor/mp3/VbriSeeker.java index 8d0c0000d2..a6fe4fe897 100644 --- a/library/src/main/java/com/google/android/exoplayer/extractor/mp3/VbriSeeker.java +++ b/library/src/main/java/com/google/android/exoplayer2/extractor/mp3/VbriSeeker.java @@ -1,5 +1,5 @@ /* - * 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; /** * MP3 seeker that uses metadata from a VBRI header. diff --git a/library/src/main/java/com/google/android/exoplayer/extractor/mp3/XingSeeker.java b/library/src/main/java/com/google/android/exoplayer2/extractor/mp3/XingSeeker.java similarity index 95% rename from library/src/main/java/com/google/android/exoplayer/extractor/mp3/XingSeeker.java rename to library/src/main/java/com/google/android/exoplayer2/extractor/mp3/XingSeeker.java index 9477b7cd31..123abe9450 100644 --- a/library/src/main/java/com/google/android/exoplayer/extractor/mp3/XingSeeker.java +++ b/library/src/main/java/com/google/android/exoplayer2/extractor/mp3/XingSeeker.java @@ -1,5 +1,5 @@ /* - * 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; /** * MP3 seeker that uses metadata from a Xing header. diff --git a/library/src/main/java/com/google/android/exoplayer/extractor/mp4/Atom.java b/library/src/main/java/com/google/android/exoplayer2/extractor/mp4/Atom.java similarity index 98% rename from library/src/main/java/com/google/android/exoplayer/extractor/mp4/Atom.java rename to library/src/main/java/com/google/android/exoplayer2/extractor/mp4/Atom.java index dcb6654e73..92e3654a5b 100644 --- a/library/src/main/java/com/google/android/exoplayer/extractor/mp4/Atom.java +++ b/library/src/main/java/com/google/android/exoplayer2/extractor/mp4/Atom.java @@ -1,5 +1,5 @@ /* - * 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.util.ParsableByteArray; -import com.google.android.exoplayer.util.Util; +import com.google.android.exoplayer2.util.ParsableByteArray; +import com.google.android.exoplayer2.util.Util; import java.util.ArrayList; import java.util.Arrays; diff --git a/library/src/main/java/com/google/android/exoplayer/extractor/mp4/AtomParsers.java b/library/src/main/java/com/google/android/exoplayer2/extractor/mp4/AtomParsers.java similarity index 98% rename from library/src/main/java/com/google/android/exoplayer/extractor/mp4/AtomParsers.java rename to library/src/main/java/com/google/android/exoplayer2/extractor/mp4/AtomParsers.java index c5a5b3434c..1d7b71dc37 100644 --- a/library/src/main/java/com/google/android/exoplayer/extractor/mp4/AtomParsers.java +++ b/library/src/main/java/com/google/android/exoplayer2/extractor/mp4/AtomParsers.java @@ -1,5 +1,5 @@ /* - * 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,20 +13,20 @@ * 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.C; -import com.google.android.exoplayer.Format; -import com.google.android.exoplayer.ParserException; -import com.google.android.exoplayer.drm.DrmInitData; -import com.google.android.exoplayer.extractor.GaplessInfoHolder; -import com.google.android.exoplayer.util.Ac3Util; -import com.google.android.exoplayer.util.Assertions; -import com.google.android.exoplayer.util.CodecSpecificDataUtil; -import com.google.android.exoplayer.util.MimeTypes; -import com.google.android.exoplayer.util.NalUnitUtil; -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.Format; +import com.google.android.exoplayer2.ParserException; +import com.google.android.exoplayer2.drm.DrmInitData; +import com.google.android.exoplayer2.extractor.GaplessInfoHolder; +import com.google.android.exoplayer2.util.Ac3Util; +import com.google.android.exoplayer2.util.Assertions; +import com.google.android.exoplayer2.util.CodecSpecificDataUtil; +import com.google.android.exoplayer2.util.MimeTypes; +import com.google.android.exoplayer2.util.NalUnitUtil; +import com.google.android.exoplayer2.util.ParsableByteArray; +import com.google.android.exoplayer2.util.Util; import android.util.Pair; diff --git a/library/src/main/java/com/google/android/exoplayer/extractor/mp4/DefaultSampleValues.java b/library/src/main/java/com/google/android/exoplayer2/extractor/mp4/DefaultSampleValues.java similarity index 90% rename from library/src/main/java/com/google/android/exoplayer/extractor/mp4/DefaultSampleValues.java rename to library/src/main/java/com/google/android/exoplayer2/extractor/mp4/DefaultSampleValues.java index 528d643811..1ec0237356 100644 --- a/library/src/main/java/com/google/android/exoplayer/extractor/mp4/DefaultSampleValues.java +++ b/library/src/main/java/com/google/android/exoplayer2/extractor/mp4/DefaultSampleValues.java @@ -1,5 +1,5 @@ /* - * 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.extractor.mp4; +package com.google.android.exoplayer2.extractor.mp4; /* package */ final class DefaultSampleValues { diff --git a/library/src/main/java/com/google/android/exoplayer/extractor/mp4/FixedSampleSizeRechunker.java b/library/src/main/java/com/google/android/exoplayer2/extractor/mp4/FixedSampleSizeRechunker.java similarity index 96% rename from library/src/main/java/com/google/android/exoplayer/extractor/mp4/FixedSampleSizeRechunker.java rename to library/src/main/java/com/google/android/exoplayer2/extractor/mp4/FixedSampleSizeRechunker.java index 9fcece15da..5dd6c6ea9f 100644 --- a/library/src/main/java/com/google/android/exoplayer/extractor/mp4/FixedSampleSizeRechunker.java +++ b/library/src/main/java/com/google/android/exoplayer2/extractor/mp4/FixedSampleSizeRechunker.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.C; -import com.google.android.exoplayer.util.Util; +import com.google.android.exoplayer2.C; +import com.google.android.exoplayer2.util.Util; /** * Rechunks fixed sample size media in which every sample is a key frame (e.g. uncompressed audio). diff --git a/library/src/main/java/com/google/android/exoplayer/extractor/mp4/FragmentedMp4Extractor.java b/library/src/main/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4Extractor.java similarity index 97% rename from library/src/main/java/com/google/android/exoplayer/extractor/mp4/FragmentedMp4Extractor.java rename to library/src/main/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4Extractor.java index 02a4fdce0c..9f62393ea5 100644 --- a/library/src/main/java/com/google/android/exoplayer/extractor/mp4/FragmentedMp4Extractor.java +++ b/library/src/main/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4Extractor.java @@ -1,5 +1,5 @@ /* - * 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,27 +13,27 @@ * 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.C; -import com.google.android.exoplayer.ParserException; -import com.google.android.exoplayer.drm.DrmInitData; -import com.google.android.exoplayer.drm.DrmInitData.SchemeData; -import com.google.android.exoplayer.extractor.ChunkIndex; -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.extractor.mp4.Atom.ContainerAtom; -import com.google.android.exoplayer.extractor.mp4.Atom.LeafAtom; -import com.google.android.exoplayer.util.Assertions; -import com.google.android.exoplayer.util.MimeTypes; -import com.google.android.exoplayer.util.NalUnitUtil; -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.ParserException; +import com.google.android.exoplayer2.drm.DrmInitData; +import com.google.android.exoplayer2.drm.DrmInitData.SchemeData; +import com.google.android.exoplayer2.extractor.ChunkIndex; +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.extractor.mp4.Atom.ContainerAtom; +import com.google.android.exoplayer2.extractor.mp4.Atom.LeafAtom; +import com.google.android.exoplayer2.util.Assertions; +import com.google.android.exoplayer2.util.MimeTypes; +import com.google.android.exoplayer2.util.NalUnitUtil; +import com.google.android.exoplayer2.util.ParsableByteArray; +import com.google.android.exoplayer2.util.Util; import android.util.Log; import android.util.Pair; diff --git a/library/src/main/java/com/google/android/exoplayer/extractor/mp4/Mp4Extractor.java b/library/src/main/java/com/google/android/exoplayer2/extractor/mp4/Mp4Extractor.java similarity index 94% rename from library/src/main/java/com/google/android/exoplayer/extractor/mp4/Mp4Extractor.java rename to library/src/main/java/com/google/android/exoplayer2/extractor/mp4/Mp4Extractor.java index 2f9da861fb..d66864da94 100644 --- a/library/src/main/java/com/google/android/exoplayer/extractor/mp4/Mp4Extractor.java +++ b/library/src/main/java/com/google/android/exoplayer2/extractor/mp4/Mp4Extractor.java @@ -1,5 +1,5 @@ /* - * 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,24 +13,24 @@ * 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.C; -import com.google.android.exoplayer.Format; -import com.google.android.exoplayer.ParserException; -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.GaplessInfoHolder; -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.extractor.mp4.Atom.ContainerAtom; -import com.google.android.exoplayer.util.Assertions; -import com.google.android.exoplayer.util.NalUnitUtil; -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.Format; +import com.google.android.exoplayer2.ParserException; +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.GaplessInfoHolder; +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.extractor.mp4.Atom.ContainerAtom; +import com.google.android.exoplayer2.util.Assertions; +import com.google.android.exoplayer2.util.NalUnitUtil; +import com.google.android.exoplayer2.util.ParsableByteArray; +import com.google.android.exoplayer2.util.Util; import java.io.IOException; import java.util.ArrayList; diff --git a/library/src/main/java/com/google/android/exoplayer/extractor/mp4/PsshAtomUtil.java b/library/src/main/java/com/google/android/exoplayer2/extractor/mp4/PsshAtomUtil.java similarity index 96% rename from library/src/main/java/com/google/android/exoplayer/extractor/mp4/PsshAtomUtil.java rename to library/src/main/java/com/google/android/exoplayer2/extractor/mp4/PsshAtomUtil.java index d250cb4a3a..f4446571b3 100644 --- a/library/src/main/java/com/google/android/exoplayer/extractor/mp4/PsshAtomUtil.java +++ b/library/src/main/java/com/google/android/exoplayer2/extractor/mp4/PsshAtomUtil.java @@ -1,5 +1,5 @@ /* - * 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.mp4; +package com.google.android.exoplayer2.extractor.mp4; -import com.google.android.exoplayer.util.ParsableByteArray; +import com.google.android.exoplayer2.util.ParsableByteArray; import android.util.Log; import android.util.Pair; diff --git a/library/src/main/java/com/google/android/exoplayer/extractor/mp4/Sniffer.java b/library/src/main/java/com/google/android/exoplayer2/extractor/mp4/Sniffer.java similarity index 95% rename from library/src/main/java/com/google/android/exoplayer/extractor/mp4/Sniffer.java rename to library/src/main/java/com/google/android/exoplayer2/extractor/mp4/Sniffer.java index 9c29413d7c..465e33a1a4 100644 --- a/library/src/main/java/com/google/android/exoplayer/extractor/mp4/Sniffer.java +++ b/library/src/main/java/com/google/android/exoplayer2/extractor/mp4/Sniffer.java @@ -1,5 +1,5 @@ /* - * 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.mp4; +package com.google.android.exoplayer2.extractor.mp4; -import com.google.android.exoplayer.C; -import com.google.android.exoplayer.extractor.ExtractorInput; -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.extractor.ExtractorInput; +import com.google.android.exoplayer2.util.ParsableByteArray; +import com.google.android.exoplayer2.util.Util; import java.io.IOException; diff --git a/library/src/main/java/com/google/android/exoplayer/extractor/mp4/Track.java b/library/src/main/java/com/google/android/exoplayer2/extractor/mp4/Track.java similarity index 93% rename from library/src/main/java/com/google/android/exoplayer/extractor/mp4/Track.java rename to library/src/main/java/com/google/android/exoplayer2/extractor/mp4/Track.java index b9b18fd43a..4c5ba5b642 100644 --- a/library/src/main/java/com/google/android/exoplayer/extractor/mp4/Track.java +++ b/library/src/main/java/com/google/android/exoplayer2/extractor/mp4/Track.java @@ -1,5 +1,5 @@ /* - * 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.C; -import com.google.android.exoplayer.Format; +import com.google.android.exoplayer2.C; +import com.google.android.exoplayer2.Format; /** * Encapsulates information describing an MP4 track. diff --git a/library/src/main/java/com/google/android/exoplayer/extractor/mp4/TrackEncryptionBox.java b/library/src/main/java/com/google/android/exoplayer2/extractor/mp4/TrackEncryptionBox.java similarity index 94% rename from library/src/main/java/com/google/android/exoplayer/extractor/mp4/TrackEncryptionBox.java rename to library/src/main/java/com/google/android/exoplayer2/extractor/mp4/TrackEncryptionBox.java index fed1dca88c..dde03a8507 100644 --- a/library/src/main/java/com/google/android/exoplayer/extractor/mp4/TrackEncryptionBox.java +++ b/library/src/main/java/com/google/android/exoplayer2/extractor/mp4/TrackEncryptionBox.java @@ -1,5 +1,5 @@ /* - * 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.extractor.mp4; +package com.google.android.exoplayer2.extractor.mp4; /** * Encapsulates information parsed from a track encryption (tenc) box or sample group description diff --git a/library/src/main/java/com/google/android/exoplayer/extractor/mp4/TrackFragment.java b/library/src/main/java/com/google/android/exoplayer2/extractor/mp4/TrackFragment.java similarity index 96% rename from library/src/main/java/com/google/android/exoplayer/extractor/mp4/TrackFragment.java rename to library/src/main/java/com/google/android/exoplayer2/extractor/mp4/TrackFragment.java index 597e23fc8f..d4925c2133 100644 --- a/library/src/main/java/com/google/android/exoplayer/extractor/mp4/TrackFragment.java +++ b/library/src/main/java/com/google/android/exoplayer2/extractor/mp4/TrackFragment.java @@ -1,5 +1,5 @@ /* - * 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.ExtractorInput; -import com.google.android.exoplayer.util.ParsableByteArray; +import com.google.android.exoplayer2.extractor.ExtractorInput; +import com.google.android.exoplayer2.util.ParsableByteArray; import java.io.IOException; diff --git a/library/src/main/java/com/google/android/exoplayer/extractor/mp4/TrackSampleTable.java b/library/src/main/java/com/google/android/exoplayer2/extractor/mp4/TrackSampleTable.java similarity index 92% rename from library/src/main/java/com/google/android/exoplayer/extractor/mp4/TrackSampleTable.java rename to library/src/main/java/com/google/android/exoplayer2/extractor/mp4/TrackSampleTable.java index f458ab5ee1..1d99ce441f 100644 --- a/library/src/main/java/com/google/android/exoplayer/extractor/mp4/TrackSampleTable.java +++ b/library/src/main/java/com/google/android/exoplayer2/extractor/mp4/TrackSampleTable.java @@ -1,5 +1,5 @@ /* - * 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.mp4; +package com.google.android.exoplayer2.extractor.mp4; -import com.google.android.exoplayer.C; -import com.google.android.exoplayer.util.Assertions; -import com.google.android.exoplayer.util.Util; +import com.google.android.exoplayer2.C; +import com.google.android.exoplayer2.util.Assertions; +import com.google.android.exoplayer2.util.Util; /** * Sample table for a track in an MP4 file. diff --git a/library/src/main/java/com/google/android/exoplayer/extractor/ogg/DefaultOggSeeker.java b/library/src/main/java/com/google/android/exoplayer2/extractor/ogg/DefaultOggSeeker.java similarity index 97% rename from library/src/main/java/com/google/android/exoplayer/extractor/ogg/DefaultOggSeeker.java rename to library/src/main/java/com/google/android/exoplayer2/extractor/ogg/DefaultOggSeeker.java index 72e152a149..ed3f493874 100644 --- a/library/src/main/java/com/google/android/exoplayer/extractor/ogg/DefaultOggSeeker.java +++ b/library/src/main/java/com/google/android/exoplayer2/extractor/ogg/DefaultOggSeeker.java @@ -1,5 +1,5 @@ /* - * 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,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.ParserException; -import com.google.android.exoplayer.extractor.ExtractorInput; -import com.google.android.exoplayer.extractor.SeekMap; -import com.google.android.exoplayer.util.Assertions; +import com.google.android.exoplayer2.ParserException; +import com.google.android.exoplayer2.extractor.ExtractorInput; +import com.google.android.exoplayer2.extractor.SeekMap; +import com.google.android.exoplayer2.util.Assertions; import java.io.EOFException; import java.io.IOException; diff --git a/library/src/main/java/com/google/android/exoplayer/extractor/ogg/FlacReader.java b/library/src/main/java/com/google/android/exoplayer2/extractor/ogg/FlacReader.java similarity index 93% rename from library/src/main/java/com/google/android/exoplayer/extractor/ogg/FlacReader.java rename to library/src/main/java/com/google/android/exoplayer2/extractor/ogg/FlacReader.java index 6bc1773eb9..f3e2511a81 100644 --- a/library/src/main/java/com/google/android/exoplayer/extractor/ogg/FlacReader.java +++ b/library/src/main/java/com/google/android/exoplayer2/extractor/ogg/FlacReader.java @@ -13,15 +13,15 @@ * 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.Format; -import com.google.android.exoplayer.extractor.ExtractorInput; -import com.google.android.exoplayer.extractor.SeekMap; -import com.google.android.exoplayer.util.FlacStreamInfo; -import com.google.android.exoplayer.util.MimeTypes; -import com.google.android.exoplayer.util.ParsableByteArray; -import com.google.android.exoplayer.util.Util; +import com.google.android.exoplayer2.Format; +import com.google.android.exoplayer2.extractor.ExtractorInput; +import com.google.android.exoplayer2.extractor.SeekMap; +import com.google.android.exoplayer2.util.FlacStreamInfo; +import com.google.android.exoplayer2.util.MimeTypes; +import com.google.android.exoplayer2.util.ParsableByteArray; +import com.google.android.exoplayer2.util.Util; import java.io.IOException; import java.util.Arrays; diff --git a/library/src/main/java/com/google/android/exoplayer/extractor/ogg/OggExtractor.java b/library/src/main/java/com/google/android/exoplayer2/extractor/ogg/OggExtractor.java similarity index 82% rename from library/src/main/java/com/google/android/exoplayer/extractor/ogg/OggExtractor.java rename to library/src/main/java/com/google/android/exoplayer2/extractor/ogg/OggExtractor.java index 7bdbf80fa1..8588595fd6 100644 --- a/library/src/main/java/com/google/android/exoplayer/extractor/ogg/OggExtractor.java +++ b/library/src/main/java/com/google/android/exoplayer2/extractor/ogg/OggExtractor.java @@ -1,5 +1,5 @@ /* - * 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,16 +13,16 @@ * 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.ParserException; -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.TrackOutput; -import com.google.android.exoplayer.util.ParsableByteArray; +import com.google.android.exoplayer2.ParserException; +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.TrackOutput; +import com.google.android.exoplayer2.util.ParsableByteArray; import java.io.IOException; diff --git a/library/src/main/java/com/google/android/exoplayer/extractor/ogg/OggPacket.java b/library/src/main/java/com/google/android/exoplayer2/extractor/ogg/OggPacket.java similarity index 94% rename from library/src/main/java/com/google/android/exoplayer/extractor/ogg/OggPacket.java rename to library/src/main/java/com/google/android/exoplayer2/extractor/ogg/OggPacket.java index ad80ec5342..2ab15bcb39 100644 --- a/library/src/main/java/com/google/android/exoplayer/extractor/ogg/OggPacket.java +++ b/library/src/main/java/com/google/android/exoplayer2/extractor/ogg/OggPacket.java @@ -1,5 +1,5 @@ /* - * 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.util.Assertions; -import com.google.android.exoplayer.util.ParsableByteArray; +import com.google.android.exoplayer2.extractor.ExtractorInput; +import com.google.android.exoplayer2.util.Assertions; +import com.google.android.exoplayer2.util.ParsableByteArray; import java.io.IOException; diff --git a/library/src/main/java/com/google/android/exoplayer/extractor/ogg/OggPageHeader.java b/library/src/main/java/com/google/android/exoplayer2/extractor/ogg/OggPageHeader.java similarity index 91% rename from library/src/main/java/com/google/android/exoplayer/extractor/ogg/OggPageHeader.java rename to library/src/main/java/com/google/android/exoplayer2/extractor/ogg/OggPageHeader.java index 4cff389a98..2511ea9c23 100644 --- a/library/src/main/java/com/google/android/exoplayer/extractor/ogg/OggPageHeader.java +++ b/library/src/main/java/com/google/android/exoplayer2/extractor/ogg/OggPageHeader.java @@ -1,5 +1,5 @@ /* - * 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,13 +13,13 @@ * 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.ParserException; -import com.google.android.exoplayer.extractor.ExtractorInput; -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.ParserException; +import com.google.android.exoplayer2.extractor.ExtractorInput; +import com.google.android.exoplayer2.util.ParsableByteArray; +import com.google.android.exoplayer2.util.Util; import java.io.EOFException; import java.io.IOException; diff --git a/library/src/main/java/com/google/android/exoplayer/extractor/ogg/OggSeeker.java b/library/src/main/java/com/google/android/exoplayer2/extractor/ogg/OggSeeker.java similarity index 90% rename from library/src/main/java/com/google/android/exoplayer/extractor/ogg/OggSeeker.java rename to library/src/main/java/com/google/android/exoplayer2/extractor/ogg/OggSeeker.java index 8e8c99de15..6bb9efc85d 100644 --- a/library/src/main/java/com/google/android/exoplayer/extractor/ogg/OggSeeker.java +++ b/library/src/main/java/com/google/android/exoplayer2/extractor/ogg/OggSeeker.java @@ -1,5 +1,5 @@ /* - * 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.extractor.ExtractorInput; -import com.google.android.exoplayer.extractor.SeekMap; +import com.google.android.exoplayer2.extractor.ExtractorInput; +import com.google.android.exoplayer2.extractor.SeekMap; import java.io.IOException; diff --git a/library/src/main/java/com/google/android/exoplayer/extractor/ogg/OpusReader.java b/library/src/main/java/com/google/android/exoplayer2/extractor/ogg/OpusReader.java similarity index 92% rename from library/src/main/java/com/google/android/exoplayer/extractor/ogg/OpusReader.java rename to library/src/main/java/com/google/android/exoplayer2/extractor/ogg/OpusReader.java index 3972365299..ee75a75385 100644 --- a/library/src/main/java/com/google/android/exoplayer/extractor/ogg/OpusReader.java +++ b/library/src/main/java/com/google/android/exoplayer2/extractor/ogg/OpusReader.java @@ -13,13 +13,13 @@ * 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.Format; -import com.google.android.exoplayer.util.MimeTypes; -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.Format; +import com.google.android.exoplayer2.util.MimeTypes; +import com.google.android.exoplayer2.util.ParsableByteArray; +import com.google.android.exoplayer2.util.Util; import java.io.IOException; import java.nio.ByteBuffer; diff --git a/library/src/main/java/com/google/android/exoplayer/extractor/ogg/StreamReader.java b/library/src/main/java/com/google/android/exoplayer2/extractor/ogg/StreamReader.java similarity index 84% rename from library/src/main/java/com/google/android/exoplayer/extractor/ogg/StreamReader.java rename to library/src/main/java/com/google/android/exoplayer2/extractor/ogg/StreamReader.java index efb1a7d608..34297a51e6 100644 --- a/library/src/main/java/com/google/android/exoplayer/extractor/ogg/StreamReader.java +++ b/library/src/main/java/com/google/android/exoplayer2/extractor/ogg/StreamReader.java @@ -1,14 +1,29 @@ -package com.google.android.exoplayer.extractor.ogg; +/* + * 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.google.android.exoplayer2.extractor.ogg; -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.PositionHolder; -import com.google.android.exoplayer.extractor.SeekMap; -import com.google.android.exoplayer.extractor.TrackOutput; -import com.google.android.exoplayer.util.ParsableByteArray; +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.PositionHolder; +import com.google.android.exoplayer2.extractor.SeekMap; +import com.google.android.exoplayer2.extractor.TrackOutput; +import com.google.android.exoplayer2.util.ParsableByteArray; import java.io.IOException; diff --git a/library/src/main/java/com/google/android/exoplayer/extractor/ogg/VorbisBitArray.java b/library/src/main/java/com/google/android/exoplayer2/extractor/ogg/VorbisBitArray.java similarity index 96% rename from library/src/main/java/com/google/android/exoplayer/extractor/ogg/VorbisBitArray.java rename to library/src/main/java/com/google/android/exoplayer2/extractor/ogg/VorbisBitArray.java index 95ae0eb789..5426105972 100644 --- a/library/src/main/java/com/google/android/exoplayer/extractor/ogg/VorbisBitArray.java +++ b/library/src/main/java/com/google/android/exoplayer2/extractor/ogg/VorbisBitArray.java @@ -1,5 +1,5 @@ /* - * 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.util.Assertions; +import com.google.android.exoplayer2.util.Assertions; /** * Wraps a byte array, providing methods that allow it to be read as a vorbis bitstream. diff --git a/library/src/main/java/com/google/android/exoplayer/extractor/ogg/VorbisReader.java b/library/src/main/java/com/google/android/exoplayer2/extractor/ogg/VorbisReader.java similarity index 94% rename from library/src/main/java/com/google/android/exoplayer/extractor/ogg/VorbisReader.java rename to library/src/main/java/com/google/android/exoplayer2/extractor/ogg/VorbisReader.java index a211e52a19..64f4cfdbdc 100644 --- a/library/src/main/java/com/google/android/exoplayer/extractor/ogg/VorbisReader.java +++ b/library/src/main/java/com/google/android/exoplayer2/extractor/ogg/VorbisReader.java @@ -1,5 +1,5 @@ /* - * 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,13 +13,13 @@ * 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.Format; -import com.google.android.exoplayer.ParserException; -import com.google.android.exoplayer.extractor.ogg.VorbisUtil.Mode; -import com.google.android.exoplayer.util.MimeTypes; -import com.google.android.exoplayer.util.ParsableByteArray; +import com.google.android.exoplayer2.Format; +import com.google.android.exoplayer2.ParserException; +import com.google.android.exoplayer2.extractor.ogg.VorbisUtil.Mode; +import com.google.android.exoplayer2.util.MimeTypes; +import com.google.android.exoplayer2.util.ParsableByteArray; import java.io.IOException; import java.util.ArrayList; diff --git a/library/src/main/java/com/google/android/exoplayer/extractor/ogg/VorbisUtil.java b/library/src/main/java/com/google/android/exoplayer2/extractor/ogg/VorbisUtil.java similarity index 98% rename from library/src/main/java/com/google/android/exoplayer/extractor/ogg/VorbisUtil.java rename to library/src/main/java/com/google/android/exoplayer2/extractor/ogg/VorbisUtil.java index e392bac7ae..238dcc791a 100644 --- a/library/src/main/java/com/google/android/exoplayer/extractor/ogg/VorbisUtil.java +++ b/library/src/main/java/com/google/android/exoplayer2/extractor/ogg/VorbisUtil.java @@ -1,5 +1,5 @@ /* - * 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.ParserException; -import com.google.android.exoplayer.util.ParsableByteArray; +import com.google.android.exoplayer2.ParserException; +import com.google.android.exoplayer2.util.ParsableByteArray; import android.util.Log; diff --git a/library/src/main/java/com/google/android/exoplayer/extractor/ts/Ac3Reader.java b/library/src/main/java/com/google/android/exoplayer2/extractor/ts/Ac3Reader.java similarity index 93% rename from library/src/main/java/com/google/android/exoplayer/extractor/ts/Ac3Reader.java rename to library/src/main/java/com/google/android/exoplayer2/extractor/ts/Ac3Reader.java index 1e76ccb5c7..5efed42a3d 100644 --- a/library/src/main/java/com/google/android/exoplayer/extractor/ts/Ac3Reader.java +++ b/library/src/main/java/com/google/android/exoplayer2/extractor/ts/Ac3Reader.java @@ -1,5 +1,5 @@ /* - * 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.extractor.ts; +package com.google.android.exoplayer2.extractor.ts; -import com.google.android.exoplayer.C; -import com.google.android.exoplayer.Format; -import com.google.android.exoplayer.extractor.TrackOutput; -import com.google.android.exoplayer.util.Ac3Util; -import com.google.android.exoplayer.util.ParsableBitArray; -import com.google.android.exoplayer.util.ParsableByteArray; +import com.google.android.exoplayer2.C; +import com.google.android.exoplayer2.Format; +import com.google.android.exoplayer2.extractor.TrackOutput; +import com.google.android.exoplayer2.util.Ac3Util; +import com.google.android.exoplayer2.util.ParsableBitArray; +import com.google.android.exoplayer2.util.ParsableByteArray; /** * Parses a continuous (E-)AC-3 byte stream and extracts individual samples. diff --git a/library/src/main/java/com/google/android/exoplayer/extractor/ts/AdtsExtractor.java b/library/src/main/java/com/google/android/exoplayer2/extractor/ts/AdtsExtractor.java similarity index 88% rename from library/src/main/java/com/google/android/exoplayer/extractor/ts/AdtsExtractor.java rename to library/src/main/java/com/google/android/exoplayer2/extractor/ts/AdtsExtractor.java index b030c56173..f9bffe5b88 100644 --- a/library/src/main/java/com/google/android/exoplayer/extractor/ts/AdtsExtractor.java +++ b/library/src/main/java/com/google/android/exoplayer2/extractor/ts/AdtsExtractor.java @@ -1,5 +1,5 @@ /* - * 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,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.android.exoplayer.extractor.ts; +package com.google.android.exoplayer2.extractor.ts; -import com.google.android.exoplayer.C; -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.util.ParsableBitArray; -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.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.util.ParsableBitArray; +import com.google.android.exoplayer2.util.ParsableByteArray; +import com.google.android.exoplayer2.util.Util; import java.io.IOException; diff --git a/library/src/main/java/com/google/android/exoplayer/extractor/ts/AdtsReader.java b/library/src/main/java/com/google/android/exoplayer2/extractor/ts/AdtsReader.java similarity index 95% rename from library/src/main/java/com/google/android/exoplayer/extractor/ts/AdtsReader.java rename to library/src/main/java/com/google/android/exoplayer2/extractor/ts/AdtsReader.java index 98e708614a..6e67ea58c3 100644 --- a/library/src/main/java/com/google/android/exoplayer/extractor/ts/AdtsReader.java +++ b/library/src/main/java/com/google/android/exoplayer2/extractor/ts/AdtsReader.java @@ -1,5 +1,5 @@ /* - * 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.extractor.ts; +package com.google.android.exoplayer2.extractor.ts; -import com.google.android.exoplayer.C; -import com.google.android.exoplayer.Format; -import com.google.android.exoplayer.extractor.TrackOutput; -import com.google.android.exoplayer.util.CodecSpecificDataUtil; -import com.google.android.exoplayer.util.MimeTypes; -import com.google.android.exoplayer.util.ParsableBitArray; -import com.google.android.exoplayer.util.ParsableByteArray; +import com.google.android.exoplayer2.C; +import com.google.android.exoplayer2.Format; +import com.google.android.exoplayer2.extractor.TrackOutput; +import com.google.android.exoplayer2.util.CodecSpecificDataUtil; +import com.google.android.exoplayer2.util.MimeTypes; +import com.google.android.exoplayer2.util.ParsableBitArray; +import com.google.android.exoplayer2.util.ParsableByteArray; import android.util.Log; import android.util.Pair; diff --git a/library/src/main/java/com/google/android/exoplayer/extractor/ts/DtsReader.java b/library/src/main/java/com/google/android/exoplayer2/extractor/ts/DtsReader.java similarity index 93% rename from library/src/main/java/com/google/android/exoplayer/extractor/ts/DtsReader.java rename to library/src/main/java/com/google/android/exoplayer2/extractor/ts/DtsReader.java index 5ae926b172..251aa12fdc 100644 --- a/library/src/main/java/com/google/android/exoplayer/extractor/ts/DtsReader.java +++ b/library/src/main/java/com/google/android/exoplayer2/extractor/ts/DtsReader.java @@ -1,5 +1,5 @@ /* - * 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.extractor.ts; +package com.google.android.exoplayer2.extractor.ts; -import com.google.android.exoplayer.C; -import com.google.android.exoplayer.Format; -import com.google.android.exoplayer.extractor.TrackOutput; -import com.google.android.exoplayer.util.DtsUtil; -import com.google.android.exoplayer.util.ParsableByteArray; +import com.google.android.exoplayer2.C; +import com.google.android.exoplayer2.Format; +import com.google.android.exoplayer2.extractor.TrackOutput; +import com.google.android.exoplayer2.util.DtsUtil; +import com.google.android.exoplayer2.util.ParsableByteArray; /** * Parses a continuous DTS byte stream and extracts individual samples. diff --git a/library/src/main/java/com/google/android/exoplayer/extractor/ts/ElementaryStreamReader.java b/library/src/main/java/com/google/android/exoplayer2/extractor/ts/ElementaryStreamReader.java similarity index 87% rename from library/src/main/java/com/google/android/exoplayer/extractor/ts/ElementaryStreamReader.java rename to library/src/main/java/com/google/android/exoplayer2/extractor/ts/ElementaryStreamReader.java index 3cd3fe6984..ad601896f4 100644 --- a/library/src/main/java/com/google/android/exoplayer/extractor/ts/ElementaryStreamReader.java +++ b/library/src/main/java/com/google/android/exoplayer2/extractor/ts/ElementaryStreamReader.java @@ -1,5 +1,5 @@ /* - * 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.ts; +package com.google.android.exoplayer2.extractor.ts; -import com.google.android.exoplayer.extractor.TrackOutput; -import com.google.android.exoplayer.util.ParsableByteArray; +import com.google.android.exoplayer2.extractor.TrackOutput; +import com.google.android.exoplayer2.util.ParsableByteArray; /** * Extracts individual samples from an elementary media stream, preserving original order. diff --git a/library/src/main/java/com/google/android/exoplayer/extractor/ts/H262Reader.java b/library/src/main/java/com/google/android/exoplayer2/extractor/ts/H262Reader.java similarity index 95% rename from library/src/main/java/com/google/android/exoplayer/extractor/ts/H262Reader.java rename to library/src/main/java/com/google/android/exoplayer2/extractor/ts/H262Reader.java index 978573fca0..66c7c80a3f 100644 --- a/library/src/main/java/com/google/android/exoplayer/extractor/ts/H262Reader.java +++ b/library/src/main/java/com/google/android/exoplayer2/extractor/ts/H262Reader.java @@ -1,5 +1,5 @@ /* - * 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.extractor.ts; +package com.google.android.exoplayer2.extractor.ts; -import com.google.android.exoplayer.C; -import com.google.android.exoplayer.Format; -import com.google.android.exoplayer.extractor.TrackOutput; -import com.google.android.exoplayer.util.MimeTypes; -import com.google.android.exoplayer.util.NalUnitUtil; -import com.google.android.exoplayer.util.ParsableByteArray; +import com.google.android.exoplayer2.C; +import com.google.android.exoplayer2.Format; +import com.google.android.exoplayer2.extractor.TrackOutput; +import com.google.android.exoplayer2.util.MimeTypes; +import com.google.android.exoplayer2.util.NalUnitUtil; +import com.google.android.exoplayer2.util.ParsableByteArray; import android.util.Pair; diff --git a/library/src/main/java/com/google/android/exoplayer/extractor/ts/H264Reader.java b/library/src/main/java/com/google/android/exoplayer2/extractor/ts/H264Reader.java similarity index 97% rename from library/src/main/java/com/google/android/exoplayer/extractor/ts/H264Reader.java rename to library/src/main/java/com/google/android/exoplayer2/extractor/ts/H264Reader.java index be43e712cc..fc6b5e3e79 100644 --- a/library/src/main/java/com/google/android/exoplayer/extractor/ts/H264Reader.java +++ b/library/src/main/java/com/google/android/exoplayer2/extractor/ts/H264Reader.java @@ -1,5 +1,5 @@ /* - * 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.extractor.ts; +package com.google.android.exoplayer2.extractor.ts; -import com.google.android.exoplayer.C; -import com.google.android.exoplayer.Format; -import com.google.android.exoplayer.extractor.TrackOutput; -import com.google.android.exoplayer.util.MimeTypes; -import com.google.android.exoplayer.util.NalUnitUtil; -import com.google.android.exoplayer.util.NalUnitUtil.SpsData; -import com.google.android.exoplayer.util.ParsableByteArray; -import com.google.android.exoplayer.util.ParsableNalUnitBitArray; +import com.google.android.exoplayer2.C; +import com.google.android.exoplayer2.Format; +import com.google.android.exoplayer2.extractor.TrackOutput; +import com.google.android.exoplayer2.util.MimeTypes; +import com.google.android.exoplayer2.util.NalUnitUtil; +import com.google.android.exoplayer2.util.NalUnitUtil.SpsData; +import com.google.android.exoplayer2.util.ParsableByteArray; +import com.google.android.exoplayer2.util.ParsableNalUnitBitArray; import android.util.SparseArray; diff --git a/library/src/main/java/com/google/android/exoplayer/extractor/ts/H265Reader.java b/library/src/main/java/com/google/android/exoplayer2/extractor/ts/H265Reader.java similarity index 97% rename from library/src/main/java/com/google/android/exoplayer/extractor/ts/H265Reader.java rename to library/src/main/java/com/google/android/exoplayer2/extractor/ts/H265Reader.java index 6061cba3c0..365edcb4eb 100644 --- a/library/src/main/java/com/google/android/exoplayer/extractor/ts/H265Reader.java +++ b/library/src/main/java/com/google/android/exoplayer2/extractor/ts/H265Reader.java @@ -1,5 +1,5 @@ /* - * 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.extractor.ts; +package com.google.android.exoplayer2.extractor.ts; -import com.google.android.exoplayer.C; -import com.google.android.exoplayer.Format; -import com.google.android.exoplayer.extractor.TrackOutput; -import com.google.android.exoplayer.util.MimeTypes; -import com.google.android.exoplayer.util.NalUnitUtil; -import com.google.android.exoplayer.util.ParsableByteArray; -import com.google.android.exoplayer.util.ParsableNalUnitBitArray; +import com.google.android.exoplayer2.C; +import com.google.android.exoplayer2.Format; +import com.google.android.exoplayer2.extractor.TrackOutput; +import com.google.android.exoplayer2.util.MimeTypes; +import com.google.android.exoplayer2.util.NalUnitUtil; +import com.google.android.exoplayer2.util.ParsableByteArray; +import com.google.android.exoplayer2.util.ParsableNalUnitBitArray; import android.util.Log; diff --git a/library/src/main/java/com/google/android/exoplayer/extractor/ts/Id3Reader.java b/library/src/main/java/com/google/android/exoplayer2/extractor/ts/Id3Reader.java similarity index 88% rename from library/src/main/java/com/google/android/exoplayer/extractor/ts/Id3Reader.java rename to library/src/main/java/com/google/android/exoplayer2/extractor/ts/Id3Reader.java index ddaf3c8005..1001f1a1ae 100644 --- a/library/src/main/java/com/google/android/exoplayer/extractor/ts/Id3Reader.java +++ b/library/src/main/java/com/google/android/exoplayer2/extractor/ts/Id3Reader.java @@ -1,5 +1,5 @@ /* - * 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.extractor.ts; +package com.google.android.exoplayer2.extractor.ts; -import com.google.android.exoplayer.C; -import com.google.android.exoplayer.Format; -import com.google.android.exoplayer.extractor.TrackOutput; -import com.google.android.exoplayer.util.MimeTypes; -import com.google.android.exoplayer.util.ParsableByteArray; +import com.google.android.exoplayer2.C; +import com.google.android.exoplayer2.Format; +import com.google.android.exoplayer2.extractor.TrackOutput; +import com.google.android.exoplayer2.util.MimeTypes; +import com.google.android.exoplayer2.util.ParsableByteArray; /** * Parses ID3 data and extracts individual text information frames. diff --git a/library/src/main/java/com/google/android/exoplayer/extractor/ts/MpegAudioReader.java b/library/src/main/java/com/google/android/exoplayer2/extractor/ts/MpegAudioReader.java similarity index 94% rename from library/src/main/java/com/google/android/exoplayer/extractor/ts/MpegAudioReader.java rename to library/src/main/java/com/google/android/exoplayer2/extractor/ts/MpegAudioReader.java index 1a86de3a5c..b023506292 100644 --- a/library/src/main/java/com/google/android/exoplayer/extractor/ts/MpegAudioReader.java +++ b/library/src/main/java/com/google/android/exoplayer2/extractor/ts/MpegAudioReader.java @@ -1,5 +1,5 @@ /* - * 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.extractor.ts; +package com.google.android.exoplayer2.extractor.ts; -import com.google.android.exoplayer.C; -import com.google.android.exoplayer.Format; -import com.google.android.exoplayer.extractor.TrackOutput; -import com.google.android.exoplayer.util.MpegAudioHeader; -import com.google.android.exoplayer.util.ParsableByteArray; +import com.google.android.exoplayer2.C; +import com.google.android.exoplayer2.Format; +import com.google.android.exoplayer2.extractor.TrackOutput; +import com.google.android.exoplayer2.util.MpegAudioHeader; +import com.google.android.exoplayer2.util.ParsableByteArray; /** * Parses a continuous MPEG Audio byte stream and extracts individual frames. diff --git a/library/src/main/java/com/google/android/exoplayer/extractor/ts/NalUnitTargetBuffer.java b/library/src/main/java/com/google/android/exoplayer2/extractor/ts/NalUnitTargetBuffer.java similarity index 94% rename from library/src/main/java/com/google/android/exoplayer/extractor/ts/NalUnitTargetBuffer.java rename to library/src/main/java/com/google/android/exoplayer2/extractor/ts/NalUnitTargetBuffer.java index 9b8895082c..cf97af47d9 100644 --- a/library/src/main/java/com/google/android/exoplayer/extractor/ts/NalUnitTargetBuffer.java +++ b/library/src/main/java/com/google/android/exoplayer2/extractor/ts/NalUnitTargetBuffer.java @@ -1,5 +1,5 @@ /* - * 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.ts; +package com.google.android.exoplayer2.extractor.ts; -import com.google.android.exoplayer.util.Assertions; +import com.google.android.exoplayer2.util.Assertions; import java.util.Arrays; diff --git a/library/src/main/java/com/google/android/exoplayer/extractor/ts/PsExtractor.java b/library/src/main/java/com/google/android/exoplayer2/extractor/ts/PsExtractor.java similarity index 95% rename from library/src/main/java/com/google/android/exoplayer/extractor/ts/PsExtractor.java rename to library/src/main/java/com/google/android/exoplayer2/extractor/ts/PsExtractor.java index d36a347ce6..8c9e2e9763 100644 --- a/library/src/main/java/com/google/android/exoplayer/extractor/ts/PsExtractor.java +++ b/library/src/main/java/com/google/android/exoplayer2/extractor/ts/PsExtractor.java @@ -1,5 +1,5 @@ /* - * 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.extractor.ts; +package com.google.android.exoplayer2.extractor.ts; -import com.google.android.exoplayer.C; -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.util.ParsableBitArray; -import com.google.android.exoplayer.util.ParsableByteArray; +import com.google.android.exoplayer2.C; +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.util.ParsableBitArray; +import com.google.android.exoplayer2.util.ParsableByteArray; import android.util.SparseArray; diff --git a/library/src/main/java/com/google/android/exoplayer/extractor/ts/PtsTimestampAdjuster.java b/library/src/main/java/com/google/android/exoplayer2/extractor/ts/PtsTimestampAdjuster.java similarity index 96% rename from library/src/main/java/com/google/android/exoplayer/extractor/ts/PtsTimestampAdjuster.java rename to library/src/main/java/com/google/android/exoplayer2/extractor/ts/PtsTimestampAdjuster.java index c26f52bfc9..aaed6907d3 100644 --- a/library/src/main/java/com/google/android/exoplayer/extractor/ts/PtsTimestampAdjuster.java +++ b/library/src/main/java/com/google/android/exoplayer2/extractor/ts/PtsTimestampAdjuster.java @@ -1,5 +1,5 @@ /* - * 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.ts; +package com.google.android.exoplayer2.extractor.ts; -import com.google.android.exoplayer.C; +import com.google.android.exoplayer2.C; /** * Scales and adjusts MPEG-2 TS presentation timestamps, taking into account an initial offset and diff --git a/library/src/main/java/com/google/android/exoplayer/extractor/ts/SeiReader.java b/library/src/main/java/com/google/android/exoplayer2/extractor/ts/SeiReader.java similarity index 80% rename from library/src/main/java/com/google/android/exoplayer/extractor/ts/SeiReader.java rename to library/src/main/java/com/google/android/exoplayer2/extractor/ts/SeiReader.java index e07dba4af6..02ac0837ec 100644 --- a/library/src/main/java/com/google/android/exoplayer/extractor/ts/SeiReader.java +++ b/library/src/main/java/com/google/android/exoplayer2/extractor/ts/SeiReader.java @@ -1,5 +1,5 @@ /* - * 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.extractor.ts; +package com.google.android.exoplayer2.extractor.ts; -import com.google.android.exoplayer.C; -import com.google.android.exoplayer.Format; -import com.google.android.exoplayer.extractor.TrackOutput; -import com.google.android.exoplayer.text.eia608.Eia608Parser; -import com.google.android.exoplayer.util.MimeTypes; -import com.google.android.exoplayer.util.ParsableByteArray; +import com.google.android.exoplayer2.C; +import com.google.android.exoplayer2.Format; +import com.google.android.exoplayer2.extractor.TrackOutput; +import com.google.android.exoplayer2.text.eia608.Eia608Parser; +import com.google.android.exoplayer2.util.MimeTypes; +import com.google.android.exoplayer2.util.ParsableByteArray; /** * Consumes SEI buffers, outputting contained EIA608 messages to a {@link TrackOutput}. diff --git a/library/src/main/java/com/google/android/exoplayer/extractor/ts/TsExtractor.java b/library/src/main/java/com/google/android/exoplayer2/extractor/ts/TsExtractor.java similarity index 96% rename from library/src/main/java/com/google/android/exoplayer/extractor/ts/TsExtractor.java rename to library/src/main/java/com/google/android/exoplayer2/extractor/ts/TsExtractor.java index 0cde7c3696..d192ca59fb 100644 --- a/library/src/main/java/com/google/android/exoplayer/extractor/ts/TsExtractor.java +++ b/library/src/main/java/com/google/android/exoplayer2/extractor/ts/TsExtractor.java @@ -1,5 +1,5 @@ /* - * 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,20 +13,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.android.exoplayer.extractor.ts; +package com.google.android.exoplayer2.extractor.ts; -import com.google.android.exoplayer.C; -import com.google.android.exoplayer.extractor.DummyTrackOutput; -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.util.Assertions; -import com.google.android.exoplayer.util.ParsableBitArray; -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.extractor.DummyTrackOutput; +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.util.Assertions; +import com.google.android.exoplayer2.util.ParsableBitArray; +import com.google.android.exoplayer2.util.ParsableByteArray; +import com.google.android.exoplayer2.util.Util; import android.util.Log; import android.util.SparseArray; diff --git a/library/src/main/java/com/google/android/exoplayer/extractor/wav/WavExtractor.java b/library/src/main/java/com/google/android/exoplayer2/extractor/wav/WavExtractor.java similarity index 84% rename from library/src/main/java/com/google/android/exoplayer/extractor/wav/WavExtractor.java rename to library/src/main/java/com/google/android/exoplayer2/extractor/wav/WavExtractor.java index e76749677d..5d3db10c87 100644 --- a/library/src/main/java/com/google/android/exoplayer/extractor/wav/WavExtractor.java +++ b/library/src/main/java/com/google/android/exoplayer2/extractor/wav/WavExtractor.java @@ -13,19 +13,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.android.exoplayer.extractor.wav; +package com.google.android.exoplayer2.extractor.wav; -import com.google.android.exoplayer.C; -import com.google.android.exoplayer.Format; -import com.google.android.exoplayer.ParserException; -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.MimeTypes; +import com.google.android.exoplayer2.C; +import com.google.android.exoplayer2.Format; +import com.google.android.exoplayer2.ParserException; +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.MimeTypes; import java.io.IOException; diff --git a/library/src/main/java/com/google/android/exoplayer/extractor/wav/WavHeader.java b/library/src/main/java/com/google/android/exoplayer2/extractor/wav/WavHeader.java similarity index 97% rename from library/src/main/java/com/google/android/exoplayer/extractor/wav/WavHeader.java rename to library/src/main/java/com/google/android/exoplayer2/extractor/wav/WavHeader.java index be43b90445..b5e2268b53 100644 --- a/library/src/main/java/com/google/android/exoplayer/extractor/wav/WavHeader.java +++ b/library/src/main/java/com/google/android/exoplayer2/extractor/wav/WavHeader.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.wav; +package com.google.android.exoplayer2.extractor.wav; -import com.google.android.exoplayer.C; +import com.google.android.exoplayer2.C; /** Header for a WAV file. */ /*package*/ final class WavHeader { diff --git a/library/src/main/java/com/google/android/exoplayer/extractor/wav/WavHeaderReader.java b/library/src/main/java/com/google/android/exoplayer2/extractor/wav/WavHeaderReader.java similarity index 95% rename from library/src/main/java/com/google/android/exoplayer/extractor/wav/WavHeaderReader.java rename to library/src/main/java/com/google/android/exoplayer2/extractor/wav/WavHeaderReader.java index 9df9c7e9ca..398f92cfd5 100644 --- a/library/src/main/java/com/google/android/exoplayer/extractor/wav/WavHeaderReader.java +++ b/library/src/main/java/com/google/android/exoplayer2/extractor/wav/WavHeaderReader.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.android.exoplayer.extractor.wav; +package com.google.android.exoplayer2.extractor.wav; -import com.google.android.exoplayer.C; -import com.google.android.exoplayer.ParserException; -import com.google.android.exoplayer.extractor.ExtractorInput; -import com.google.android.exoplayer.util.Assertions; -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.ParserException; +import com.google.android.exoplayer2.extractor.ExtractorInput; +import com.google.android.exoplayer2.util.Assertions; +import com.google.android.exoplayer2.util.ParsableByteArray; +import com.google.android.exoplayer2.util.Util; import android.util.Log; diff --git a/library/src/main/java/com/google/android/exoplayer/hls/Aes128DataSource.java b/library/src/main/java/com/google/android/exoplayer2/hls/Aes128DataSource.java similarity index 89% rename from library/src/main/java/com/google/android/exoplayer/hls/Aes128DataSource.java rename to library/src/main/java/com/google/android/exoplayer2/hls/Aes128DataSource.java index 2128eb4b60..7b1e1e5f5a 100644 --- a/library/src/main/java/com/google/android/exoplayer/hls/Aes128DataSource.java +++ b/library/src/main/java/com/google/android/exoplayer2/hls/Aes128DataSource.java @@ -1,5 +1,5 @@ /* - * 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.hls; +package com.google.android.exoplayer2.hls; -import com.google.android.exoplayer.C; -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.util.Assertions; +import com.google.android.exoplayer2.C; +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.util.Assertions; import android.net.Uri; diff --git a/library/src/main/java/com/google/android/exoplayer/hls/HlsChunkSource.java b/library/src/main/java/com/google/android/exoplayer2/hls/HlsChunkSource.java similarity index 94% rename from library/src/main/java/com/google/android/exoplayer/hls/HlsChunkSource.java rename to library/src/main/java/com/google/android/exoplayer2/hls/HlsChunkSource.java index bbb56efbc9..fe05308ac0 100644 --- a/library/src/main/java/com/google/android/exoplayer/hls/HlsChunkSource.java +++ b/library/src/main/java/com/google/android/exoplayer2/hls/HlsChunkSource.java @@ -1,5 +1,5 @@ /* - * 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,30 +13,30 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.android.exoplayer.hls; +package com.google.android.exoplayer2.hls; -import com.google.android.exoplayer.BehindLiveWindowException; -import com.google.android.exoplayer.C; -import com.google.android.exoplayer.Format; -import com.google.android.exoplayer.chunk.Chunk; -import com.google.android.exoplayer.chunk.ChunkHolder; -import com.google.android.exoplayer.chunk.DataChunk; -import com.google.android.exoplayer.chunk.FormatEvaluator; -import com.google.android.exoplayer.chunk.FormatEvaluator.Evaluation; -import com.google.android.exoplayer.extractor.Extractor; -import com.google.android.exoplayer.extractor.mp3.Mp3Extractor; -import com.google.android.exoplayer.extractor.ts.AdtsExtractor; -import com.google.android.exoplayer.extractor.ts.PtsTimestampAdjuster; -import com.google.android.exoplayer.extractor.ts.TsExtractor; -import com.google.android.exoplayer.hls.playlist.HlsMediaPlaylist; -import com.google.android.exoplayer.hls.playlist.HlsPlaylistParser; -import com.google.android.exoplayer.hls.playlist.Variant; -import com.google.android.exoplayer.upstream.DataSource; -import com.google.android.exoplayer.upstream.DataSpec; -import com.google.android.exoplayer.upstream.HttpDataSource.InvalidResponseCodeException; -import com.google.android.exoplayer.util.MimeTypes; -import com.google.android.exoplayer.util.UriUtil; -import com.google.android.exoplayer.util.Util; +import com.google.android.exoplayer2.BehindLiveWindowException; +import com.google.android.exoplayer2.C; +import com.google.android.exoplayer2.Format; +import com.google.android.exoplayer2.chunk.Chunk; +import com.google.android.exoplayer2.chunk.ChunkHolder; +import com.google.android.exoplayer2.chunk.DataChunk; +import com.google.android.exoplayer2.chunk.FormatEvaluator; +import com.google.android.exoplayer2.chunk.FormatEvaluator.Evaluation; +import com.google.android.exoplayer2.extractor.Extractor; +import com.google.android.exoplayer2.extractor.mp3.Mp3Extractor; +import com.google.android.exoplayer2.extractor.ts.AdtsExtractor; +import com.google.android.exoplayer2.extractor.ts.PtsTimestampAdjuster; +import com.google.android.exoplayer2.extractor.ts.TsExtractor; +import com.google.android.exoplayer2.hls.playlist.HlsMediaPlaylist; +import com.google.android.exoplayer2.hls.playlist.HlsPlaylistParser; +import com.google.android.exoplayer2.hls.playlist.Variant; +import com.google.android.exoplayer2.upstream.DataSource; +import com.google.android.exoplayer2.upstream.DataSpec; +import com.google.android.exoplayer2.upstream.HttpDataSource.InvalidResponseCodeException; +import com.google.android.exoplayer2.util.MimeTypes; +import com.google.android.exoplayer2.util.UriUtil; +import com.google.android.exoplayer2.util.Util; import android.net.Uri; import android.os.SystemClock; diff --git a/library/src/main/java/com/google/android/exoplayer/hls/HlsMediaChunk.java b/library/src/main/java/com/google/android/exoplayer2/hls/HlsMediaChunk.java similarity index 91% rename from library/src/main/java/com/google/android/exoplayer/hls/HlsMediaChunk.java rename to library/src/main/java/com/google/android/exoplayer2/hls/HlsMediaChunk.java index bc759bc0b1..859f66d5d9 100644 --- a/library/src/main/java/com/google/android/exoplayer/hls/HlsMediaChunk.java +++ b/library/src/main/java/com/google/android/exoplayer2/hls/HlsMediaChunk.java @@ -1,5 +1,5 @@ /* - * 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.hls; +package com.google.android.exoplayer2.hls; -import com.google.android.exoplayer.Format; -import com.google.android.exoplayer.chunk.MediaChunk; -import com.google.android.exoplayer.extractor.DefaultExtractorInput; -import com.google.android.exoplayer.extractor.Extractor; -import com.google.android.exoplayer.extractor.ExtractorInput; -import com.google.android.exoplayer.upstream.DataSource; -import com.google.android.exoplayer.upstream.DataSpec; -import com.google.android.exoplayer.util.Util; +import com.google.android.exoplayer2.Format; +import com.google.android.exoplayer2.chunk.MediaChunk; +import com.google.android.exoplayer2.extractor.DefaultExtractorInput; +import com.google.android.exoplayer2.extractor.Extractor; +import com.google.android.exoplayer2.extractor.ExtractorInput; +import com.google.android.exoplayer2.upstream.DataSource; +import com.google.android.exoplayer2.upstream.DataSpec; +import com.google.android.exoplayer2.util.Util; import java.io.IOException; import java.util.concurrent.atomic.AtomicInteger; diff --git a/library/src/main/java/com/google/android/exoplayer/hls/HlsSampleSource.java b/library/src/main/java/com/google/android/exoplayer2/hls/HlsSampleSource.java similarity index 91% rename from library/src/main/java/com/google/android/exoplayer/hls/HlsSampleSource.java rename to library/src/main/java/com/google/android/exoplayer2/hls/HlsSampleSource.java index c65f85fc94..79b9d15031 100644 --- a/library/src/main/java/com/google/android/exoplayer/hls/HlsSampleSource.java +++ b/library/src/main/java/com/google/android/exoplayer2/hls/HlsSampleSource.java @@ -1,5 +1,5 @@ /* - * 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,34 +13,34 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.android.exoplayer.hls; +package com.google.android.exoplayer2.hls; -import com.google.android.exoplayer.AdaptiveSourceEventListener; -import com.google.android.exoplayer.AdaptiveSourceEventListener.EventDispatcher; -import com.google.android.exoplayer.C; -import com.google.android.exoplayer.CompositeSequenceableLoader; -import com.google.android.exoplayer.Format; -import com.google.android.exoplayer.ParserException; -import com.google.android.exoplayer.SampleSource; -import com.google.android.exoplayer.SampleSourceProvider; -import com.google.android.exoplayer.TrackGroup; -import com.google.android.exoplayer.TrackGroupArray; -import com.google.android.exoplayer.TrackSelection; -import com.google.android.exoplayer.TrackStream; -import com.google.android.exoplayer.chunk.FormatEvaluator; -import com.google.android.exoplayer.hls.playlist.HlsMasterPlaylist; -import com.google.android.exoplayer.hls.playlist.HlsMediaPlaylist; -import com.google.android.exoplayer.hls.playlist.HlsPlaylist; -import com.google.android.exoplayer.hls.playlist.HlsPlaylistParser; -import com.google.android.exoplayer.hls.playlist.Variant; -import com.google.android.exoplayer.upstream.Allocator; -import com.google.android.exoplayer.upstream.BandwidthMeter; -import com.google.android.exoplayer.upstream.DataSource; -import com.google.android.exoplayer.upstream.DataSourceFactory; -import com.google.android.exoplayer.upstream.Loader; -import com.google.android.exoplayer.upstream.ParsingLoadable; -import com.google.android.exoplayer.util.Assertions; -import com.google.android.exoplayer.util.MimeTypes; +import com.google.android.exoplayer2.AdaptiveSourceEventListener; +import com.google.android.exoplayer2.AdaptiveSourceEventListener.EventDispatcher; +import com.google.android.exoplayer2.C; +import com.google.android.exoplayer2.CompositeSequenceableLoader; +import com.google.android.exoplayer2.Format; +import com.google.android.exoplayer2.ParserException; +import com.google.android.exoplayer2.SampleSource; +import com.google.android.exoplayer2.SampleSourceProvider; +import com.google.android.exoplayer2.TrackGroup; +import com.google.android.exoplayer2.TrackGroupArray; +import com.google.android.exoplayer2.TrackSelection; +import com.google.android.exoplayer2.TrackStream; +import com.google.android.exoplayer2.chunk.FormatEvaluator; +import com.google.android.exoplayer2.hls.playlist.HlsMasterPlaylist; +import com.google.android.exoplayer2.hls.playlist.HlsMediaPlaylist; +import com.google.android.exoplayer2.hls.playlist.HlsPlaylist; +import com.google.android.exoplayer2.hls.playlist.HlsPlaylistParser; +import com.google.android.exoplayer2.hls.playlist.Variant; +import com.google.android.exoplayer2.upstream.Allocator; +import com.google.android.exoplayer2.upstream.BandwidthMeter; +import com.google.android.exoplayer2.upstream.DataSource; +import com.google.android.exoplayer2.upstream.DataSourceFactory; +import com.google.android.exoplayer2.upstream.Loader; +import com.google.android.exoplayer2.upstream.ParsingLoadable; +import com.google.android.exoplayer2.util.Assertions; +import com.google.android.exoplayer2.util.MimeTypes; import android.net.Uri; import android.os.Handler; diff --git a/library/src/main/java/com/google/android/exoplayer/hls/HlsTrackStreamWrapper.java b/library/src/main/java/com/google/android/exoplayer2/hls/HlsTrackStreamWrapper.java similarity index 94% rename from library/src/main/java/com/google/android/exoplayer/hls/HlsTrackStreamWrapper.java rename to library/src/main/java/com/google/android/exoplayer2/hls/HlsTrackStreamWrapper.java index 11cc36105a..2eee0ff1a0 100644 --- a/library/src/main/java/com/google/android/exoplayer/hls/HlsTrackStreamWrapper.java +++ b/library/src/main/java/com/google/android/exoplayer2/hls/HlsTrackStreamWrapper.java @@ -1,5 +1,5 @@ /* - * 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,28 +13,28 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.android.exoplayer.hls; +package com.google.android.exoplayer2.hls; -import com.google.android.exoplayer.AdaptiveSourceEventListener.EventDispatcher; -import com.google.android.exoplayer.C; -import com.google.android.exoplayer.DecoderInputBuffer; -import com.google.android.exoplayer.Format; -import com.google.android.exoplayer.FormatHolder; -import com.google.android.exoplayer.SequenceableLoader; -import com.google.android.exoplayer.TrackGroup; -import com.google.android.exoplayer.TrackGroupArray; -import com.google.android.exoplayer.TrackSelection; -import com.google.android.exoplayer.TrackStream; -import com.google.android.exoplayer.chunk.Chunk; -import com.google.android.exoplayer.chunk.ChunkHolder; -import com.google.android.exoplayer.extractor.DefaultTrackOutput; -import com.google.android.exoplayer.extractor.DefaultTrackOutput.UpstreamFormatChangedListener; -import com.google.android.exoplayer.extractor.ExtractorOutput; -import com.google.android.exoplayer.extractor.SeekMap; -import com.google.android.exoplayer.upstream.Allocator; -import com.google.android.exoplayer.upstream.Loader; -import com.google.android.exoplayer.util.Assertions; -import com.google.android.exoplayer.util.MimeTypes; +import com.google.android.exoplayer2.AdaptiveSourceEventListener.EventDispatcher; +import com.google.android.exoplayer2.C; +import com.google.android.exoplayer2.DecoderInputBuffer; +import com.google.android.exoplayer2.Format; +import com.google.android.exoplayer2.FormatHolder; +import com.google.android.exoplayer2.SequenceableLoader; +import com.google.android.exoplayer2.TrackGroup; +import com.google.android.exoplayer2.TrackGroupArray; +import com.google.android.exoplayer2.TrackSelection; +import com.google.android.exoplayer2.TrackStream; +import com.google.android.exoplayer2.chunk.Chunk; +import com.google.android.exoplayer2.chunk.ChunkHolder; +import com.google.android.exoplayer2.extractor.DefaultTrackOutput; +import com.google.android.exoplayer2.extractor.DefaultTrackOutput.UpstreamFormatChangedListener; +import com.google.android.exoplayer2.extractor.ExtractorOutput; +import com.google.android.exoplayer2.extractor.SeekMap; +import com.google.android.exoplayer2.upstream.Allocator; +import com.google.android.exoplayer2.upstream.Loader; +import com.google.android.exoplayer2.util.Assertions; +import com.google.android.exoplayer2.util.MimeTypes; import android.util.SparseArray; diff --git a/library/src/main/java/com/google/android/exoplayer/hls/PtsTimestampAdjusterProvider.java b/library/src/main/java/com/google/android/exoplayer2/hls/PtsTimestampAdjusterProvider.java similarity index 92% rename from library/src/main/java/com/google/android/exoplayer/hls/PtsTimestampAdjusterProvider.java rename to library/src/main/java/com/google/android/exoplayer2/hls/PtsTimestampAdjusterProvider.java index d626a728c5..3a44fa09c4 100644 --- a/library/src/main/java/com/google/android/exoplayer/hls/PtsTimestampAdjusterProvider.java +++ b/library/src/main/java/com/google/android/exoplayer2/hls/PtsTimestampAdjusterProvider.java @@ -1,5 +1,5 @@ /* - * 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.hls; +package com.google.android.exoplayer2.hls; -import com.google.android.exoplayer.extractor.ts.PtsTimestampAdjuster; +import com.google.android.exoplayer2.extractor.ts.PtsTimestampAdjuster; import android.util.SparseArray; diff --git a/library/src/main/java/com/google/android/exoplayer/hls/WebvttExtractor.java b/library/src/main/java/com/google/android/exoplayer2/hls/WebvttExtractor.java similarity index 87% rename from library/src/main/java/com/google/android/exoplayer/hls/WebvttExtractor.java rename to library/src/main/java/com/google/android/exoplayer2/hls/WebvttExtractor.java index c126dd882b..f03901d58a 100644 --- a/library/src/main/java/com/google/android/exoplayer/hls/WebvttExtractor.java +++ b/library/src/main/java/com/google/android/exoplayer2/hls/WebvttExtractor.java @@ -1,5 +1,5 @@ /* - * 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.hls; +package com.google.android.exoplayer2.hls; -import com.google.android.exoplayer.C; -import com.google.android.exoplayer.Format; -import com.google.android.exoplayer.ParserException; -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.PositionHolder; -import com.google.android.exoplayer.extractor.SeekMap; -import com.google.android.exoplayer.extractor.TrackOutput; -import com.google.android.exoplayer.extractor.ts.PtsTimestampAdjuster; -import com.google.android.exoplayer.text.webvtt.WebvttParserUtil; -import com.google.android.exoplayer.util.MimeTypes; -import com.google.android.exoplayer.util.ParsableByteArray; +import com.google.android.exoplayer2.C; +import com.google.android.exoplayer2.Format; +import com.google.android.exoplayer2.ParserException; +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.PositionHolder; +import com.google.android.exoplayer2.extractor.SeekMap; +import com.google.android.exoplayer2.extractor.TrackOutput; +import com.google.android.exoplayer2.extractor.ts.PtsTimestampAdjuster; +import com.google.android.exoplayer2.text.webvtt.WebvttParserUtil; +import com.google.android.exoplayer2.util.MimeTypes; +import com.google.android.exoplayer2.util.ParsableByteArray; import android.text.TextUtils; diff --git a/library/src/main/java/com/google/android/exoplayer/hls/playlist/HlsMasterPlaylist.java b/library/src/main/java/com/google/android/exoplayer2/hls/playlist/HlsMasterPlaylist.java similarity index 90% rename from library/src/main/java/com/google/android/exoplayer/hls/playlist/HlsMasterPlaylist.java rename to library/src/main/java/com/google/android/exoplayer2/hls/playlist/HlsMasterPlaylist.java index 107ca7c1a1..5da570acca 100644 --- a/library/src/main/java/com/google/android/exoplayer/hls/playlist/HlsMasterPlaylist.java +++ b/library/src/main/java/com/google/android/exoplayer2/hls/playlist/HlsMasterPlaylist.java @@ -1,5 +1,5 @@ /* - * 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.hls.playlist; +package com.google.android.exoplayer2.hls.playlist; -import com.google.android.exoplayer.Format; +import com.google.android.exoplayer2.Format; import java.util.Collections; import java.util.List; diff --git a/library/src/main/java/com/google/android/exoplayer/hls/playlist/HlsMediaPlaylist.java b/library/src/main/java/com/google/android/exoplayer2/hls/playlist/HlsMediaPlaylist.java similarity index 95% rename from library/src/main/java/com/google/android/exoplayer/hls/playlist/HlsMediaPlaylist.java rename to library/src/main/java/com/google/android/exoplayer2/hls/playlist/HlsMediaPlaylist.java index 87d535dff0..673f99d0a5 100644 --- a/library/src/main/java/com/google/android/exoplayer/hls/playlist/HlsMediaPlaylist.java +++ b/library/src/main/java/com/google/android/exoplayer2/hls/playlist/HlsMediaPlaylist.java @@ -1,5 +1,5 @@ /* - * 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.hls.playlist; +package com.google.android.exoplayer2.hls.playlist; -import com.google.android.exoplayer.C; +import com.google.android.exoplayer2.C; import java.util.List; diff --git a/library/src/main/java/com/google/android/exoplayer/hls/playlist/HlsParserUtil.java b/library/src/main/java/com/google/android/exoplayer2/hls/playlist/HlsParserUtil.java similarity index 93% rename from library/src/main/java/com/google/android/exoplayer/hls/playlist/HlsParserUtil.java rename to library/src/main/java/com/google/android/exoplayer2/hls/playlist/HlsParserUtil.java index bfd61531ac..2a312dd504 100644 --- a/library/src/main/java/com/google/android/exoplayer/hls/playlist/HlsParserUtil.java +++ b/library/src/main/java/com/google/android/exoplayer2/hls/playlist/HlsParserUtil.java @@ -1,5 +1,5 @@ /* - * 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.hls.playlist; +package com.google.android.exoplayer2.hls.playlist; -import com.google.android.exoplayer.ParserException; +import com.google.android.exoplayer2.ParserException; import java.util.regex.Matcher; import java.util.regex.Pattern; diff --git a/library/src/main/java/com/google/android/exoplayer/hls/playlist/HlsPlaylist.java b/library/src/main/java/com/google/android/exoplayer2/hls/playlist/HlsPlaylist.java similarity index 89% rename from library/src/main/java/com/google/android/exoplayer/hls/playlist/HlsPlaylist.java rename to library/src/main/java/com/google/android/exoplayer2/hls/playlist/HlsPlaylist.java index 6f68469073..3c9a7a532a 100644 --- a/library/src/main/java/com/google/android/exoplayer/hls/playlist/HlsPlaylist.java +++ b/library/src/main/java/com/google/android/exoplayer2/hls/playlist/HlsPlaylist.java @@ -1,5 +1,5 @@ /* - * 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.hls.playlist; +package com.google.android.exoplayer2.hls.playlist; /** * Represents an HLS playlist. diff --git a/library/src/main/java/com/google/android/exoplayer/hls/playlist/HlsPlaylistParser.java b/library/src/main/java/com/google/android/exoplayer2/hls/playlist/HlsPlaylistParser.java similarity index 97% rename from library/src/main/java/com/google/android/exoplayer/hls/playlist/HlsPlaylistParser.java rename to library/src/main/java/com/google/android/exoplayer2/hls/playlist/HlsPlaylistParser.java index e96596cd12..43fb3786bf 100644 --- a/library/src/main/java/com/google/android/exoplayer/hls/playlist/HlsPlaylistParser.java +++ b/library/src/main/java/com/google/android/exoplayer2/hls/playlist/HlsPlaylistParser.java @@ -1,5 +1,5 @@ /* - * 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.hls.playlist; +package com.google.android.exoplayer2.hls.playlist; -import com.google.android.exoplayer.C; -import com.google.android.exoplayer.Format; -import com.google.android.exoplayer.ParserException; -import com.google.android.exoplayer.hls.playlist.HlsMediaPlaylist.Segment; -import com.google.android.exoplayer.upstream.ParsingLoadable; -import com.google.android.exoplayer.util.MimeTypes; +import com.google.android.exoplayer2.C; +import com.google.android.exoplayer2.Format; +import com.google.android.exoplayer2.ParserException; +import com.google.android.exoplayer2.hls.playlist.HlsMediaPlaylist.Segment; +import com.google.android.exoplayer2.upstream.ParsingLoadable; +import com.google.android.exoplayer2.util.MimeTypes; import android.net.Uri; diff --git a/library/src/main/java/com/google/android/exoplayer/hls/playlist/Variant.java b/library/src/main/java/com/google/android/exoplayer2/hls/playlist/Variant.java similarity index 85% rename from library/src/main/java/com/google/android/exoplayer/hls/playlist/Variant.java rename to library/src/main/java/com/google/android/exoplayer2/hls/playlist/Variant.java index c0a71bc00d..d51dd78eb6 100644 --- a/library/src/main/java/com/google/android/exoplayer/hls/playlist/Variant.java +++ b/library/src/main/java/com/google/android/exoplayer2/hls/playlist/Variant.java @@ -1,5 +1,5 @@ /* - * 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.hls.playlist; +package com.google.android.exoplayer2.hls.playlist; -import com.google.android.exoplayer.Format; +import com.google.android.exoplayer2.Format; /** * Variant stream reference. diff --git a/library/src/main/java/com/google/android/exoplayer/metadata/MetadataParser.java b/library/src/main/java/com/google/android/exoplayer2/metadata/MetadataParser.java similarity index 89% rename from library/src/main/java/com/google/android/exoplayer/metadata/MetadataParser.java rename to library/src/main/java/com/google/android/exoplayer2/metadata/MetadataParser.java index 94e043abfa..3da41db360 100644 --- a/library/src/main/java/com/google/android/exoplayer/metadata/MetadataParser.java +++ b/library/src/main/java/com/google/android/exoplayer2/metadata/MetadataParser.java @@ -1,5 +1,5 @@ /* - * 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.metadata; +package com.google.android.exoplayer2.metadata; -import com.google.android.exoplayer.ParserException; +import com.google.android.exoplayer2.ParserException; /** * Parses objects of type from binary data. diff --git a/library/src/main/java/com/google/android/exoplayer/metadata/MetadataTrackRenderer.java b/library/src/main/java/com/google/android/exoplayer2/metadata/MetadataTrackRenderer.java similarity index 90% rename from library/src/main/java/com/google/android/exoplayer/metadata/MetadataTrackRenderer.java rename to library/src/main/java/com/google/android/exoplayer2/metadata/MetadataTrackRenderer.java index 3fc0f42452..2fa48eca7c 100644 --- a/library/src/main/java/com/google/android/exoplayer/metadata/MetadataTrackRenderer.java +++ b/library/src/main/java/com/google/android/exoplayer2/metadata/MetadataTrackRenderer.java @@ -1,5 +1,5 @@ /* - * 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.metadata; +package com.google.android.exoplayer2.metadata; -import com.google.android.exoplayer.C; -import com.google.android.exoplayer.DecoderInputBuffer; -import com.google.android.exoplayer.ExoPlaybackException; -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.util.Assertions; +import com.google.android.exoplayer2.C; +import com.google.android.exoplayer2.DecoderInputBuffer; +import com.google.android.exoplayer2.ExoPlaybackException; +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.util.Assertions; import android.os.Handler; import android.os.Handler.Callback; diff --git a/library/src/main/java/com/google/android/exoplayer/metadata/id3/ApicFrame.java b/library/src/main/java/com/google/android/exoplayer2/metadata/id3/ApicFrame.java similarity index 91% rename from library/src/main/java/com/google/android/exoplayer/metadata/id3/ApicFrame.java rename to library/src/main/java/com/google/android/exoplayer2/metadata/id3/ApicFrame.java index d279a2e189..d2a04bdb94 100644 --- a/library/src/main/java/com/google/android/exoplayer/metadata/id3/ApicFrame.java +++ b/library/src/main/java/com/google/android/exoplayer2/metadata/id3/ApicFrame.java @@ -1,5 +1,5 @@ /* - * 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.metadata.id3; +package com.google.android.exoplayer2.metadata.id3; /** * APIC (Attached Picture) ID3 frame. diff --git a/library/src/main/java/com/google/android/exoplayer/metadata/id3/BinaryFrame.java b/library/src/main/java/com/google/android/exoplayer2/metadata/id3/BinaryFrame.java similarity index 87% rename from library/src/main/java/com/google/android/exoplayer/metadata/id3/BinaryFrame.java rename to library/src/main/java/com/google/android/exoplayer2/metadata/id3/BinaryFrame.java index 65eda909c2..5bc4ce3829 100644 --- a/library/src/main/java/com/google/android/exoplayer/metadata/id3/BinaryFrame.java +++ b/library/src/main/java/com/google/android/exoplayer2/metadata/id3/BinaryFrame.java @@ -1,5 +1,5 @@ /* - * 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.metadata.id3; +package com.google.android.exoplayer2.metadata.id3; /** * Binary ID3 frame. diff --git a/library/src/main/java/com/google/android/exoplayer/metadata/id3/GeobFrame.java b/library/src/main/java/com/google/android/exoplayer2/metadata/id3/GeobFrame.java similarity index 91% rename from library/src/main/java/com/google/android/exoplayer/metadata/id3/GeobFrame.java rename to library/src/main/java/com/google/android/exoplayer2/metadata/id3/GeobFrame.java index 109b1fb4b0..4b77a69b27 100644 --- a/library/src/main/java/com/google/android/exoplayer/metadata/id3/GeobFrame.java +++ b/library/src/main/java/com/google/android/exoplayer2/metadata/id3/GeobFrame.java @@ -1,5 +1,5 @@ /* - * 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.metadata.id3; +package com.google.android.exoplayer2.metadata.id3; /** * GEOB (General Encapsulated Object) ID3 frame. diff --git a/library/src/main/java/com/google/android/exoplayer/metadata/id3/Id3Frame.java b/library/src/main/java/com/google/android/exoplayer2/metadata/id3/Id3Frame.java similarity index 87% rename from library/src/main/java/com/google/android/exoplayer/metadata/id3/Id3Frame.java rename to library/src/main/java/com/google/android/exoplayer2/metadata/id3/Id3Frame.java index 11e6f33f0c..903b32da4f 100644 --- a/library/src/main/java/com/google/android/exoplayer/metadata/id3/Id3Frame.java +++ b/library/src/main/java/com/google/android/exoplayer2/metadata/id3/Id3Frame.java @@ -1,5 +1,5 @@ /* - * 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.metadata.id3; +package com.google.android.exoplayer2.metadata.id3; /** * Base class for ID3 frames. diff --git a/library/src/main/java/com/google/android/exoplayer/metadata/id3/Id3Parser.java b/library/src/main/java/com/google/android/exoplayer2/metadata/id3/Id3Parser.java similarity index 96% rename from library/src/main/java/com/google/android/exoplayer/metadata/id3/Id3Parser.java rename to library/src/main/java/com/google/android/exoplayer2/metadata/id3/Id3Parser.java index 7998c8eb60..fae9dd117d 100644 --- a/library/src/main/java/com/google/android/exoplayer/metadata/id3/Id3Parser.java +++ b/library/src/main/java/com/google/android/exoplayer2/metadata/id3/Id3Parser.java @@ -1,5 +1,5 @@ /* - * 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.metadata.id3; +package com.google.android.exoplayer2.metadata.id3; -import com.google.android.exoplayer.ParserException; -import com.google.android.exoplayer.metadata.MetadataParser; -import com.google.android.exoplayer.util.MimeTypes; -import com.google.android.exoplayer.util.ParsableByteArray; +import com.google.android.exoplayer2.ParserException; +import com.google.android.exoplayer2.metadata.MetadataParser; +import com.google.android.exoplayer2.util.MimeTypes; +import com.google.android.exoplayer2.util.ParsableByteArray; import java.io.UnsupportedEncodingException; import java.util.ArrayList; diff --git a/library/src/main/java/com/google/android/exoplayer/metadata/id3/PrivFrame.java b/library/src/main/java/com/google/android/exoplayer2/metadata/id3/PrivFrame.java similarity index 89% rename from library/src/main/java/com/google/android/exoplayer/metadata/id3/PrivFrame.java rename to library/src/main/java/com/google/android/exoplayer2/metadata/id3/PrivFrame.java index 3a429b19e4..bbfbd96b84 100644 --- a/library/src/main/java/com/google/android/exoplayer/metadata/id3/PrivFrame.java +++ b/library/src/main/java/com/google/android/exoplayer2/metadata/id3/PrivFrame.java @@ -1,5 +1,5 @@ /* - * 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.metadata.id3; +package com.google.android.exoplayer2.metadata.id3; /** * PRIV (Private) ID3 frame. diff --git a/library/src/main/java/com/google/android/exoplayer/metadata/id3/TextInformationFrame.java b/library/src/main/java/com/google/android/exoplayer2/metadata/id3/TextInformationFrame.java similarity index 89% rename from library/src/main/java/com/google/android/exoplayer/metadata/id3/TextInformationFrame.java rename to library/src/main/java/com/google/android/exoplayer2/metadata/id3/TextInformationFrame.java index 3d47c5aa68..ec05a8ff4b 100644 --- a/library/src/main/java/com/google/android/exoplayer/metadata/id3/TextInformationFrame.java +++ b/library/src/main/java/com/google/android/exoplayer2/metadata/id3/TextInformationFrame.java @@ -1,5 +1,5 @@ /* - * 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.metadata.id3; +package com.google.android.exoplayer2.metadata.id3; /** * Text information ("T000" - "TZZZ", excluding "TXXX") ID3 frame. diff --git a/library/src/main/java/com/google/android/exoplayer/metadata/id3/TxxxFrame.java b/library/src/main/java/com/google/android/exoplayer2/metadata/id3/TxxxFrame.java similarity index 89% rename from library/src/main/java/com/google/android/exoplayer/metadata/id3/TxxxFrame.java rename to library/src/main/java/com/google/android/exoplayer2/metadata/id3/TxxxFrame.java index f31ad9d54f..6593c2f120 100644 --- a/library/src/main/java/com/google/android/exoplayer/metadata/id3/TxxxFrame.java +++ b/library/src/main/java/com/google/android/exoplayer2/metadata/id3/TxxxFrame.java @@ -1,5 +1,5 @@ /* - * 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.metadata.id3; +package com.google.android.exoplayer2.metadata.id3; /** * TXXX (User defined text information) ID3 frame. diff --git a/library/src/main/java/com/google/android/exoplayer/smoothstreaming/SmoothStreamingChunkSource.java b/library/src/main/java/com/google/android/exoplayer2/smoothstreaming/SmoothStreamingChunkSource.java similarity index 88% rename from library/src/main/java/com/google/android/exoplayer/smoothstreaming/SmoothStreamingChunkSource.java rename to library/src/main/java/com/google/android/exoplayer2/smoothstreaming/SmoothStreamingChunkSource.java index 4d7dbc5453..c34e95efd3 100644 --- a/library/src/main/java/com/google/android/exoplayer/smoothstreaming/SmoothStreamingChunkSource.java +++ b/library/src/main/java/com/google/android/exoplayer2/smoothstreaming/SmoothStreamingChunkSource.java @@ -1,5 +1,5 @@ /* - * 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,28 +13,28 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.android.exoplayer.smoothstreaming; +package com.google.android.exoplayer2.smoothstreaming; -import com.google.android.exoplayer.BehindLiveWindowException; -import com.google.android.exoplayer.C; -import com.google.android.exoplayer.Format; -import com.google.android.exoplayer.Format.DecreasingBandwidthComparator; -import com.google.android.exoplayer.TrackGroup; -import com.google.android.exoplayer.chunk.Chunk; -import com.google.android.exoplayer.chunk.ChunkExtractorWrapper; -import com.google.android.exoplayer.chunk.ChunkHolder; -import com.google.android.exoplayer.chunk.ChunkSource; -import com.google.android.exoplayer.chunk.ContainerMediaChunk; -import com.google.android.exoplayer.chunk.FormatEvaluator; -import com.google.android.exoplayer.chunk.FormatEvaluator.Evaluation; -import com.google.android.exoplayer.chunk.MediaChunk; -import com.google.android.exoplayer.extractor.mp4.FragmentedMp4Extractor; -import com.google.android.exoplayer.extractor.mp4.Track; -import com.google.android.exoplayer.extractor.mp4.TrackEncryptionBox; -import com.google.android.exoplayer.smoothstreaming.SmoothStreamingManifest.StreamElement; -import com.google.android.exoplayer.upstream.DataSource; -import com.google.android.exoplayer.upstream.DataSpec; -import com.google.android.exoplayer.upstream.Loader; +import com.google.android.exoplayer2.BehindLiveWindowException; +import com.google.android.exoplayer2.C; +import com.google.android.exoplayer2.Format; +import com.google.android.exoplayer2.Format.DecreasingBandwidthComparator; +import com.google.android.exoplayer2.TrackGroup; +import com.google.android.exoplayer2.chunk.Chunk; +import com.google.android.exoplayer2.chunk.ChunkExtractorWrapper; +import com.google.android.exoplayer2.chunk.ChunkHolder; +import com.google.android.exoplayer2.chunk.ChunkSource; +import com.google.android.exoplayer2.chunk.ContainerMediaChunk; +import com.google.android.exoplayer2.chunk.FormatEvaluator; +import com.google.android.exoplayer2.chunk.FormatEvaluator.Evaluation; +import com.google.android.exoplayer2.chunk.MediaChunk; +import com.google.android.exoplayer2.extractor.mp4.FragmentedMp4Extractor; +import com.google.android.exoplayer2.extractor.mp4.Track; +import com.google.android.exoplayer2.extractor.mp4.TrackEncryptionBox; +import com.google.android.exoplayer2.smoothstreaming.SmoothStreamingManifest.StreamElement; +import com.google.android.exoplayer2.upstream.DataSource; +import com.google.android.exoplayer2.upstream.DataSpec; +import com.google.android.exoplayer2.upstream.Loader; import android.net.Uri; import android.text.TextUtils; diff --git a/library/src/main/java/com/google/android/exoplayer/smoothstreaming/SmoothStreamingManifest.java b/library/src/main/java/com/google/android/exoplayer2/smoothstreaming/SmoothStreamingManifest.java similarity index 95% rename from library/src/main/java/com/google/android/exoplayer/smoothstreaming/SmoothStreamingManifest.java rename to library/src/main/java/com/google/android/exoplayer2/smoothstreaming/SmoothStreamingManifest.java index e9fa65396f..15734bb6be 100644 --- a/library/src/main/java/com/google/android/exoplayer/smoothstreaming/SmoothStreamingManifest.java +++ b/library/src/main/java/com/google/android/exoplayer2/smoothstreaming/SmoothStreamingManifest.java @@ -1,5 +1,5 @@ /* - * 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.smoothstreaming; +package com.google.android.exoplayer2.smoothstreaming; -import com.google.android.exoplayer.C; -import com.google.android.exoplayer.Format; -import com.google.android.exoplayer.util.Assertions; -import com.google.android.exoplayer.util.UriUtil; -import com.google.android.exoplayer.util.Util; +import com.google.android.exoplayer2.C; +import com.google.android.exoplayer2.Format; +import com.google.android.exoplayer2.util.Assertions; +import com.google.android.exoplayer2.util.UriUtil; +import com.google.android.exoplayer2.util.Util; import android.net.Uri; diff --git a/library/src/main/java/com/google/android/exoplayer/smoothstreaming/SmoothStreamingManifestParser.java b/library/src/main/java/com/google/android/exoplayer2/smoothstreaming/SmoothStreamingManifestParser.java similarity index 96% rename from library/src/main/java/com/google/android/exoplayer/smoothstreaming/SmoothStreamingManifestParser.java rename to library/src/main/java/com/google/android/exoplayer2/smoothstreaming/SmoothStreamingManifestParser.java index 3d002b4cbc..b3aad30648 100644 --- a/library/src/main/java/com/google/android/exoplayer/smoothstreaming/SmoothStreamingManifestParser.java +++ b/library/src/main/java/com/google/android/exoplayer2/smoothstreaming/SmoothStreamingManifestParser.java @@ -1,5 +1,5 @@ /* - * 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.smoothstreaming; +package com.google.android.exoplayer2.smoothstreaming; -import com.google.android.exoplayer.C; -import com.google.android.exoplayer.Format; -import com.google.android.exoplayer.ParserException; -import com.google.android.exoplayer.drm.DrmInitData; -import com.google.android.exoplayer.drm.DrmInitData.SchemeData; -import com.google.android.exoplayer.extractor.mp4.PsshAtomUtil; -import com.google.android.exoplayer.smoothstreaming.SmoothStreamingManifest.ProtectionElement; -import com.google.android.exoplayer.smoothstreaming.SmoothStreamingManifest.StreamElement; -import com.google.android.exoplayer.upstream.ParsingLoadable; -import com.google.android.exoplayer.util.Assertions; -import com.google.android.exoplayer.util.CodecSpecificDataUtil; -import com.google.android.exoplayer.util.MimeTypes; -import com.google.android.exoplayer.util.Util; +import com.google.android.exoplayer2.C; +import com.google.android.exoplayer2.Format; +import com.google.android.exoplayer2.ParserException; +import com.google.android.exoplayer2.drm.DrmInitData; +import com.google.android.exoplayer2.drm.DrmInitData.SchemeData; +import com.google.android.exoplayer2.extractor.mp4.PsshAtomUtil; +import com.google.android.exoplayer2.smoothstreaming.SmoothStreamingManifest.ProtectionElement; +import com.google.android.exoplayer2.smoothstreaming.SmoothStreamingManifest.StreamElement; +import com.google.android.exoplayer2.upstream.ParsingLoadable; +import com.google.android.exoplayer2.util.Assertions; +import com.google.android.exoplayer2.util.CodecSpecificDataUtil; +import com.google.android.exoplayer2.util.MimeTypes; +import com.google.android.exoplayer2.util.Util; import android.net.Uri; import android.text.TextUtils; diff --git a/library/src/main/java/com/google/android/exoplayer/smoothstreaming/SmoothStreamingSampleSource.java b/library/src/main/java/com/google/android/exoplayer2/smoothstreaming/SmoothStreamingSampleSource.java similarity index 88% rename from library/src/main/java/com/google/android/exoplayer/smoothstreaming/SmoothStreamingSampleSource.java rename to library/src/main/java/com/google/android/exoplayer2/smoothstreaming/SmoothStreamingSampleSource.java index 543fa81aac..f650c66006 100644 --- a/library/src/main/java/com/google/android/exoplayer/smoothstreaming/SmoothStreamingSampleSource.java +++ b/library/src/main/java/com/google/android/exoplayer2/smoothstreaming/SmoothStreamingSampleSource.java @@ -1,5 +1,5 @@ /* - * 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,35 +13,35 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.android.exoplayer.smoothstreaming; +package com.google.android.exoplayer2.smoothstreaming; -import com.google.android.exoplayer.AdaptiveSourceEventListener; -import com.google.android.exoplayer.AdaptiveSourceEventListener.EventDispatcher; -import com.google.android.exoplayer.C; -import com.google.android.exoplayer.CompositeSequenceableLoader; -import com.google.android.exoplayer.Format; -import com.google.android.exoplayer.ParserException; -import com.google.android.exoplayer.SampleSource; -import com.google.android.exoplayer.SampleSourceProvider; -import com.google.android.exoplayer.SequenceableLoader; -import com.google.android.exoplayer.TrackGroup; -import com.google.android.exoplayer.TrackGroupArray; -import com.google.android.exoplayer.TrackSelection; -import com.google.android.exoplayer.TrackStream; -import com.google.android.exoplayer.chunk.ChunkTrackStream; -import com.google.android.exoplayer.chunk.FormatEvaluator; -import com.google.android.exoplayer.chunk.FormatEvaluator.AdaptiveEvaluator; -import com.google.android.exoplayer.extractor.mp4.TrackEncryptionBox; -import com.google.android.exoplayer.smoothstreaming.SmoothStreamingManifest.ProtectionElement; -import com.google.android.exoplayer.smoothstreaming.SmoothStreamingManifest.StreamElement; -import com.google.android.exoplayer.upstream.Allocator; -import com.google.android.exoplayer.upstream.BandwidthMeter; -import com.google.android.exoplayer.upstream.DataSource; -import com.google.android.exoplayer.upstream.DataSourceFactory; -import com.google.android.exoplayer.upstream.Loader; -import com.google.android.exoplayer.upstream.ParsingLoadable; -import com.google.android.exoplayer.util.Assertions; -import com.google.android.exoplayer.util.Util; +import com.google.android.exoplayer2.AdaptiveSourceEventListener; +import com.google.android.exoplayer2.AdaptiveSourceEventListener.EventDispatcher; +import com.google.android.exoplayer2.C; +import com.google.android.exoplayer2.CompositeSequenceableLoader; +import com.google.android.exoplayer2.Format; +import com.google.android.exoplayer2.ParserException; +import com.google.android.exoplayer2.SampleSource; +import com.google.android.exoplayer2.SampleSourceProvider; +import com.google.android.exoplayer2.SequenceableLoader; +import com.google.android.exoplayer2.TrackGroup; +import com.google.android.exoplayer2.TrackGroupArray; +import com.google.android.exoplayer2.TrackSelection; +import com.google.android.exoplayer2.TrackStream; +import com.google.android.exoplayer2.chunk.ChunkTrackStream; +import com.google.android.exoplayer2.chunk.FormatEvaluator; +import com.google.android.exoplayer2.chunk.FormatEvaluator.AdaptiveEvaluator; +import com.google.android.exoplayer2.extractor.mp4.TrackEncryptionBox; +import com.google.android.exoplayer2.smoothstreaming.SmoothStreamingManifest.ProtectionElement; +import com.google.android.exoplayer2.smoothstreaming.SmoothStreamingManifest.StreamElement; +import com.google.android.exoplayer2.upstream.Allocator; +import com.google.android.exoplayer2.upstream.BandwidthMeter; +import com.google.android.exoplayer2.upstream.DataSource; +import com.google.android.exoplayer2.upstream.DataSourceFactory; +import com.google.android.exoplayer2.upstream.Loader; +import com.google.android.exoplayer2.upstream.ParsingLoadable; +import com.google.android.exoplayer2.util.Assertions; +import com.google.android.exoplayer2.util.Util; import android.net.Uri; import android.os.Handler; diff --git a/library/src/main/java/com/google/android/exoplayer/text/CaptionStyleCompat.java b/library/src/main/java/com/google/android/exoplayer2/text/CaptionStyleCompat.java similarity index 97% rename from library/src/main/java/com/google/android/exoplayer/text/CaptionStyleCompat.java rename to library/src/main/java/com/google/android/exoplayer2/text/CaptionStyleCompat.java index 61aca14bba..c62f910a42 100644 --- a/library/src/main/java/com/google/android/exoplayer/text/CaptionStyleCompat.java +++ b/library/src/main/java/com/google/android/exoplayer2/text/CaptionStyleCompat.java @@ -1,5 +1,5 @@ /* - * 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.text; +package com.google.android.exoplayer2.text; -import com.google.android.exoplayer.util.Util; +import com.google.android.exoplayer2.util.Util; import android.annotation.TargetApi; import android.graphics.Color; diff --git a/library/src/main/java/com/google/android/exoplayer/text/Cue.java b/library/src/main/java/com/google/android/exoplayer2/text/Cue.java similarity index 98% rename from library/src/main/java/com/google/android/exoplayer/text/Cue.java rename to library/src/main/java/com/google/android/exoplayer2/text/Cue.java index 33f37ef608..2e0d0c5450 100644 --- a/library/src/main/java/com/google/android/exoplayer/text/Cue.java +++ b/library/src/main/java/com/google/android/exoplayer2/text/Cue.java @@ -1,5 +1,5 @@ /* - * 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.text; +package com.google.android.exoplayer2.text; import android.text.Layout.Alignment; diff --git a/library/src/main/java/com/google/android/exoplayer/text/CuePainter.java b/library/src/main/java/com/google/android/exoplayer2/text/CuePainter.java similarity index 98% rename from library/src/main/java/com/google/android/exoplayer/text/CuePainter.java rename to library/src/main/java/com/google/android/exoplayer2/text/CuePainter.java index a1832b2774..763e588aec 100644 --- a/library/src/main/java/com/google/android/exoplayer/text/CuePainter.java +++ b/library/src/main/java/com/google/android/exoplayer2/text/CuePainter.java @@ -1,5 +1,5 @@ /* - * 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.text; +package com.google.android.exoplayer2.text; -import com.google.android.exoplayer.util.Util; +import com.google.android.exoplayer2.util.Util; import android.content.Context; import android.content.res.Resources; diff --git a/library/src/main/java/com/google/android/exoplayer/text/SimpleSubtitleOutputBuffer.java b/library/src/main/java/com/google/android/exoplayer2/text/SimpleSubtitleOutputBuffer.java similarity index 90% rename from library/src/main/java/com/google/android/exoplayer/text/SimpleSubtitleOutputBuffer.java rename to library/src/main/java/com/google/android/exoplayer2/text/SimpleSubtitleOutputBuffer.java index c8ab69a1bc..8f37b47e55 100644 --- a/library/src/main/java/com/google/android/exoplayer/text/SimpleSubtitleOutputBuffer.java +++ b/library/src/main/java/com/google/android/exoplayer2/text/SimpleSubtitleOutputBuffer.java @@ -1,5 +1,5 @@ /* - * 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.text; +package com.google.android.exoplayer2.text; /** * A {@link Subtitle} output from a subtitle parser that extends {@link SimpleSubtitleParser}. diff --git a/library/src/main/java/com/google/android/exoplayer/text/SimpleSubtitleParser.java b/library/src/main/java/com/google/android/exoplayer2/text/SimpleSubtitleParser.java similarity index 91% rename from library/src/main/java/com/google/android/exoplayer/text/SimpleSubtitleParser.java rename to library/src/main/java/com/google/android/exoplayer2/text/SimpleSubtitleParser.java index 5dbfc37058..5f00c45f9b 100644 --- a/library/src/main/java/com/google/android/exoplayer/text/SimpleSubtitleParser.java +++ b/library/src/main/java/com/google/android/exoplayer2/text/SimpleSubtitleParser.java @@ -1,5 +1,5 @@ /* - * 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.text; +package com.google.android.exoplayer2.text; -import com.google.android.exoplayer.ParserException; -import com.google.android.exoplayer.extensions.SimpleDecoder; +import com.google.android.exoplayer2.ParserException; +import com.google.android.exoplayer2.extensions.SimpleDecoder; import java.nio.ByteBuffer; diff --git a/library/src/main/java/com/google/android/exoplayer/text/Subtitle.java b/library/src/main/java/com/google/android/exoplayer2/text/Subtitle.java similarity index 94% rename from library/src/main/java/com/google/android/exoplayer/text/Subtitle.java rename to library/src/main/java/com/google/android/exoplayer2/text/Subtitle.java index 245571192b..88bbc6a5bf 100644 --- a/library/src/main/java/com/google/android/exoplayer/text/Subtitle.java +++ b/library/src/main/java/com/google/android/exoplayer2/text/Subtitle.java @@ -1,5 +1,5 @@ /* - * 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.text; +package com.google.android.exoplayer2.text; import java.util.List; diff --git a/library/src/main/java/com/google/android/exoplayer/text/SubtitleInputBuffer.java b/library/src/main/java/com/google/android/exoplayer2/text/SubtitleInputBuffer.java similarity index 87% rename from library/src/main/java/com/google/android/exoplayer/text/SubtitleInputBuffer.java rename to library/src/main/java/com/google/android/exoplayer2/text/SubtitleInputBuffer.java index 2c7818dc5a..bea9b63572 100644 --- a/library/src/main/java/com/google/android/exoplayer/text/SubtitleInputBuffer.java +++ b/library/src/main/java/com/google/android/exoplayer2/text/SubtitleInputBuffer.java @@ -1,5 +1,5 @@ /* - * 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.text; +package com.google.android.exoplayer2.text; -import com.google.android.exoplayer.DecoderInputBuffer; +import com.google.android.exoplayer2.DecoderInputBuffer; /** * An input buffer for a subtitle parser. diff --git a/library/src/main/java/com/google/android/exoplayer/text/SubtitleLayout.java b/library/src/main/java/com/google/android/exoplayer2/text/SubtitleLayout.java similarity index 98% rename from library/src/main/java/com/google/android/exoplayer/text/SubtitleLayout.java rename to library/src/main/java/com/google/android/exoplayer2/text/SubtitleLayout.java index 700a72138c..d5cca35c9a 100644 --- a/library/src/main/java/com/google/android/exoplayer/text/SubtitleLayout.java +++ b/library/src/main/java/com/google/android/exoplayer2/text/SubtitleLayout.java @@ -1,5 +1,5 @@ /* - * 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.text; +package com.google.android.exoplayer2.text; import android.content.Context; import android.content.res.Resources; diff --git a/library/src/main/java/com/google/android/exoplayer/text/SubtitleOutputBuffer.java b/library/src/main/java/com/google/android/exoplayer2/text/SubtitleOutputBuffer.java similarity index 89% rename from library/src/main/java/com/google/android/exoplayer/text/SubtitleOutputBuffer.java rename to library/src/main/java/com/google/android/exoplayer2/text/SubtitleOutputBuffer.java index 229dfc49e6..a7550e2ab9 100644 --- a/library/src/main/java/com/google/android/exoplayer/text/SubtitleOutputBuffer.java +++ b/library/src/main/java/com/google/android/exoplayer2/text/SubtitleOutputBuffer.java @@ -1,5 +1,5 @@ /* - * 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.text; +package com.google.android.exoplayer2.text; -import com.google.android.exoplayer.Format; -import com.google.android.exoplayer.extensions.OutputBuffer; +import com.google.android.exoplayer2.Format; +import com.google.android.exoplayer2.extensions.OutputBuffer; import java.util.List; diff --git a/library/src/main/java/com/google/android/exoplayer/text/SubtitleParser.java b/library/src/main/java/com/google/android/exoplayer2/text/SubtitleParser.java similarity index 83% rename from library/src/main/java/com/google/android/exoplayer/text/SubtitleParser.java rename to library/src/main/java/com/google/android/exoplayer2/text/SubtitleParser.java index 0d1899f214..223967964f 100644 --- a/library/src/main/java/com/google/android/exoplayer/text/SubtitleParser.java +++ b/library/src/main/java/com/google/android/exoplayer2/text/SubtitleParser.java @@ -1,5 +1,5 @@ /* - * 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.text; +package com.google.android.exoplayer2.text; -import com.google.android.exoplayer.ParserException; -import com.google.android.exoplayer.extensions.Decoder; +import com.google.android.exoplayer2.ParserException; +import com.google.android.exoplayer2.extensions.Decoder; /** * Parses {@link Subtitle}s from {@link SubtitleInputBuffer}s. diff --git a/library/src/main/java/com/google/android/exoplayer/text/SubtitleParserFactory.java b/library/src/main/java/com/google/android/exoplayer2/text/SubtitleParserFactory.java similarity index 66% rename from library/src/main/java/com/google/android/exoplayer/text/SubtitleParserFactory.java rename to library/src/main/java/com/google/android/exoplayer2/text/SubtitleParserFactory.java index 0ac172900d..2345917cd6 100644 --- a/library/src/main/java/com/google/android/exoplayer/text/SubtitleParserFactory.java +++ b/library/src/main/java/com/google/android/exoplayer2/text/SubtitleParserFactory.java @@ -1,5 +1,5 @@ /* - * 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.text; +package com.google.android.exoplayer2.text; -import com.google.android.exoplayer.Format; -import com.google.android.exoplayer.extensions.Decoder; -import com.google.android.exoplayer.util.MimeTypes; +import com.google.android.exoplayer2.Format; +import com.google.android.exoplayer2.extensions.Decoder; +import com.google.android.exoplayer2.util.MimeTypes; /** * A factory for {@link Decoder} instances that will parse subtitles. @@ -47,12 +47,12 @@ public interface SubtitleParserFactory { *

* The formats supported by this factory are: *

    - *
  • WebVTT ({@link com.google.android.exoplayer.text.webvtt.WebvttParser})
    • - *
  • WebVTT (MP4) ({@link com.google.android.exoplayer.text.webvtt.Mp4WebvttParser})
    • - *
  • TTML ({@link com.google.android.exoplayer.text.ttml.TtmlParser})
    • - *
  • SubRip ({@link com.google.android.exoplayer.text.subrip.SubripParser})
    • - *
  • TX3G ({@link com.google.android.exoplayer.text.tx3g.Tx3gParser})
    • - *
  • Eia608 ({@link com.google.android.exoplayer.text.eia608.Eia608Parser})
    • + *
  • WebVTT ({@link com.google.android.exoplayer2.text.webvtt.WebvttParser})
    • + *
  • WebVTT (MP4) ({@link com.google.android.exoplayer2.text.webvtt.Mp4WebvttParser})
    • + *
  • TTML ({@link com.google.android.exoplayer2.text.ttml.TtmlParser})
    • + *
  • SubRip ({@link com.google.android.exoplayer2.text.subrip.SubripParser})
    • + *
  • TX3G ({@link com.google.android.exoplayer2.text.tx3g.Tx3gParser})
    • + *
  • Eia608 ({@link com.google.android.exoplayer2.text.eia608.Eia608Parser})
    • *
*/ SubtitleParserFactory DEFAULT = new SubtitleParserFactory() { @@ -79,17 +79,17 @@ public interface SubtitleParserFactory { try { switch (mimeType) { case MimeTypes.TEXT_VTT: - return Class.forName("com.google.android.exoplayer.text.webvtt.WebvttParser"); + return Class.forName("com.google.android.exoplayer2.text.webvtt.WebvttParser"); case MimeTypes.APPLICATION_TTML: - return Class.forName("com.google.android.exoplayer.text.ttml.TtmlParser"); + return Class.forName("com.google.android.exoplayer2.text.ttml.TtmlParser"); case MimeTypes.APPLICATION_MP4VTT: - return Class.forName("com.google.android.exoplayer.text.webvtt.Mp4WebvttParser"); + return Class.forName("com.google.android.exoplayer2.text.webvtt.Mp4WebvttParser"); case MimeTypes.APPLICATION_SUBRIP: - return Class.forName("com.google.android.exoplayer.text.subrip.SubripParser"); + return Class.forName("com.google.android.exoplayer2.text.subrip.SubripParser"); case MimeTypes.APPLICATION_TX3G: - return Class.forName("com.google.android.exoplayer.text.tx3g.Tx3gParser"); + return Class.forName("com.google.android.exoplayer2.text.tx3g.Tx3gParser"); case MimeTypes.APPLICATION_EIA608: - return Class.forName("com.google.android.exoplayer.text.eia608.Eia608Parser"); + return Class.forName("com.google.android.exoplayer2.text.eia608.Eia608Parser"); default: return null; } diff --git a/library/src/main/java/com/google/android/exoplayer/text/TextRenderer.java b/library/src/main/java/com/google/android/exoplayer2/text/TextRenderer.java similarity index 90% rename from library/src/main/java/com/google/android/exoplayer/text/TextRenderer.java rename to library/src/main/java/com/google/android/exoplayer2/text/TextRenderer.java index 03899c0b0c..6f04b080ec 100644 --- a/library/src/main/java/com/google/android/exoplayer/text/TextRenderer.java +++ b/library/src/main/java/com/google/android/exoplayer2/text/TextRenderer.java @@ -1,5 +1,5 @@ /* - * 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.text; +package com.google.android.exoplayer2.text; import java.util.List; diff --git a/library/src/main/java/com/google/android/exoplayer/text/TextTrackRenderer.java b/library/src/main/java/com/google/android/exoplayer2/text/TextTrackRenderer.java similarity index 93% rename from library/src/main/java/com/google/android/exoplayer/text/TextTrackRenderer.java rename to library/src/main/java/com/google/android/exoplayer2/text/TextTrackRenderer.java index 20aa6bb1ef..e3764516ad 100644 --- a/library/src/main/java/com/google/android/exoplayer/text/TextTrackRenderer.java +++ b/library/src/main/java/com/google/android/exoplayer2/text/TextTrackRenderer.java @@ -1,5 +1,5 @@ /* - * 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,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.android.exoplayer.text; +package com.google.android.exoplayer2.text; -import com.google.android.exoplayer.C; -import com.google.android.exoplayer.ExoPlaybackException; -import com.google.android.exoplayer.Format; -import com.google.android.exoplayer.FormatHolder; -import com.google.android.exoplayer.ParserException; -import com.google.android.exoplayer.TrackRenderer; -import com.google.android.exoplayer.TrackStream; -import com.google.android.exoplayer.extensions.Decoder; -import com.google.android.exoplayer.util.Assertions; -import com.google.android.exoplayer.util.MimeTypes; +import com.google.android.exoplayer2.C; +import com.google.android.exoplayer2.ExoPlaybackException; +import com.google.android.exoplayer2.Format; +import com.google.android.exoplayer2.FormatHolder; +import com.google.android.exoplayer2.ParserException; +import com.google.android.exoplayer2.TrackRenderer; +import com.google.android.exoplayer2.TrackStream; +import com.google.android.exoplayer2.extensions.Decoder; +import com.google.android.exoplayer2.util.Assertions; +import com.google.android.exoplayer2.util.MimeTypes; import android.annotation.TargetApi; import android.os.Handler; diff --git a/library/src/main/java/com/google/android/exoplayer/text/eia608/Eia608Parser.java b/library/src/main/java/com/google/android/exoplayer2/text/eia608/Eia608Parser.java similarity index 97% rename from library/src/main/java/com/google/android/exoplayer/text/eia608/Eia608Parser.java rename to library/src/main/java/com/google/android/exoplayer2/text/eia608/Eia608Parser.java index db1ea3373f..f822009387 100644 --- a/library/src/main/java/com/google/android/exoplayer/text/eia608/Eia608Parser.java +++ b/library/src/main/java/com/google/android/exoplayer2/text/eia608/Eia608Parser.java @@ -1,5 +1,5 @@ /* - * 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.text.eia608; +package com.google.android.exoplayer2.text.eia608; -import com.google.android.exoplayer.C; -import com.google.android.exoplayer.ParserException; -import com.google.android.exoplayer.text.SubtitleInputBuffer; -import com.google.android.exoplayer.text.SubtitleOutputBuffer; -import com.google.android.exoplayer.text.SubtitleParser; -import com.google.android.exoplayer.util.Assertions; -import com.google.android.exoplayer.util.ParsableBitArray; -import com.google.android.exoplayer.util.ParsableByteArray; +import com.google.android.exoplayer2.C; +import com.google.android.exoplayer2.ParserException; +import com.google.android.exoplayer2.text.SubtitleInputBuffer; +import com.google.android.exoplayer2.text.SubtitleOutputBuffer; +import com.google.android.exoplayer2.text.SubtitleParser; +import com.google.android.exoplayer2.util.Assertions; +import com.google.android.exoplayer2.util.ParsableBitArray; +import com.google.android.exoplayer2.util.ParsableByteArray; import android.text.TextUtils; diff --git a/library/src/main/java/com/google/android/exoplayer/text/eia608/Eia608Subtitle.java b/library/src/main/java/com/google/android/exoplayer2/text/eia608/Eia608Subtitle.java similarity index 86% rename from library/src/main/java/com/google/android/exoplayer/text/eia608/Eia608Subtitle.java rename to library/src/main/java/com/google/android/exoplayer2/text/eia608/Eia608Subtitle.java index 993e036a6f..04ffb21c57 100644 --- a/library/src/main/java/com/google/android/exoplayer/text/eia608/Eia608Subtitle.java +++ b/library/src/main/java/com/google/android/exoplayer2/text/eia608/Eia608Subtitle.java @@ -1,5 +1,5 @@ /* - * 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.text.eia608; +package com.google.android.exoplayer2.text.eia608; -import com.google.android.exoplayer.text.Cue; -import com.google.android.exoplayer.text.Subtitle; +import com.google.android.exoplayer2.text.Cue; +import com.google.android.exoplayer2.text.Subtitle; import java.util.Collections; import java.util.List; diff --git a/library/src/main/java/com/google/android/exoplayer/text/eia608/Eia608SubtitleOutputBuffer.java b/library/src/main/java/com/google/android/exoplayer2/text/eia608/Eia608SubtitleOutputBuffer.java similarity index 80% rename from library/src/main/java/com/google/android/exoplayer/text/eia608/Eia608SubtitleOutputBuffer.java rename to library/src/main/java/com/google/android/exoplayer2/text/eia608/Eia608SubtitleOutputBuffer.java index 8fb6470d5d..1f025a9268 100644 --- a/library/src/main/java/com/google/android/exoplayer/text/eia608/Eia608SubtitleOutputBuffer.java +++ b/library/src/main/java/com/google/android/exoplayer2/text/eia608/Eia608SubtitleOutputBuffer.java @@ -1,5 +1,5 @@ /* - * 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.text.eia608; +package com.google.android.exoplayer2.text.eia608; -import com.google.android.exoplayer.text.Subtitle; -import com.google.android.exoplayer.text.SubtitleOutputBuffer; +import com.google.android.exoplayer2.text.Subtitle; +import com.google.android.exoplayer2.text.SubtitleOutputBuffer; /** * A {@link Subtitle} output from an {@link Eia608Parser}. diff --git a/library/src/main/java/com/google/android/exoplayer/text/subrip/SubripParser.java b/library/src/main/java/com/google/android/exoplayer2/text/subrip/SubripParser.java similarity index 91% rename from library/src/main/java/com/google/android/exoplayer/text/subrip/SubripParser.java rename to library/src/main/java/com/google/android/exoplayer2/text/subrip/SubripParser.java index 9e752deb3d..df0c333ff3 100644 --- a/library/src/main/java/com/google/android/exoplayer/text/subrip/SubripParser.java +++ b/library/src/main/java/com/google/android/exoplayer2/text/subrip/SubripParser.java @@ -1,5 +1,5 @@ /* - * 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.text.subrip; +package com.google.android.exoplayer2.text.subrip; -import com.google.android.exoplayer.text.Cue; -import com.google.android.exoplayer.text.SimpleSubtitleParser; -import com.google.android.exoplayer.util.LongArray; -import com.google.android.exoplayer.util.ParsableByteArray; +import com.google.android.exoplayer2.text.Cue; +import com.google.android.exoplayer2.text.SimpleSubtitleParser; +import com.google.android.exoplayer2.util.LongArray; +import com.google.android.exoplayer2.util.ParsableByteArray; import android.text.Html; import android.text.Spanned; diff --git a/library/src/main/java/com/google/android/exoplayer/text/subrip/SubripSubtitle.java b/library/src/main/java/com/google/android/exoplayer2/text/subrip/SubripSubtitle.java similarity index 86% rename from library/src/main/java/com/google/android/exoplayer/text/subrip/SubripSubtitle.java rename to library/src/main/java/com/google/android/exoplayer2/text/subrip/SubripSubtitle.java index cfc61ad435..7f5047685e 100644 --- a/library/src/main/java/com/google/android/exoplayer/text/subrip/SubripSubtitle.java +++ b/library/src/main/java/com/google/android/exoplayer2/text/subrip/SubripSubtitle.java @@ -1,5 +1,5 @@ /* - * 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.text.subrip; +package com.google.android.exoplayer2.text.subrip; -import com.google.android.exoplayer.text.Cue; -import com.google.android.exoplayer.text.Subtitle; -import com.google.android.exoplayer.util.Assertions; -import com.google.android.exoplayer.util.Util; +import com.google.android.exoplayer2.text.Cue; +import com.google.android.exoplayer2.text.Subtitle; +import com.google.android.exoplayer2.util.Assertions; +import com.google.android.exoplayer2.util.Util; import java.util.Collections; import java.util.List; diff --git a/library/src/main/java/com/google/android/exoplayer/text/ttml/TtmlNode.java b/library/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlNode.java similarity index 98% rename from library/src/main/java/com/google/android/exoplayer/text/ttml/TtmlNode.java rename to library/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlNode.java index 691f69c1ae..428e73574d 100644 --- a/library/src/main/java/com/google/android/exoplayer/text/ttml/TtmlNode.java +++ b/library/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlNode.java @@ -1,5 +1,5 @@ /* - * 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.text.ttml; +package com.google.android.exoplayer2.text.ttml; -import com.google.android.exoplayer.text.Cue; -import com.google.android.exoplayer.util.Assertions; +import com.google.android.exoplayer2.text.Cue; +import com.google.android.exoplayer2.util.Assertions; import android.text.SpannableStringBuilder; diff --git a/library/src/main/java/com/google/android/exoplayer/text/ttml/TtmlParser.java b/library/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlParser.java similarity index 97% rename from library/src/main/java/com/google/android/exoplayer/text/ttml/TtmlParser.java rename to library/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlParser.java index dcd044c125..3ad7a9687f 100644 --- a/library/src/main/java/com/google/android/exoplayer/text/ttml/TtmlParser.java +++ b/library/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlParser.java @@ -1,5 +1,5 @@ /* - * 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.text.ttml; +package com.google.android.exoplayer2.text.ttml; -import com.google.android.exoplayer.C; -import com.google.android.exoplayer.ParserException; -import com.google.android.exoplayer.text.Cue; -import com.google.android.exoplayer.text.SimpleSubtitleParser; -import com.google.android.exoplayer.util.ColorParser; -import com.google.android.exoplayer.util.ParserUtil; -import com.google.android.exoplayer.util.Util; +import com.google.android.exoplayer2.C; +import com.google.android.exoplayer2.ParserException; +import com.google.android.exoplayer2.text.Cue; +import com.google.android.exoplayer2.text.SimpleSubtitleParser; +import com.google.android.exoplayer2.util.ColorParser; +import com.google.android.exoplayer2.util.ParserUtil; +import com.google.android.exoplayer2.util.Util; import android.text.Layout; import android.util.Log; diff --git a/library/src/main/java/com/google/android/exoplayer/text/ttml/TtmlRegion.java b/library/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlRegion.java similarity index 92% rename from library/src/main/java/com/google/android/exoplayer/text/ttml/TtmlRegion.java rename to library/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlRegion.java index a3ea9790a1..75fe1154a9 100644 --- a/library/src/main/java/com/google/android/exoplayer/text/ttml/TtmlRegion.java +++ b/library/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlRegion.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.android.exoplayer.text.ttml; +package com.google.android.exoplayer2.text.ttml; -import com.google.android.exoplayer.text.Cue; +import com.google.android.exoplayer2.text.Cue; /** * Represents a TTML Region. diff --git a/library/src/main/java/com/google/android/exoplayer/text/ttml/TtmlRenderUtil.java b/library/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlRenderUtil.java similarity index 98% rename from library/src/main/java/com/google/android/exoplayer/text/ttml/TtmlRenderUtil.java rename to library/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlRenderUtil.java index a8c69d8ac2..6efd52fa19 100644 --- a/library/src/main/java/com/google/android/exoplayer/text/ttml/TtmlRenderUtil.java +++ b/library/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlRenderUtil.java @@ -1,5 +1,5 @@ /* - * 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.text.ttml; +package com.google.android.exoplayer2.text.ttml; import android.text.Spannable; import android.text.SpannableStringBuilder; diff --git a/library/src/main/java/com/google/android/exoplayer/text/ttml/TtmlStyle.java b/library/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlStyle.java similarity index 97% rename from library/src/main/java/com/google/android/exoplayer/text/ttml/TtmlStyle.java rename to library/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlStyle.java index c8a40f4405..b0ede005aa 100644 --- a/library/src/main/java/com/google/android/exoplayer/text/ttml/TtmlStyle.java +++ b/library/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlStyle.java @@ -1,5 +1,5 @@ /* - * 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.text.ttml; +package com.google.android.exoplayer2.text.ttml; -import com.google.android.exoplayer.util.Assertions; +import com.google.android.exoplayer2.util.Assertions; import android.graphics.Typeface; import android.text.Layout; diff --git a/library/src/main/java/com/google/android/exoplayer/text/ttml/TtmlSubtitle.java b/library/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlSubtitle.java similarity index 88% rename from library/src/main/java/com/google/android/exoplayer/text/ttml/TtmlSubtitle.java rename to library/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlSubtitle.java index a5951966d2..8b2956cc38 100644 --- a/library/src/main/java/com/google/android/exoplayer/text/ttml/TtmlSubtitle.java +++ b/library/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlSubtitle.java @@ -1,5 +1,5 @@ /* - * 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.text.ttml; +package com.google.android.exoplayer2.text.ttml; -import com.google.android.exoplayer.text.Cue; -import com.google.android.exoplayer.text.Subtitle; -import com.google.android.exoplayer.util.Util; +import com.google.android.exoplayer2.text.Cue; +import com.google.android.exoplayer2.text.Subtitle; +import com.google.android.exoplayer2.util.Util; import java.util.Collections; import java.util.List; diff --git a/library/src/main/java/com/google/android/exoplayer/text/tx3g/Tx3gParser.java b/library/src/main/java/com/google/android/exoplayer2/text/tx3g/Tx3gParser.java similarity index 78% rename from library/src/main/java/com/google/android/exoplayer/text/tx3g/Tx3gParser.java rename to library/src/main/java/com/google/android/exoplayer2/text/tx3g/Tx3gParser.java index f6a1436940..211cbd3368 100644 --- a/library/src/main/java/com/google/android/exoplayer/text/tx3g/Tx3gParser.java +++ b/library/src/main/java/com/google/android/exoplayer2/text/tx3g/Tx3gParser.java @@ -1,5 +1,5 @@ /* - * 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.text.tx3g; +package com.google.android.exoplayer2.text.tx3g; -import com.google.android.exoplayer.text.Cue; -import com.google.android.exoplayer.text.SimpleSubtitleParser; -import com.google.android.exoplayer.text.Subtitle; +import com.google.android.exoplayer2.text.Cue; +import com.google.android.exoplayer2.text.SimpleSubtitleParser; +import com.google.android.exoplayer2.text.Subtitle; /** * A subtitle parser for tx3g. diff --git a/library/src/main/java/com/google/android/exoplayer/text/tx3g/Tx3gSubtitle.java b/library/src/main/java/com/google/android/exoplayer2/text/tx3g/Tx3gSubtitle.java similarity index 83% rename from library/src/main/java/com/google/android/exoplayer/text/tx3g/Tx3gSubtitle.java rename to library/src/main/java/com/google/android/exoplayer2/text/tx3g/Tx3gSubtitle.java index 3401edba1b..d3662de110 100644 --- a/library/src/main/java/com/google/android/exoplayer/text/tx3g/Tx3gSubtitle.java +++ b/library/src/main/java/com/google/android/exoplayer2/text/tx3g/Tx3gSubtitle.java @@ -1,5 +1,5 @@ /* - * 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.text.tx3g; +package com.google.android.exoplayer2.text.tx3g; -import com.google.android.exoplayer.text.Cue; -import com.google.android.exoplayer.text.Subtitle; -import com.google.android.exoplayer.util.Assertions; +import com.google.android.exoplayer2.text.Cue; +import com.google.android.exoplayer2.text.Subtitle; +import com.google.android.exoplayer2.util.Assertions; import java.util.Collections; import java.util.List; diff --git a/library/src/main/java/com/google/android/exoplayer/text/webvtt/CssParser.java b/library/src/main/java/com/google/android/exoplayer2/text/webvtt/CssParser.java similarity index 98% rename from library/src/main/java/com/google/android/exoplayer/text/webvtt/CssParser.java rename to library/src/main/java/com/google/android/exoplayer2/text/webvtt/CssParser.java index 3792d039f9..95070e015e 100644 --- a/library/src/main/java/com/google/android/exoplayer/text/webvtt/CssParser.java +++ b/library/src/main/java/com/google/android/exoplayer2/text/webvtt/CssParser.java @@ -1,5 +1,5 @@ /* - * 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.text.webvtt; +package com.google.android.exoplayer2.text.webvtt; -import com.google.android.exoplayer.util.ColorParser; -import com.google.android.exoplayer.util.ParsableByteArray; +import com.google.android.exoplayer2.util.ColorParser; +import com.google.android.exoplayer2.util.ParsableByteArray; import android.text.TextUtils; diff --git a/library/src/main/java/com/google/android/exoplayer/text/webvtt/Mp4WebvttParser.java b/library/src/main/java/com/google/android/exoplayer2/text/webvtt/Mp4WebvttParser.java similarity index 89% rename from library/src/main/java/com/google/android/exoplayer/text/webvtt/Mp4WebvttParser.java rename to library/src/main/java/com/google/android/exoplayer2/text/webvtt/Mp4WebvttParser.java index 1690507961..7655a8d973 100644 --- a/library/src/main/java/com/google/android/exoplayer/text/webvtt/Mp4WebvttParser.java +++ b/library/src/main/java/com/google/android/exoplayer2/text/webvtt/Mp4WebvttParser.java @@ -1,5 +1,5 @@ /* - * 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.text.webvtt; +package com.google.android.exoplayer2.text.webvtt; -import com.google.android.exoplayer.ParserException; -import com.google.android.exoplayer.text.Cue; -import com.google.android.exoplayer.text.SimpleSubtitleParser; -import com.google.android.exoplayer.util.ParsableByteArray; -import com.google.android.exoplayer.util.Util; +import com.google.android.exoplayer2.ParserException; +import com.google.android.exoplayer2.text.Cue; +import com.google.android.exoplayer2.text.SimpleSubtitleParser; +import com.google.android.exoplayer2.util.ParsableByteArray; +import com.google.android.exoplayer2.util.Util; import java.util.ArrayList; import java.util.Collections; diff --git a/library/src/main/java/com/google/android/exoplayer/text/webvtt/Mp4WebvttSubtitle.java b/library/src/main/java/com/google/android/exoplayer2/text/webvtt/Mp4WebvttSubtitle.java similarity index 83% rename from library/src/main/java/com/google/android/exoplayer/text/webvtt/Mp4WebvttSubtitle.java rename to library/src/main/java/com/google/android/exoplayer2/text/webvtt/Mp4WebvttSubtitle.java index 09bddabfe7..47e771ae4c 100644 --- a/library/src/main/java/com/google/android/exoplayer/text/webvtt/Mp4WebvttSubtitle.java +++ b/library/src/main/java/com/google/android/exoplayer2/text/webvtt/Mp4WebvttSubtitle.java @@ -1,5 +1,5 @@ /* - * 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.text.webvtt; +package com.google.android.exoplayer2.text.webvtt; -import com.google.android.exoplayer.text.Cue; -import com.google.android.exoplayer.text.Subtitle; -import com.google.android.exoplayer.util.Assertions; +import com.google.android.exoplayer2.text.Cue; +import com.google.android.exoplayer2.text.Subtitle; +import com.google.android.exoplayer2.util.Assertions; import java.util.Collections; import java.util.List; diff --git a/library/src/main/java/com/google/android/exoplayer/text/webvtt/WebvttCssStyle.java b/library/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttCssStyle.java similarity index 98% rename from library/src/main/java/com/google/android/exoplayer/text/webvtt/WebvttCssStyle.java rename to library/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttCssStyle.java index 9e9ddb5f28..94c1d1a985 100644 --- a/library/src/main/java/com/google/android/exoplayer/text/webvtt/WebvttCssStyle.java +++ b/library/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttCssStyle.java @@ -1,5 +1,5 @@ /* - * 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.text.webvtt; +package com.google.android.exoplayer2.text.webvtt; -import com.google.android.exoplayer.util.Util; +import com.google.android.exoplayer2.util.Util; import android.graphics.Typeface; import android.text.Layout; diff --git a/library/src/main/java/com/google/android/exoplayer/text/webvtt/WebvttCue.java b/library/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttCue.java similarity index 96% rename from library/src/main/java/com/google/android/exoplayer/text/webvtt/WebvttCue.java rename to library/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttCue.java index 7ca8c0002d..ad5b955f4b 100644 --- a/library/src/main/java/com/google/android/exoplayer/text/webvtt/WebvttCue.java +++ b/library/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttCue.java @@ -1,5 +1,5 @@ /* - * 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.text.webvtt; +package com.google.android.exoplayer2.text.webvtt; -import com.google.android.exoplayer.text.Cue; +import com.google.android.exoplayer2.text.Cue; import android.text.Layout.Alignment; import android.text.SpannableStringBuilder; diff --git a/library/src/main/java/com/google/android/exoplayer/text/webvtt/WebvttCueParser.java b/library/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttCueParser.java similarity index 98% rename from library/src/main/java/com/google/android/exoplayer/text/webvtt/WebvttCueParser.java rename to library/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttCueParser.java index 448bfb48be..078a36c71e 100644 --- a/library/src/main/java/com/google/android/exoplayer/text/webvtt/WebvttCueParser.java +++ b/library/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttCueParser.java @@ -1,5 +1,5 @@ /* - * 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.text.webvtt; +package com.google.android.exoplayer2.text.webvtt; -import com.google.android.exoplayer.text.Cue; -import com.google.android.exoplayer.util.ParsableByteArray; +import com.google.android.exoplayer2.text.Cue; +import com.google.android.exoplayer2.util.ParsableByteArray; import android.graphics.Typeface; import android.text.Layout.Alignment; diff --git a/library/src/main/java/com/google/android/exoplayer/text/webvtt/WebvttParser.java b/library/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttParser.java similarity index 93% rename from library/src/main/java/com/google/android/exoplayer/text/webvtt/WebvttParser.java rename to library/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttParser.java index dd0e7337d2..481320f8b6 100644 --- a/library/src/main/java/com/google/android/exoplayer/text/webvtt/WebvttParser.java +++ b/library/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttParser.java @@ -1,5 +1,5 @@ /* - * 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.text.webvtt; +package com.google.android.exoplayer2.text.webvtt; -import com.google.android.exoplayer.ParserException; -import com.google.android.exoplayer.text.SimpleSubtitleParser; -import com.google.android.exoplayer.util.ParsableByteArray; +import com.google.android.exoplayer2.ParserException; +import com.google.android.exoplayer2.text.SimpleSubtitleParser; +import com.google.android.exoplayer2.util.ParsableByteArray; import android.text.TextUtils; diff --git a/library/src/main/java/com/google/android/exoplayer/text/webvtt/WebvttParserUtil.java b/library/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttParserUtil.java similarity index 94% rename from library/src/main/java/com/google/android/exoplayer/text/webvtt/WebvttParserUtil.java rename to library/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttParserUtil.java index dec1a1823c..9990177404 100644 --- a/library/src/main/java/com/google/android/exoplayer/text/webvtt/WebvttParserUtil.java +++ b/library/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttParserUtil.java @@ -1,5 +1,5 @@ /* - * 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.text.webvtt; +package com.google.android.exoplayer2.text.webvtt; -import com.google.android.exoplayer.ParserException; -import com.google.android.exoplayer.util.ParsableByteArray; +import com.google.android.exoplayer2.ParserException; +import com.google.android.exoplayer2.util.ParsableByteArray; import java.util.regex.Matcher; import java.util.regex.Pattern; diff --git a/library/src/main/java/com/google/android/exoplayer/text/webvtt/WebvttSubtitle.java b/library/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttSubtitle.java similarity index 92% rename from library/src/main/java/com/google/android/exoplayer/text/webvtt/WebvttSubtitle.java rename to library/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttSubtitle.java index 9099295b31..b0c7fc38cb 100644 --- a/library/src/main/java/com/google/android/exoplayer/text/webvtt/WebvttSubtitle.java +++ b/library/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttSubtitle.java @@ -1,5 +1,5 @@ /* - * 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.text.webvtt; +package com.google.android.exoplayer2.text.webvtt; -import com.google.android.exoplayer.text.Cue; -import com.google.android.exoplayer.text.Subtitle; -import com.google.android.exoplayer.util.Assertions; -import com.google.android.exoplayer.util.Util; +import com.google.android.exoplayer2.text.Cue; +import com.google.android.exoplayer2.text.Subtitle; +import com.google.android.exoplayer2.util.Assertions; +import com.google.android.exoplayer2.util.Util; import android.text.SpannableStringBuilder; diff --git a/library/src/main/java/com/google/android/exoplayer/upstream/Allocation.java b/library/src/main/java/com/google/android/exoplayer2/upstream/Allocation.java similarity index 94% rename from library/src/main/java/com/google/android/exoplayer/upstream/Allocation.java rename to library/src/main/java/com/google/android/exoplayer2/upstream/Allocation.java index 22de92dc13..7968d35b78 100644 --- a/library/src/main/java/com/google/android/exoplayer/upstream/Allocation.java +++ b/library/src/main/java/com/google/android/exoplayer2/upstream/Allocation.java @@ -1,5 +1,5 @@ /* - * 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.upstream; +package com.google.android.exoplayer2.upstream; /** * An allocation within a byte array. diff --git a/library/src/main/java/com/google/android/exoplayer/upstream/Allocator.java b/library/src/main/java/com/google/android/exoplayer2/upstream/Allocator.java similarity index 94% rename from library/src/main/java/com/google/android/exoplayer/upstream/Allocator.java rename to library/src/main/java/com/google/android/exoplayer2/upstream/Allocator.java index 9b62fa6fc1..f46e8d17b0 100644 --- a/library/src/main/java/com/google/android/exoplayer/upstream/Allocator.java +++ b/library/src/main/java/com/google/android/exoplayer2/upstream/Allocator.java @@ -1,5 +1,5 @@ /* - * 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.upstream; +package com.google.android.exoplayer2.upstream; /** * A source of allocations. diff --git a/library/src/main/java/com/google/android/exoplayer/upstream/AssetDataSource.java b/library/src/main/java/com/google/android/exoplayer2/upstream/AssetDataSource.java similarity index 96% rename from library/src/main/java/com/google/android/exoplayer/upstream/AssetDataSource.java rename to library/src/main/java/com/google/android/exoplayer2/upstream/AssetDataSource.java index 2b7a1f2782..e94d323bab 100644 --- a/library/src/main/java/com/google/android/exoplayer/upstream/AssetDataSource.java +++ b/library/src/main/java/com/google/android/exoplayer2/upstream/AssetDataSource.java @@ -1,5 +1,5 @@ /* - * 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.upstream; +package com.google.android.exoplayer2.upstream; -import com.google.android.exoplayer.C; +import com.google.android.exoplayer2.C; import android.content.Context; import android.content.res.AssetManager; diff --git a/library/src/main/java/com/google/android/exoplayer/upstream/BandwidthMeter.java b/library/src/main/java/com/google/android/exoplayer2/upstream/BandwidthMeter.java similarity index 94% rename from library/src/main/java/com/google/android/exoplayer/upstream/BandwidthMeter.java rename to library/src/main/java/com/google/android/exoplayer2/upstream/BandwidthMeter.java index bc99bf27ff..e2b0db627a 100644 --- a/library/src/main/java/com/google/android/exoplayer/upstream/BandwidthMeter.java +++ b/library/src/main/java/com/google/android/exoplayer2/upstream/BandwidthMeter.java @@ -1,5 +1,5 @@ /* - * 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.upstream; +package com.google.android.exoplayer2.upstream; /** * Provides estimates of the currently available bandwidth. diff --git a/library/src/main/java/com/google/android/exoplayer/upstream/ByteArrayDataSink.java b/library/src/main/java/com/google/android/exoplayer2/upstream/ByteArrayDataSink.java similarity index 89% rename from library/src/main/java/com/google/android/exoplayer/upstream/ByteArrayDataSink.java rename to library/src/main/java/com/google/android/exoplayer2/upstream/ByteArrayDataSink.java index aaa8a1c186..ecb333f01f 100644 --- a/library/src/main/java/com/google/android/exoplayer/upstream/ByteArrayDataSink.java +++ b/library/src/main/java/com/google/android/exoplayer2/upstream/ByteArrayDataSink.java @@ -1,5 +1,5 @@ /* - * 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.upstream; +package com.google.android.exoplayer2.upstream; -import com.google.android.exoplayer.C; -import com.google.android.exoplayer.util.Assertions; +import com.google.android.exoplayer2.C; +import com.google.android.exoplayer2.util.Assertions; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/library/src/main/java/com/google/android/exoplayer/upstream/ByteArrayDataSource.java b/library/src/main/java/com/google/android/exoplayer2/upstream/ByteArrayDataSource.java similarity index 91% rename from library/src/main/java/com/google/android/exoplayer/upstream/ByteArrayDataSource.java rename to library/src/main/java/com/google/android/exoplayer2/upstream/ByteArrayDataSource.java index 8e5f005bb6..e3ed55663a 100644 --- a/library/src/main/java/com/google/android/exoplayer/upstream/ByteArrayDataSource.java +++ b/library/src/main/java/com/google/android/exoplayer2/upstream/ByteArrayDataSource.java @@ -1,5 +1,5 @@ /* - * 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.upstream; +package com.google.android.exoplayer2.upstream; -import com.google.android.exoplayer.C; -import com.google.android.exoplayer.util.Assertions; +import com.google.android.exoplayer2.C; +import com.google.android.exoplayer2.util.Assertions; import android.net.Uri; diff --git a/library/src/main/java/com/google/android/exoplayer/upstream/ContentDataSource.java b/library/src/main/java/com/google/android/exoplayer2/upstream/ContentDataSource.java similarity index 96% rename from library/src/main/java/com/google/android/exoplayer/upstream/ContentDataSource.java rename to library/src/main/java/com/google/android/exoplayer2/upstream/ContentDataSource.java index 658fd1f96a..a21f63158f 100644 --- a/library/src/main/java/com/google/android/exoplayer/upstream/ContentDataSource.java +++ b/library/src/main/java/com/google/android/exoplayer2/upstream/ContentDataSource.java @@ -1,5 +1,5 @@ /* - * 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.upstream; +package com.google.android.exoplayer2.upstream; -import com.google.android.exoplayer.C; +import com.google.android.exoplayer2.C; import android.content.ContentResolver; import android.content.Context; diff --git a/library/src/main/java/com/google/android/exoplayer/upstream/DataSink.java b/library/src/main/java/com/google/android/exoplayer2/upstream/DataSink.java similarity index 93% rename from library/src/main/java/com/google/android/exoplayer/upstream/DataSink.java rename to library/src/main/java/com/google/android/exoplayer2/upstream/DataSink.java index 900d064ebe..77e7454b4d 100644 --- a/library/src/main/java/com/google/android/exoplayer/upstream/DataSink.java +++ b/library/src/main/java/com/google/android/exoplayer2/upstream/DataSink.java @@ -1,5 +1,5 @@ /* - * 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.upstream; +package com.google.android.exoplayer2.upstream; import java.io.IOException; diff --git a/library/src/main/java/com/google/android/exoplayer/upstream/DataSource.java b/library/src/main/java/com/google/android/exoplayer2/upstream/DataSource.java similarity index 95% rename from library/src/main/java/com/google/android/exoplayer/upstream/DataSource.java rename to library/src/main/java/com/google/android/exoplayer2/upstream/DataSource.java index 2878517a8e..47ebd75e5d 100644 --- a/library/src/main/java/com/google/android/exoplayer/upstream/DataSource.java +++ b/library/src/main/java/com/google/android/exoplayer2/upstream/DataSource.java @@ -1,5 +1,5 @@ /* - * 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.upstream; +package com.google.android.exoplayer2.upstream; -import com.google.android.exoplayer.C; +import com.google.android.exoplayer2.C; import android.net.Uri; diff --git a/library/src/main/java/com/google/android/exoplayer/upstream/DataSourceFactory.java b/library/src/main/java/com/google/android/exoplayer2/upstream/DataSourceFactory.java similarity index 90% rename from library/src/main/java/com/google/android/exoplayer/upstream/DataSourceFactory.java rename to library/src/main/java/com/google/android/exoplayer2/upstream/DataSourceFactory.java index 298c972aca..e79c1e9cca 100644 --- a/library/src/main/java/com/google/android/exoplayer/upstream/DataSourceFactory.java +++ b/library/src/main/java/com/google/android/exoplayer2/upstream/DataSourceFactory.java @@ -1,5 +1,5 @@ /* - * 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.upstream; +package com.google.android.exoplayer2.upstream; /** * A factory for {@link DataSource} instances. diff --git a/library/src/main/java/com/google/android/exoplayer/upstream/DataSourceInputStream.java b/library/src/main/java/com/google/android/exoplayer2/upstream/DataSourceInputStream.java similarity index 94% rename from library/src/main/java/com/google/android/exoplayer/upstream/DataSourceInputStream.java rename to library/src/main/java/com/google/android/exoplayer2/upstream/DataSourceInputStream.java index 5a2cd66dc5..72595aa20f 100644 --- a/library/src/main/java/com/google/android/exoplayer/upstream/DataSourceInputStream.java +++ b/library/src/main/java/com/google/android/exoplayer2/upstream/DataSourceInputStream.java @@ -1,5 +1,5 @@ /* - * 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.upstream; +package com.google.android.exoplayer2.upstream; -import com.google.android.exoplayer.C; -import com.google.android.exoplayer.util.Assertions; +import com.google.android.exoplayer2.C; +import com.google.android.exoplayer2.util.Assertions; import java.io.IOException; import java.io.InputStream; diff --git a/library/src/main/java/com/google/android/exoplayer/upstream/DataSpec.java b/library/src/main/java/com/google/android/exoplayer2/upstream/DataSpec.java similarity index 96% rename from library/src/main/java/com/google/android/exoplayer/upstream/DataSpec.java rename to library/src/main/java/com/google/android/exoplayer2/upstream/DataSpec.java index 618605c2c8..3d19e34957 100644 --- a/library/src/main/java/com/google/android/exoplayer/upstream/DataSpec.java +++ b/library/src/main/java/com/google/android/exoplayer2/upstream/DataSpec.java @@ -1,5 +1,5 @@ /* - * 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.upstream; +package com.google.android.exoplayer2.upstream; -import com.google.android.exoplayer.C; -import com.google.android.exoplayer.util.Assertions; +import com.google.android.exoplayer2.C; +import com.google.android.exoplayer2.util.Assertions; import android.net.Uri; diff --git a/library/src/main/java/com/google/android/exoplayer/upstream/DefaultAllocator.java b/library/src/main/java/com/google/android/exoplayer2/upstream/DefaultAllocator.java similarity index 96% rename from library/src/main/java/com/google/android/exoplayer/upstream/DefaultAllocator.java rename to library/src/main/java/com/google/android/exoplayer2/upstream/DefaultAllocator.java index 632ceb9a4a..c0ca193e18 100644 --- a/library/src/main/java/com/google/android/exoplayer/upstream/DefaultAllocator.java +++ b/library/src/main/java/com/google/android/exoplayer2/upstream/DefaultAllocator.java @@ -1,5 +1,5 @@ /* - * 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.upstream; +package com.google.android.exoplayer2.upstream; -import com.google.android.exoplayer.util.Assertions; -import com.google.android.exoplayer.util.Util; +import com.google.android.exoplayer2.util.Assertions; +import com.google.android.exoplayer2.util.Util; import java.util.Arrays; diff --git a/library/src/main/java/com/google/android/exoplayer/upstream/DefaultBandwidthMeter.java b/library/src/main/java/com/google/android/exoplayer2/upstream/DefaultBandwidthMeter.java similarity index 94% rename from library/src/main/java/com/google/android/exoplayer/upstream/DefaultBandwidthMeter.java rename to library/src/main/java/com/google/android/exoplayer2/upstream/DefaultBandwidthMeter.java index 7b932780cf..283293ae5d 100644 --- a/library/src/main/java/com/google/android/exoplayer/upstream/DefaultBandwidthMeter.java +++ b/library/src/main/java/com/google/android/exoplayer2/upstream/DefaultBandwidthMeter.java @@ -1,5 +1,5 @@ /* - * 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.upstream; +package com.google.android.exoplayer2.upstream; -import com.google.android.exoplayer.util.Assertions; -import com.google.android.exoplayer.util.SlidingPercentile; +import com.google.android.exoplayer2.util.Assertions; +import com.google.android.exoplayer2.util.SlidingPercentile; import android.os.Handler; import android.os.SystemClock; diff --git a/library/src/main/java/com/google/android/exoplayer/upstream/DefaultDataSource.java b/library/src/main/java/com/google/android/exoplayer2/upstream/DefaultDataSource.java similarity index 95% rename from library/src/main/java/com/google/android/exoplayer/upstream/DefaultDataSource.java rename to library/src/main/java/com/google/android/exoplayer2/upstream/DefaultDataSource.java index 61128f6e33..a719a31325 100644 --- a/library/src/main/java/com/google/android/exoplayer/upstream/DefaultDataSource.java +++ b/library/src/main/java/com/google/android/exoplayer2/upstream/DefaultDataSource.java @@ -1,5 +1,5 @@ /* - * 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.upstream; +package com.google.android.exoplayer2.upstream; -import com.google.android.exoplayer.util.Assertions; -import com.google.android.exoplayer.util.Util; +import com.google.android.exoplayer2.util.Assertions; +import com.google.android.exoplayer2.util.Util; import android.content.Context; import android.net.Uri; diff --git a/library/src/main/java/com/google/android/exoplayer/upstream/DefaultDataSourceFactory.java b/library/src/main/java/com/google/android/exoplayer2/upstream/DefaultDataSourceFactory.java similarity index 94% rename from library/src/main/java/com/google/android/exoplayer/upstream/DefaultDataSourceFactory.java rename to library/src/main/java/com/google/android/exoplayer2/upstream/DefaultDataSourceFactory.java index 0989b5c05b..98e5411002 100644 --- a/library/src/main/java/com/google/android/exoplayer/upstream/DefaultDataSourceFactory.java +++ b/library/src/main/java/com/google/android/exoplayer2/upstream/DefaultDataSourceFactory.java @@ -1,5 +1,5 @@ /* - * 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.upstream; +package com.google.android.exoplayer2.upstream; import android.content.Context; diff --git a/library/src/main/java/com/google/android/exoplayer/upstream/DefaultHttpDataSource.java b/library/src/main/java/com/google/android/exoplayer2/upstream/DefaultHttpDataSource.java similarity index 98% rename from library/src/main/java/com/google/android/exoplayer/upstream/DefaultHttpDataSource.java rename to library/src/main/java/com/google/android/exoplayer2/upstream/DefaultHttpDataSource.java index 24d6d6e29b..ca85ba4c30 100644 --- a/library/src/main/java/com/google/android/exoplayer/upstream/DefaultHttpDataSource.java +++ b/library/src/main/java/com/google/android/exoplayer2/upstream/DefaultHttpDataSource.java @@ -1,5 +1,5 @@ /* - * 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.upstream; +package com.google.android.exoplayer2.upstream; -import com.google.android.exoplayer.C; -import com.google.android.exoplayer.util.Assertions; -import com.google.android.exoplayer.util.Predicate; -import com.google.android.exoplayer.util.Util; +import com.google.android.exoplayer2.C; +import com.google.android.exoplayer2.util.Assertions; +import com.google.android.exoplayer2.util.Predicate; +import com.google.android.exoplayer2.util.Util; import android.net.Uri; import android.text.TextUtils; diff --git a/library/src/main/java/com/google/android/exoplayer/upstream/FileDataSource.java b/library/src/main/java/com/google/android/exoplayer2/upstream/FileDataSource.java similarity index 95% rename from library/src/main/java/com/google/android/exoplayer/upstream/FileDataSource.java rename to library/src/main/java/com/google/android/exoplayer2/upstream/FileDataSource.java index 0225e5f1a8..06e8050534 100644 --- a/library/src/main/java/com/google/android/exoplayer/upstream/FileDataSource.java +++ b/library/src/main/java/com/google/android/exoplayer2/upstream/FileDataSource.java @@ -1,5 +1,5 @@ /* - * 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.upstream; +package com.google.android.exoplayer2.upstream; -import com.google.android.exoplayer.C; +import com.google.android.exoplayer2.C; import android.net.Uri; diff --git a/library/src/main/java/com/google/android/exoplayer/upstream/HttpDataSource.java b/library/src/main/java/com/google/android/exoplayer2/upstream/HttpDataSource.java similarity index 95% rename from library/src/main/java/com/google/android/exoplayer/upstream/HttpDataSource.java rename to library/src/main/java/com/google/android/exoplayer2/upstream/HttpDataSource.java index 0ebaeaba39..99f4ad88a8 100644 --- a/library/src/main/java/com/google/android/exoplayer/upstream/HttpDataSource.java +++ b/library/src/main/java/com/google/android/exoplayer2/upstream/HttpDataSource.java @@ -1,5 +1,5 @@ /* - * 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.upstream; +package com.google.android.exoplayer2.upstream; -import com.google.android.exoplayer.util.Predicate; -import com.google.android.exoplayer.util.Util; +import com.google.android.exoplayer2.util.Predicate; +import com.google.android.exoplayer2.util.Util; import android.text.TextUtils; diff --git a/library/src/main/java/com/google/android/exoplayer/upstream/Loader.java b/library/src/main/java/com/google/android/exoplayer2/upstream/Loader.java similarity index 98% rename from library/src/main/java/com/google/android/exoplayer/upstream/Loader.java rename to library/src/main/java/com/google/android/exoplayer2/upstream/Loader.java index ffef017e49..87c107a004 100644 --- a/library/src/main/java/com/google/android/exoplayer/upstream/Loader.java +++ b/library/src/main/java/com/google/android/exoplayer2/upstream/Loader.java @@ -1,5 +1,5 @@ /* - * 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.upstream; +package com.google.android.exoplayer2.upstream; -import com.google.android.exoplayer.util.Assertions; -import com.google.android.exoplayer.util.TraceUtil; -import com.google.android.exoplayer.util.Util; +import com.google.android.exoplayer2.util.Assertions; +import com.google.android.exoplayer2.util.TraceUtil; +import com.google.android.exoplayer2.util.Util; import android.annotation.SuppressLint; import android.os.Handler; diff --git a/library/src/main/java/com/google/android/exoplayer/upstream/ParsingLoadable.java b/library/src/main/java/com/google/android/exoplayer2/upstream/ParsingLoadable.java similarity index 93% rename from library/src/main/java/com/google/android/exoplayer/upstream/ParsingLoadable.java rename to library/src/main/java/com/google/android/exoplayer2/upstream/ParsingLoadable.java index ccd9233868..89cfafffe6 100644 --- a/library/src/main/java/com/google/android/exoplayer/upstream/ParsingLoadable.java +++ b/library/src/main/java/com/google/android/exoplayer2/upstream/ParsingLoadable.java @@ -1,5 +1,5 @@ /* - * 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.upstream; +package com.google.android.exoplayer2.upstream; -import com.google.android.exoplayer.C; -import com.google.android.exoplayer.ParserException; -import com.google.android.exoplayer.upstream.Loader.Loadable; +import com.google.android.exoplayer2.C; +import com.google.android.exoplayer2.ParserException; +import com.google.android.exoplayer2.upstream.Loader.Loadable; import android.net.Uri; diff --git a/library/src/main/java/com/google/android/exoplayer/upstream/PriorityDataSource.java b/library/src/main/java/com/google/android/exoplayer2/upstream/PriorityDataSource.java similarity index 91% rename from library/src/main/java/com/google/android/exoplayer/upstream/PriorityDataSource.java rename to library/src/main/java/com/google/android/exoplayer2/upstream/PriorityDataSource.java index 10f0f588a3..814341ab8e 100644 --- a/library/src/main/java/com/google/android/exoplayer/upstream/PriorityDataSource.java +++ b/library/src/main/java/com/google/android/exoplayer2/upstream/PriorityDataSource.java @@ -1,5 +1,5 @@ /* - * 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.upstream; +package com.google.android.exoplayer2.upstream; -import com.google.android.exoplayer.util.Assertions; -import com.google.android.exoplayer.util.PriorityTaskManager; +import com.google.android.exoplayer2.util.Assertions; +import com.google.android.exoplayer2.util.PriorityTaskManager; import android.net.Uri; diff --git a/library/src/main/java/com/google/android/exoplayer/upstream/TeeDataSource.java b/library/src/main/java/com/google/android/exoplayer2/upstream/TeeDataSource.java similarity index 91% rename from library/src/main/java/com/google/android/exoplayer/upstream/TeeDataSource.java rename to library/src/main/java/com/google/android/exoplayer2/upstream/TeeDataSource.java index 0ce0647cd5..d04201600c 100644 --- a/library/src/main/java/com/google/android/exoplayer/upstream/TeeDataSource.java +++ b/library/src/main/java/com/google/android/exoplayer2/upstream/TeeDataSource.java @@ -1,5 +1,5 @@ /* - * 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.upstream; +package com.google.android.exoplayer2.upstream; -import com.google.android.exoplayer.C; -import com.google.android.exoplayer.util.Assertions; +import com.google.android.exoplayer2.C; +import com.google.android.exoplayer2.util.Assertions; import android.net.Uri; diff --git a/library/src/main/java/com/google/android/exoplayer/upstream/TransferListener.java b/library/src/main/java/com/google/android/exoplayer2/upstream/TransferListener.java similarity index 91% rename from library/src/main/java/com/google/android/exoplayer/upstream/TransferListener.java rename to library/src/main/java/com/google/android/exoplayer2/upstream/TransferListener.java index f2b6d1f8d4..436b199a5a 100644 --- a/library/src/main/java/com/google/android/exoplayer/upstream/TransferListener.java +++ b/library/src/main/java/com/google/android/exoplayer2/upstream/TransferListener.java @@ -1,5 +1,5 @@ /* - * 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.upstream; +package com.google.android.exoplayer2.upstream; /** * Interface definition for a callback to be notified of data transfer events. diff --git a/library/src/main/java/com/google/android/exoplayer/upstream/UdpDataSource.java b/library/src/main/java/com/google/android/exoplayer2/upstream/UdpDataSource.java similarity index 97% rename from library/src/main/java/com/google/android/exoplayer/upstream/UdpDataSource.java rename to library/src/main/java/com/google/android/exoplayer2/upstream/UdpDataSource.java index ecf34d0bfa..b12182aede 100644 --- a/library/src/main/java/com/google/android/exoplayer/upstream/UdpDataSource.java +++ b/library/src/main/java/com/google/android/exoplayer2/upstream/UdpDataSource.java @@ -1,5 +1,5 @@ /* - * 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.upstream; +package com.google.android.exoplayer2.upstream; -import com.google.android.exoplayer.C; +import com.google.android.exoplayer2.C; import android.net.Uri; diff --git a/library/src/main/java/com/google/android/exoplayer/upstream/cache/Cache.java b/library/src/main/java/com/google/android/exoplayer2/upstream/cache/Cache.java similarity index 98% rename from library/src/main/java/com/google/android/exoplayer/upstream/cache/Cache.java rename to library/src/main/java/com/google/android/exoplayer2/upstream/cache/Cache.java index 232edb38c9..f32fac7eb8 100644 --- a/library/src/main/java/com/google/android/exoplayer/upstream/cache/Cache.java +++ b/library/src/main/java/com/google/android/exoplayer2/upstream/cache/Cache.java @@ -1,5 +1,5 @@ /* - * 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.upstream.cache; +package com.google.android.exoplayer2.upstream.cache; import java.io.File; import java.util.NavigableSet; diff --git a/library/src/main/java/com/google/android/exoplayer/upstream/cache/CacheDataSink.java b/library/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSink.java similarity index 91% rename from library/src/main/java/com/google/android/exoplayer/upstream/cache/CacheDataSink.java rename to library/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSink.java index 5ed4efcf2e..8066d304b4 100644 --- a/library/src/main/java/com/google/android/exoplayer/upstream/cache/CacheDataSink.java +++ b/library/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSink.java @@ -1,5 +1,5 @@ /* - * 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.upstream.cache; +package com.google.android.exoplayer2.upstream.cache; -import com.google.android.exoplayer.C; -import com.google.android.exoplayer.upstream.DataSink; -import com.google.android.exoplayer.upstream.DataSpec; -import com.google.android.exoplayer.util.Assertions; -import com.google.android.exoplayer.util.Util; +import com.google.android.exoplayer2.C; +import com.google.android.exoplayer2.upstream.DataSink; +import com.google.android.exoplayer2.upstream.DataSpec; +import com.google.android.exoplayer2.util.Assertions; +import com.google.android.exoplayer2.util.Util; import java.io.File; import java.io.FileNotFoundException; diff --git a/library/src/main/java/com/google/android/exoplayer/upstream/cache/CacheDataSource.java b/library/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSource.java similarity index 94% rename from library/src/main/java/com/google/android/exoplayer/upstream/cache/CacheDataSource.java rename to library/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSource.java index 1780bce16b..0fadcd7b54 100644 --- a/library/src/main/java/com/google/android/exoplayer/upstream/cache/CacheDataSource.java +++ b/library/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSource.java @@ -1,5 +1,5 @@ /* - * 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.upstream.cache; +package com.google.android.exoplayer2.upstream.cache; -import com.google.android.exoplayer.C; -import com.google.android.exoplayer.upstream.DataSink; -import com.google.android.exoplayer.upstream.DataSource; -import com.google.android.exoplayer.upstream.DataSpec; -import com.google.android.exoplayer.upstream.FileDataSource; -import com.google.android.exoplayer.upstream.TeeDataSource; -import com.google.android.exoplayer.upstream.cache.CacheDataSink.CacheDataSinkException; +import com.google.android.exoplayer2.C; +import com.google.android.exoplayer2.upstream.DataSink; +import com.google.android.exoplayer2.upstream.DataSource; +import com.google.android.exoplayer2.upstream.DataSpec; +import com.google.android.exoplayer2.upstream.FileDataSource; +import com.google.android.exoplayer2.upstream.TeeDataSource; +import com.google.android.exoplayer2.upstream.cache.CacheDataSink.CacheDataSinkException; import android.net.Uri; import android.util.Log; diff --git a/library/src/main/java/com/google/android/exoplayer/upstream/cache/CacheEvictor.java b/library/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheEvictor.java similarity index 91% rename from library/src/main/java/com/google/android/exoplayer/upstream/cache/CacheEvictor.java rename to library/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheEvictor.java index 5d3421899d..f777124f0c 100644 --- a/library/src/main/java/com/google/android/exoplayer/upstream/cache/CacheEvictor.java +++ b/library/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheEvictor.java @@ -1,5 +1,5 @@ /* - * 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.upstream.cache; +package com.google.android.exoplayer2.upstream.cache; /** * Evicts data from a {@link Cache}. Implementations should call {@link Cache#removeSpan(CacheSpan)} diff --git a/library/src/main/java/com/google/android/exoplayer/upstream/cache/CacheSpan.java b/library/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheSpan.java similarity index 96% rename from library/src/main/java/com/google/android/exoplayer/upstream/cache/CacheSpan.java rename to library/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheSpan.java index 37d620c38b..7ef9c8e16c 100644 --- a/library/src/main/java/com/google/android/exoplayer/upstream/cache/CacheSpan.java +++ b/library/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheSpan.java @@ -1,5 +1,5 @@ /* - * 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.upstream.cache; +package com.google.android.exoplayer2.upstream.cache; -import com.google.android.exoplayer.util.Util; +import com.google.android.exoplayer2.util.Util; import java.io.File; import java.util.regex.Matcher; diff --git a/library/src/main/java/com/google/android/exoplayer/upstream/cache/LeastRecentlyUsedCacheEvictor.java b/library/src/main/java/com/google/android/exoplayer2/upstream/cache/LeastRecentlyUsedCacheEvictor.java similarity index 95% rename from library/src/main/java/com/google/android/exoplayer/upstream/cache/LeastRecentlyUsedCacheEvictor.java rename to library/src/main/java/com/google/android/exoplayer2/upstream/cache/LeastRecentlyUsedCacheEvictor.java index 6e65df52b7..392df970ed 100644 --- a/library/src/main/java/com/google/android/exoplayer/upstream/cache/LeastRecentlyUsedCacheEvictor.java +++ b/library/src/main/java/com/google/android/exoplayer2/upstream/cache/LeastRecentlyUsedCacheEvictor.java @@ -1,5 +1,5 @@ /* - * 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.upstream.cache; +package com.google.android.exoplayer2.upstream.cache; import java.util.Comparator; import java.util.TreeSet; diff --git a/library/src/main/java/com/google/android/exoplayer/upstream/cache/NoOpCacheEvictor.java b/library/src/main/java/com/google/android/exoplayer2/upstream/cache/NoOpCacheEvictor.java similarity index 92% rename from library/src/main/java/com/google/android/exoplayer/upstream/cache/NoOpCacheEvictor.java rename to library/src/main/java/com/google/android/exoplayer2/upstream/cache/NoOpCacheEvictor.java index 9fe9d5e49f..9d5520fb58 100644 --- a/library/src/main/java/com/google/android/exoplayer/upstream/cache/NoOpCacheEvictor.java +++ b/library/src/main/java/com/google/android/exoplayer2/upstream/cache/NoOpCacheEvictor.java @@ -1,5 +1,5 @@ /* - * 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.upstream.cache; +package com.google.android.exoplayer2.upstream.cache; /** diff --git a/library/src/main/java/com/google/android/exoplayer/upstream/cache/SimpleCache.java b/library/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java similarity index 98% rename from library/src/main/java/com/google/android/exoplayer/upstream/cache/SimpleCache.java rename to library/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java index e5829085d2..fd59a74418 100644 --- a/library/src/main/java/com/google/android/exoplayer/upstream/cache/SimpleCache.java +++ b/library/src/main/java/com/google/android/exoplayer2/upstream/cache/SimpleCache.java @@ -1,5 +1,5 @@ /* - * 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.upstream.cache; +package com.google.android.exoplayer2.upstream.cache; -import com.google.android.exoplayer.util.Assertions; +import com.google.android.exoplayer2.util.Assertions; import android.os.ConditionVariable; diff --git a/library/src/main/java/com/google/android/exoplayer/util/Ac3Util.java b/library/src/main/java/com/google/android/exoplayer2/util/Ac3Util.java similarity index 97% rename from library/src/main/java/com/google/android/exoplayer/util/Ac3Util.java rename to library/src/main/java/com/google/android/exoplayer2/util/Ac3Util.java index 5863b5d15f..9b09423e83 100644 --- a/library/src/main/java/com/google/android/exoplayer/util/Ac3Util.java +++ b/library/src/main/java/com/google/android/exoplayer2/util/Ac3Util.java @@ -1,5 +1,5 @@ /* - * 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.util; +package com.google.android.exoplayer2.util; -import com.google.android.exoplayer.Format; -import com.google.android.exoplayer.drm.DrmInitData; +import com.google.android.exoplayer2.Format; +import com.google.android.exoplayer2.drm.DrmInitData; import java.nio.ByteBuffer; diff --git a/library/src/main/java/com/google/android/exoplayer/util/Assertions.java b/library/src/main/java/com/google/android/exoplayer2/util/Assertions.java similarity index 97% rename from library/src/main/java/com/google/android/exoplayer/util/Assertions.java rename to library/src/main/java/com/google/android/exoplayer2/util/Assertions.java index 90a7162c12..73d2e809c0 100644 --- a/library/src/main/java/com/google/android/exoplayer/util/Assertions.java +++ b/library/src/main/java/com/google/android/exoplayer2/util/Assertions.java @@ -1,5 +1,5 @@ /* - * 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.util; +package com.google.android.exoplayer2.util; -import com.google.android.exoplayer.ExoPlayerLibraryInfo; +import com.google.android.exoplayer2.ExoPlayerLibraryInfo; import android.os.Looper; import android.text.TextUtils; diff --git a/library/src/main/java/com/google/android/exoplayer/util/Buffer.java b/library/src/main/java/com/google/android/exoplayer2/util/Buffer.java similarity index 94% rename from library/src/main/java/com/google/android/exoplayer/util/Buffer.java rename to library/src/main/java/com/google/android/exoplayer2/util/Buffer.java index c3880028f8..b0b938c67d 100644 --- a/library/src/main/java/com/google/android/exoplayer/util/Buffer.java +++ b/library/src/main/java/com/google/android/exoplayer2/util/Buffer.java @@ -1,5 +1,5 @@ /* - * 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.util; +package com.google.android.exoplayer2.util; -import com.google.android.exoplayer.C; +import com.google.android.exoplayer2.C; /** * Base class for buffers with flags. diff --git a/library/src/main/java/com/google/android/exoplayer/util/CodecSpecificDataUtil.java b/library/src/main/java/com/google/android/exoplayer2/util/CodecSpecificDataUtil.java similarity index 98% rename from library/src/main/java/com/google/android/exoplayer/util/CodecSpecificDataUtil.java rename to library/src/main/java/com/google/android/exoplayer2/util/CodecSpecificDataUtil.java index 1bb886b68c..830b9d1600 100644 --- a/library/src/main/java/com/google/android/exoplayer/util/CodecSpecificDataUtil.java +++ b/library/src/main/java/com/google/android/exoplayer2/util/CodecSpecificDataUtil.java @@ -1,5 +1,5 @@ /* - * 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.util; +package com.google.android.exoplayer2.util; import android.util.Pair; diff --git a/library/src/main/java/com/google/android/exoplayer/util/ColorParser.java b/library/src/main/java/com/google/android/exoplayer2/util/ColorParser.java similarity index 99% rename from library/src/main/java/com/google/android/exoplayer/util/ColorParser.java rename to library/src/main/java/com/google/android/exoplayer2/util/ColorParser.java index c0d9721136..afe6e938e2 100644 --- a/library/src/main/java/com/google/android/exoplayer/util/ColorParser.java +++ b/library/src/main/java/com/google/android/exoplayer2/util/ColorParser.java @@ -1,5 +1,5 @@ /* - * 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.util; +package com.google.android.exoplayer2.util; import android.text.TextUtils; diff --git a/library/src/main/java/com/google/android/exoplayer/util/ConditionVariable.java b/library/src/main/java/com/google/android/exoplayer2/util/ConditionVariable.java similarity index 94% rename from library/src/main/java/com/google/android/exoplayer/util/ConditionVariable.java rename to library/src/main/java/com/google/android/exoplayer2/util/ConditionVariable.java index 2d801d668c..b6c6914c50 100644 --- a/library/src/main/java/com/google/android/exoplayer/util/ConditionVariable.java +++ b/library/src/main/java/com/google/android/exoplayer2/util/ConditionVariable.java @@ -1,5 +1,5 @@ /* - * 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.util; +package com.google.android.exoplayer2.util; /** * A condition variable whose {@link #open()} and {@link #close()} methods return whether they diff --git a/library/src/main/java/com/google/android/exoplayer/util/DebugTextViewHelper.java b/library/src/main/java/com/google/android/exoplayer2/util/DebugTextViewHelper.java similarity index 91% rename from library/src/main/java/com/google/android/exoplayer/util/DebugTextViewHelper.java rename to library/src/main/java/com/google/android/exoplayer2/util/DebugTextViewHelper.java index b4429a46c6..061f9d3f4a 100644 --- a/library/src/main/java/com/google/android/exoplayer/util/DebugTextViewHelper.java +++ b/library/src/main/java/com/google/android/exoplayer2/util/DebugTextViewHelper.java @@ -1,5 +1,5 @@ /* - * 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.util; +package com.google.android.exoplayer2.util; -import com.google.android.exoplayer.CodecCounters; -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.upstream.BandwidthMeter; +import com.google.android.exoplayer2.CodecCounters; +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.upstream.BandwidthMeter; import android.widget.TextView; diff --git a/library/src/main/java/com/google/android/exoplayer/util/DtsUtil.java b/library/src/main/java/com/google/android/exoplayer2/util/DtsUtil.java similarity index 95% rename from library/src/main/java/com/google/android/exoplayer/util/DtsUtil.java rename to library/src/main/java/com/google/android/exoplayer2/util/DtsUtil.java index 086bba2a2b..ddb2a92514 100644 --- a/library/src/main/java/com/google/android/exoplayer/util/DtsUtil.java +++ b/library/src/main/java/com/google/android/exoplayer2/util/DtsUtil.java @@ -1,5 +1,5 @@ /* - * 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.util; +package com.google.android.exoplayer2.util; -import com.google.android.exoplayer.Format; -import com.google.android.exoplayer.drm.DrmInitData; +import com.google.android.exoplayer2.Format; +import com.google.android.exoplayer2.drm.DrmInitData; import java.nio.ByteBuffer; diff --git a/library/src/main/java/com/google/android/exoplayer/util/FlacStreamInfo.java b/library/src/main/java/com/google/android/exoplayer2/util/FlacStreamInfo.java similarity index 98% rename from library/src/main/java/com/google/android/exoplayer/util/FlacStreamInfo.java rename to library/src/main/java/com/google/android/exoplayer2/util/FlacStreamInfo.java index 0f75c8032e..8a69a6d095 100644 --- a/library/src/main/java/com/google/android/exoplayer/util/FlacStreamInfo.java +++ b/library/src/main/java/com/google/android/exoplayer2/util/FlacStreamInfo.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.android.exoplayer.util; +package com.google.android.exoplayer2.util; /** * Holder for FLAC stream info. diff --git a/library/src/main/java/com/google/android/exoplayer/util/LongArray.java b/library/src/main/java/com/google/android/exoplayer2/util/LongArray.java similarity index 95% rename from library/src/main/java/com/google/android/exoplayer/util/LongArray.java rename to library/src/main/java/com/google/android/exoplayer2/util/LongArray.java index 0df2d401d2..5869e9c4b5 100644 --- a/library/src/main/java/com/google/android/exoplayer/util/LongArray.java +++ b/library/src/main/java/com/google/android/exoplayer2/util/LongArray.java @@ -1,5 +1,5 @@ /* - * 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.util; +package com.google.android.exoplayer2.util; import java.util.Arrays; diff --git a/library/src/main/java/com/google/android/exoplayer/util/MimeTypes.java b/library/src/main/java/com/google/android/exoplayer2/util/MimeTypes.java similarity index 98% rename from library/src/main/java/com/google/android/exoplayer/util/MimeTypes.java rename to library/src/main/java/com/google/android/exoplayer2/util/MimeTypes.java index 1ee76bf749..c34d9c1da2 100644 --- a/library/src/main/java/com/google/android/exoplayer/util/MimeTypes.java +++ b/library/src/main/java/com/google/android/exoplayer2/util/MimeTypes.java @@ -1,5 +1,5 @@ /* - * 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.util; +package com.google.android.exoplayer2.util; /** * Defines common MIME types and helper methods. diff --git a/library/src/main/java/com/google/android/exoplayer/util/MpegAudioHeader.java b/library/src/main/java/com/google/android/exoplayer2/util/MpegAudioHeader.java similarity index 98% rename from library/src/main/java/com/google/android/exoplayer/util/MpegAudioHeader.java rename to library/src/main/java/com/google/android/exoplayer2/util/MpegAudioHeader.java index 92f2c05db9..8d6cad76e6 100644 --- a/library/src/main/java/com/google/android/exoplayer/util/MpegAudioHeader.java +++ b/library/src/main/java/com/google/android/exoplayer2/util/MpegAudioHeader.java @@ -1,5 +1,5 @@ /* - * 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.util; +package com.google.android.exoplayer2.util; /** * Representation of an MPEG audio frame header. diff --git a/library/src/main/java/com/google/android/exoplayer/util/NalUnitUtil.java b/library/src/main/java/com/google/android/exoplayer2/util/NalUnitUtil.java similarity index 99% rename from library/src/main/java/com/google/android/exoplayer/util/NalUnitUtil.java rename to library/src/main/java/com/google/android/exoplayer2/util/NalUnitUtil.java index 8c99b98cc6..c1e463ceb7 100644 --- a/library/src/main/java/com/google/android/exoplayer/util/NalUnitUtil.java +++ b/library/src/main/java/com/google/android/exoplayer2/util/NalUnitUtil.java @@ -1,5 +1,5 @@ /* - * 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.util; +package com.google.android.exoplayer2.util; import android.util.Log; diff --git a/library/src/main/java/com/google/android/exoplayer/util/ParsableBitArray.java b/library/src/main/java/com/google/android/exoplayer2/util/ParsableBitArray.java similarity index 97% rename from library/src/main/java/com/google/android/exoplayer/util/ParsableBitArray.java rename to library/src/main/java/com/google/android/exoplayer2/util/ParsableBitArray.java index 031ee23cf4..87bc9c3b01 100644 --- a/library/src/main/java/com/google/android/exoplayer/util/ParsableBitArray.java +++ b/library/src/main/java/com/google/android/exoplayer2/util/ParsableBitArray.java @@ -1,5 +1,5 @@ /* - * 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.util; +package com.google.android.exoplayer2.util; /** * Wraps a byte array, providing methods that allow it to be read as a bitstream. diff --git a/library/src/main/java/com/google/android/exoplayer/util/ParsableByteArray.java b/library/src/main/java/com/google/android/exoplayer2/util/ParsableByteArray.java similarity index 99% rename from library/src/main/java/com/google/android/exoplayer/util/ParsableByteArray.java rename to library/src/main/java/com/google/android/exoplayer2/util/ParsableByteArray.java index c23ab140e5..42f0c5a6d7 100644 --- a/library/src/main/java/com/google/android/exoplayer/util/ParsableByteArray.java +++ b/library/src/main/java/com/google/android/exoplayer2/util/ParsableByteArray.java @@ -1,5 +1,5 @@ /* - * 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.util; +package com.google.android.exoplayer2.util; import java.nio.ByteBuffer; import java.nio.charset.Charset; diff --git a/library/src/main/java/com/google/android/exoplayer/util/ParsableNalUnitBitArray.java b/library/src/main/java/com/google/android/exoplayer2/util/ParsableNalUnitBitArray.java similarity index 98% rename from library/src/main/java/com/google/android/exoplayer/util/ParsableNalUnitBitArray.java rename to library/src/main/java/com/google/android/exoplayer2/util/ParsableNalUnitBitArray.java index 5333e9f6f4..44d9718b0d 100644 --- a/library/src/main/java/com/google/android/exoplayer/util/ParsableNalUnitBitArray.java +++ b/library/src/main/java/com/google/android/exoplayer2/util/ParsableNalUnitBitArray.java @@ -1,5 +1,5 @@ /* - * 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.util; +package com.google.android.exoplayer2.util; /** * Wraps a byte array, providing methods that allow it to be read as a NAL unit bitstream. diff --git a/library/src/main/java/com/google/android/exoplayer/util/ParserUtil.java b/library/src/main/java/com/google/android/exoplayer2/util/ParserUtil.java similarity index 94% rename from library/src/main/java/com/google/android/exoplayer/util/ParserUtil.java rename to library/src/main/java/com/google/android/exoplayer2/util/ParserUtil.java index 5c054cc623..8e6e1251ac 100644 --- a/library/src/main/java/com/google/android/exoplayer/util/ParserUtil.java +++ b/library/src/main/java/com/google/android/exoplayer2/util/ParserUtil.java @@ -1,5 +1,5 @@ /* - * 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.util; +package com.google.android.exoplayer2.util; import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParserException; diff --git a/library/src/main/java/com/google/android/exoplayer/util/PlayerControl.java b/library/src/main/java/com/google/android/exoplayer2/util/PlayerControl.java similarity index 88% rename from library/src/main/java/com/google/android/exoplayer/util/PlayerControl.java rename to library/src/main/java/com/google/android/exoplayer2/util/PlayerControl.java index d3aaccad74..d6ad28d734 100644 --- a/library/src/main/java/com/google/android/exoplayer/util/PlayerControl.java +++ b/library/src/main/java/com/google/android/exoplayer2/util/PlayerControl.java @@ -1,5 +1,5 @@ /* - * 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.util; +package com.google.android.exoplayer2.util; -import com.google.android.exoplayer.ExoPlayer; +import com.google.android.exoplayer2.ExoPlayer; import android.widget.MediaController.MediaPlayerControl; @@ -52,9 +52,9 @@ public class PlayerControl implements MediaPlayerControl { * This is an unsupported operation. *

* Application of audio effects is dependent on the audio renderer used. When using - * {@link com.google.android.exoplayer.MediaCodecAudioTrackRenderer}, the recommended approach is + * {@link com.google.android.exoplayer2.MediaCodecAudioTrackRenderer}, the recommended approach is * to extend the class and override - * {@link com.google.android.exoplayer.MediaCodecAudioTrackRenderer#onAudioSessionId}. + * {@link com.google.android.exoplayer2.MediaCodecAudioTrackRenderer#onAudioSessionId}. * * @throws UnsupportedOperationException Always thrown. */ diff --git a/library/src/main/java/com/google/android/exoplayer/util/Predicate.java b/library/src/main/java/com/google/android/exoplayer2/util/Predicate.java similarity index 89% rename from library/src/main/java/com/google/android/exoplayer/util/Predicate.java rename to library/src/main/java/com/google/android/exoplayer2/util/Predicate.java index 4ea852ad5b..889b19f3c3 100644 --- a/library/src/main/java/com/google/android/exoplayer/util/Predicate.java +++ b/library/src/main/java/com/google/android/exoplayer2/util/Predicate.java @@ -1,5 +1,5 @@ /* - * 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.util; +package com.google.android.exoplayer2.util; /** * Determines a true of false value for a given input. diff --git a/library/src/main/java/com/google/android/exoplayer/util/PriorityHandlerThread.java b/library/src/main/java/com/google/android/exoplayer2/util/PriorityHandlerThread.java similarity index 92% rename from library/src/main/java/com/google/android/exoplayer/util/PriorityHandlerThread.java rename to library/src/main/java/com/google/android/exoplayer2/util/PriorityHandlerThread.java index d10b3055c3..d89bb6bca3 100644 --- a/library/src/main/java/com/google/android/exoplayer/util/PriorityHandlerThread.java +++ b/library/src/main/java/com/google/android/exoplayer2/util/PriorityHandlerThread.java @@ -1,5 +1,5 @@ /* - * 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.util; +package com.google.android.exoplayer2.util; import android.os.HandlerThread; import android.os.Process; diff --git a/library/src/main/java/com/google/android/exoplayer/util/PriorityTaskManager.java b/library/src/main/java/com/google/android/exoplayer2/util/PriorityTaskManager.java similarity index 97% rename from library/src/main/java/com/google/android/exoplayer/util/PriorityTaskManager.java rename to library/src/main/java/com/google/android/exoplayer2/util/PriorityTaskManager.java index fd85d8fe02..d2619e6b98 100644 --- a/library/src/main/java/com/google/android/exoplayer/util/PriorityTaskManager.java +++ b/library/src/main/java/com/google/android/exoplayer2/util/PriorityTaskManager.java @@ -1,5 +1,5 @@ /* - * 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.util; +package com.google.android.exoplayer2.util; import java.io.IOException; import java.util.Collections; diff --git a/library/src/main/java/com/google/android/exoplayer/util/SlidingPercentile.java b/library/src/main/java/com/google/android/exoplayer2/util/SlidingPercentile.java similarity index 98% rename from library/src/main/java/com/google/android/exoplayer/util/SlidingPercentile.java rename to library/src/main/java/com/google/android/exoplayer2/util/SlidingPercentile.java index 36a15101ae..32ef6c4c21 100644 --- a/library/src/main/java/com/google/android/exoplayer/util/SlidingPercentile.java +++ b/library/src/main/java/com/google/android/exoplayer2/util/SlidingPercentile.java @@ -1,5 +1,5 @@ /* - * 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.util; +package com.google.android.exoplayer2.util; import java.util.ArrayList; import java.util.Collections; diff --git a/library/src/main/java/com/google/android/exoplayer/util/TraceUtil.java b/library/src/main/java/com/google/android/exoplayer2/util/TraceUtil.java similarity index 90% rename from library/src/main/java/com/google/android/exoplayer/util/TraceUtil.java rename to library/src/main/java/com/google/android/exoplayer2/util/TraceUtil.java index 3cd305bfe7..1a4efe9127 100644 --- a/library/src/main/java/com/google/android/exoplayer/util/TraceUtil.java +++ b/library/src/main/java/com/google/android/exoplayer2/util/TraceUtil.java @@ -1,5 +1,5 @@ /* - * 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.util; +package com.google.android.exoplayer2.util; -import com.google.android.exoplayer.ExoPlayerLibraryInfo; +import com.google.android.exoplayer2.ExoPlayerLibraryInfo; import android.annotation.TargetApi; diff --git a/library/src/main/java/com/google/android/exoplayer/util/UriUtil.java b/library/src/main/java/com/google/android/exoplayer2/util/UriUtil.java similarity index 99% rename from library/src/main/java/com/google/android/exoplayer/util/UriUtil.java rename to library/src/main/java/com/google/android/exoplayer2/util/UriUtil.java index c21ba5468d..6592273d03 100644 --- a/library/src/main/java/com/google/android/exoplayer/util/UriUtil.java +++ b/library/src/main/java/com/google/android/exoplayer2/util/UriUtil.java @@ -1,5 +1,5 @@ /* - * 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.util; +package com.google.android.exoplayer2.util; import android.net.Uri; import android.text.TextUtils; diff --git a/library/src/main/java/com/google/android/exoplayer/util/Util.java b/library/src/main/java/com/google/android/exoplayer2/util/Util.java similarity index 98% rename from library/src/main/java/com/google/android/exoplayer/util/Util.java rename to library/src/main/java/com/google/android/exoplayer2/util/Util.java index 8ac22bca52..91723ccc07 100644 --- a/library/src/main/java/com/google/android/exoplayer/util/Util.java +++ b/library/src/main/java/com/google/android/exoplayer2/util/Util.java @@ -1,5 +1,5 @@ /* - * 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.util; +package com.google.android.exoplayer2.util; -import com.google.android.exoplayer.C; -import com.google.android.exoplayer.ExoPlayerLibraryInfo; -import com.google.android.exoplayer.upstream.DataSource; -import com.google.android.exoplayer.upstream.DataSpec; +import com.google.android.exoplayer2.C; +import com.google.android.exoplayer2.ExoPlayerLibraryInfo; +import com.google.android.exoplayer2.upstream.DataSource; +import com.google.android.exoplayer2.upstream.DataSpec; import android.content.Context; import android.content.pm.PackageInfo; diff --git a/playbacktests/build.gradle b/playbacktests/build.gradle index ff294ad0b5..5487dc9928 100644 --- a/playbacktests/build.gradle +++ b/playbacktests/build.gradle @@ -1,4 +1,4 @@ -// 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. diff --git a/playbacktests/src/main/AndroidManifest.xml b/playbacktests/src/main/AndroidManifest.xml index 7ce85ab729..1b2f6e9962 100644 --- a/playbacktests/src/main/AndroidManifest.xml +++ b/playbacktests/src/main/AndroidManifest.xml @@ -1,5 +1,5 @@ - - + diff --git a/testutils/src/main/java/com/google/android/exoplayer/testutil/Dumper.java b/testutils/src/main/java/com/google/android/exoplayer2/testutil/Dumper.java similarity index 96% rename from testutils/src/main/java/com/google/android/exoplayer/testutil/Dumper.java rename to testutils/src/main/java/com/google/android/exoplayer2/testutil/Dumper.java index 8cf557bc86..7e74102173 100644 --- a/testutils/src/main/java/com/google/android/exoplayer/testutil/Dumper.java +++ b/testutils/src/main/java/com/google/android/exoplayer2/testutil/Dumper.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.google.android.exoplayer.testutil; +package com.google.android.exoplayer2.testutil; -import com.google.android.exoplayer.C; +import com.google.android.exoplayer2.C; import java.util.Arrays; import java.util.Locale; diff --git a/testutils/src/main/java/com/google/android/exoplayer/testutil/FakeDataSource.java b/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeDataSource.java similarity index 96% rename from testutils/src/main/java/com/google/android/exoplayer/testutil/FakeDataSource.java rename to testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeDataSource.java index 380433a7ea..ea73f35683 100644 --- a/testutils/src/main/java/com/google/android/exoplayer/testutil/FakeDataSource.java +++ b/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeDataSource.java @@ -1,5 +1,5 @@ /* - * 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.testutil; +package com.google.android.exoplayer2.testutil; -import com.google.android.exoplayer.C; -import com.google.android.exoplayer.upstream.DataSource; -import com.google.android.exoplayer.upstream.DataSpec; -import com.google.android.exoplayer.util.Assertions; +import com.google.android.exoplayer2.C; +import com.google.android.exoplayer2.upstream.DataSource; +import com.google.android.exoplayer2.upstream.DataSpec; +import com.google.android.exoplayer2.util.Assertions; import android.net.Uri; diff --git a/testutils/src/main/java/com/google/android/exoplayer/testutil/FakeExtractorInput.java b/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeExtractorInput.java similarity index 97% rename from testutils/src/main/java/com/google/android/exoplayer/testutil/FakeExtractorInput.java rename to testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeExtractorInput.java index 2499431d7f..c4315f57ff 100644 --- a/testutils/src/main/java/com/google/android/exoplayer/testutil/FakeExtractorInput.java +++ b/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeExtractorInput.java @@ -1,5 +1,5 @@ /* - * 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.testutil; +package com.google.android.exoplayer2.testutil; -import com.google.android.exoplayer.C; -import com.google.android.exoplayer.extractor.ExtractorInput; +import com.google.android.exoplayer2.C; +import com.google.android.exoplayer2.extractor.ExtractorInput; import android.util.SparseBooleanArray; import junit.framework.Assert; diff --git a/testutils/src/main/java/com/google/android/exoplayer/testutil/FakeExtractorOutput.java b/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeExtractorOutput.java similarity index 94% rename from testutils/src/main/java/com/google/android/exoplayer/testutil/FakeExtractorOutput.java rename to testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeExtractorOutput.java index 7aac53d74b..78ca570df0 100644 --- a/testutils/src/main/java/com/google/android/exoplayer/testutil/FakeExtractorOutput.java +++ b/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeExtractorOutput.java @@ -1,5 +1,5 @@ /* - * 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.testutil; +package com.google.android.exoplayer2.testutil; -import com.google.android.exoplayer.extractor.ExtractorOutput; -import com.google.android.exoplayer.extractor.SeekMap; +import com.google.android.exoplayer2.extractor.ExtractorOutput; +import com.google.android.exoplayer2.extractor.SeekMap; import android.app.Instrumentation; import android.util.SparseArray; diff --git a/testutils/src/main/java/com/google/android/exoplayer/testutil/FakeTrackOutput.java b/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeTrackOutput.java similarity index 94% rename from testutils/src/main/java/com/google/android/exoplayer/testutil/FakeTrackOutput.java rename to testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeTrackOutput.java index 333229d0d6..af1823fb29 100644 --- a/testutils/src/main/java/com/google/android/exoplayer/testutil/FakeTrackOutput.java +++ b/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeTrackOutput.java @@ -1,5 +1,5 @@ /* - * 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.testutil; +package com.google.android.exoplayer2.testutil; -import com.google.android.exoplayer.C; -import com.google.android.exoplayer.Format; -import com.google.android.exoplayer.extractor.ExtractorInput; -import com.google.android.exoplayer.extractor.TrackOutput; -import com.google.android.exoplayer.util.ParsableByteArray; +import com.google.android.exoplayer2.C; +import com.google.android.exoplayer2.Format; +import com.google.android.exoplayer2.extractor.ExtractorInput; +import com.google.android.exoplayer2.extractor.TrackOutput; +import com.google.android.exoplayer2.util.ParsableByteArray; import android.test.MoreAsserts; import junit.framework.Assert; diff --git a/testutils/src/main/java/com/google/android/exoplayer/testutil/TestUtil.java b/testutils/src/main/java/com/google/android/exoplayer2/testutil/TestUtil.java similarity index 95% rename from testutils/src/main/java/com/google/android/exoplayer/testutil/TestUtil.java rename to testutils/src/main/java/com/google/android/exoplayer2/testutil/TestUtil.java index 3ae823a2a5..ed08f3bff0 100644 --- a/testutils/src/main/java/com/google/android/exoplayer/testutil/TestUtil.java +++ b/testutils/src/main/java/com/google/android/exoplayer2/testutil/TestUtil.java @@ -1,5 +1,5 @@ /* - * 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.testutil; +package com.google.android.exoplayer2.testutil; -import com.google.android.exoplayer.C; -import com.google.android.exoplayer.extractor.Extractor; -import com.google.android.exoplayer.extractor.PositionHolder; -import com.google.android.exoplayer.extractor.SeekMap; -import com.google.android.exoplayer.testutil.FakeExtractorInput.SimulatedIOException; -import com.google.android.exoplayer.util.Assertions; -import com.google.android.exoplayer.util.Util; +import com.google.android.exoplayer2.C; +import com.google.android.exoplayer2.extractor.Extractor; +import com.google.android.exoplayer2.extractor.PositionHolder; +import com.google.android.exoplayer2.extractor.SeekMap; +import com.google.android.exoplayer2.testutil.FakeExtractorInput.SimulatedIOException; +import com.google.android.exoplayer2.util.Assertions; +import com.google.android.exoplayer2.util.Util; import android.app.Instrumentation; import android.test.InstrumentationTestCase;