Add datasource module

PiperOrigin-RevId: 404897119

Author: ojw28

core_settings.gradle

@@ -51,6 +51,8 @@ project(modulePrefix + 'library-ui').projectDir = new File(rootDir, 'library/ui'
 include modulePrefix + 'extension-leanback'
 project(modulePrefix + 'extension-leanback').projectDir = new File(rootDir, 'extensions/leanback')
 
+include modulePrefix + 'library-datasource'
+project(modulePrefix + 'library-datasource').projectDir = new File(rootDir, 'library/datasource')
 include modulePrefix + 'extension-cronet'
 project(modulePrefix + 'extension-cronet').projectDir = new File(rootDir, 'extensions/cronet')
 include modulePrefix + 'extension-rtmp'

extensions/cronet/build.gradle

@@ -22,6 +22,7 @@ android {
 dependencies {
     api "com.google.android.gms:play-services-cronet:17.0.1"
     implementation project(modulePrefix + 'library-common')
+    implementation project(modulePrefix + 'library-datasource')
     implementation 'androidx.annotation:annotation:' + androidxAnnotationVersion
     compileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion
     compileOnly 'org.jetbrains.kotlin:kotlin-annotations-jvm:' + kotlinAnnotationsVersion

extensions/okhttp/build.gradle

@@ -17,6 +17,7 @@ android.defaultConfig.minSdkVersion 21
 
 dependencies {
     implementation project(modulePrefix + 'library-common')
+    implementation project(modulePrefix + 'library-datasource')
     implementation 'androidx.annotation:annotation:' + androidxAnnotationVersion
     compileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion
     compileOnly 'org.jetbrains.kotlin:kotlin-annotations-jvm:' + kotlinAnnotationsVersion

extensions/rtmp/build.gradle

@@ -15,6 +15,7 @@ apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle"
 
 dependencies {
     implementation project(modulePrefix + 'library-common')
+    implementation project(modulePrefix + 'library-datasource')
     implementation 'net.butterflytv.utils:rtmp-client:3.1.0'
     implementation 'androidx.annotation:annotation:' + androidxAnnotationVersion
     compileOnly 'org.jetbrains.kotlin:kotlin-annotations-jvm:' + kotlinAnnotationsVersion

library/all/build.gradle

@@ -15,6 +15,7 @@ apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle"
 
 dependencies {
     api project(modulePrefix + 'library-common')
+    api project(modulePrefix + 'library-datasource')
     api project(modulePrefix + 'library-decoder')
     api project(modulePrefix + 'library-extractor')
     api project(modulePrefix + 'library-core')

library/common/build.gradle

@@ -14,19 +14,11 @@
 apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle"
 
 android {
-    defaultConfig {
-        multiDexEnabled true
-    }
-
     buildTypes {
         debug {
             testCoverageEnabled = true
         }
     }
-
-    sourceSets {
-        androidTest.assets.srcDir '../../testdata/src/test/assets/'
-    }
 }
 
 dependencies {
@@ -56,7 +48,6 @@ dependencies {
     testImplementation 'androidx.test.ext:junit:' + androidxTestJUnitVersion
     testImplementation 'junit:junit:' + junitVersion
     testImplementation 'com.google.truth:truth:' + truthVersion
-    testImplementation 'com.squareup.okhttp3:mockwebserver:' + okhttpVersion
     testImplementation 'org.robolectric:robolectric:' + robolectricVersion
     testImplementation project(modulePrefix + 'library-core')
     testImplementation project(modulePrefix + 'testutils')

library/common/proguard-rules.txt

@@ -1,16 +1,5 @@
 # Proguard rules specific to the common module.
 
-# Constant folding for resource integers may mean that a resource passed to this method appears to be unused. Keep the method to prevent this from happening.
--keepclassmembers class com.google.android.exoplayer2.upstream.RawResourceDataSource {
-  public static android.net.Uri buildRawResourceUri(int);
-}
-
-# Constructors accessed via reflection in DefaultDataSource
--dontnote com.google.android.exoplayer2.ext.rtmp.RtmpDataSource
--keepclassmembers class com.google.android.exoplayer2.ext.rtmp.RtmpDataSource {
-  ();
-}
-
 # Don't warn about checkerframework and Kotlin annotations
 -dontwarn org.checkerframework.**
 -dontwarn kotlin.annotations.jvm.**

library/core/build.gradle

@@ -37,6 +37,7 @@ android {
 dependencies {
     api project(modulePrefix + 'library-common')
     // TODO(b/203754886): Revisit which modules are exported as API dependencies.
+    api project(modulePrefix + 'library-datasource')
     api project(modulePrefix + 'library-decoder')
     api project(modulePrefix + 'library-extractor')
     implementation 'androidx.annotation:annotation:' + androidxAnnotationVersion

library/datasource/README.md

@@ -0,0 +1,65 @@
+// Copyright (C) 2020 The Android Open 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.
+apply from: "$gradle.ext.exoplayerSettingsDir/common_library_config.gradle"
+
+android {
+    defaultConfig {
+        multiDexEnabled true
+    }
+
+    buildTypes {
+        debug {
+            testCoverageEnabled = true
+        }
+    }
+
+    sourceSets {
+        androidTest.assets.srcDir '../../testdata/src/test/assets/'
+        test.assets.srcDir '../../testdata/src/test/assets/'
+    }
+}
+
+dependencies {
+    implementation project(modulePrefix + 'library-common')
+    implementation 'androidx.annotation:annotation:' + androidxAnnotationVersion
+    compileOnly 'com.google.code.findbugs:jsr305:' + jsr305Version
+    compileOnly 'com.google.errorprone:error_prone_annotations:' + errorProneVersion
+    compileOnly 'org.checkerframework:checker-compat-qual:' + checkerframeworkCompatVersion
+    compileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion
+    compileOnly 'org.jetbrains.kotlin:kotlin-annotations-jvm:' + kotlinAnnotationsVersion
+    androidTestImplementation 'androidx.test:runner:' + androidxTestRunnerVersion
+    androidTestImplementation 'com.linkedin.dexmaker:dexmaker:' + dexmakerVersion
+    androidTestImplementation 'com.linkedin.dexmaker:dexmaker-mockito:' + dexmakerVersion
+    androidTestImplementation(project(modulePrefix + 'testutils')) {
+        exclude module: modulePrefix.substring(1) + 'library-core'
+    }
+    testImplementation 'org.mockito:mockito-core:' + mockitoVersion
+    testImplementation 'androidx.test:core:' + androidxTestCoreVersion
+    testImplementation 'androidx.test.ext:junit:' + androidxTestJUnitVersion
+    testImplementation 'com.google.truth:truth:' + truthVersion
+    testImplementation 'com.squareup.okhttp3:mockwebserver:' + okhttpVersion
+    testImplementation 'org.robolectric:robolectric:' + robolectricVersion
+    testImplementation project(modulePrefix + 'testutils')
+}
+
+ext {
+    javadocTitle = 'DataSource module'
+}
+apply from: '../../javadoc_library.gradle'
+
+ext {
+    releaseArtifactId = 'exoplayer-datasource'
+    releaseDescription = 'The ExoPlayer library DataSource module.'
+}
+apply from: '../../publish.gradle'

library/datasource/build.gradle

@@ -0,0 +1,12 @@
+# Proguard rules specific to the DataSource module.
+
+# Constant folding for resource integers may mean that a resource passed to this method appears to be unused. Keep the method to prevent this from happening.
+-keepclassmembers class com.google.android.exoplayer2.upstream.RawResourceDataSource {
+  public static android.net.Uri buildRawResourceUri(int);
+}
+
+# Constructors accessed via reflection in DefaultDataSource
+-dontnote com.google.android.exoplayer2.ext.rtmp.RtmpDataSource
+-keepclassmembers class com.google.android.exoplayer2.ext.rtmp.RtmpDataSource {
+  ();
+}

library/datasource/proguard-rules.txt

@@ -1,5 +1,5 @@
 xml version="1.0" encoding="utf-8"?>
@@ -19,8 +19,8 @@
@@ -19,8 +19,8 @@
 import android.net.Uri;
 import androidx.test.core.app.ApplicationProvider;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
-import com.google.android.exoplayer2.common.test.R;
 import com.google.android.exoplayer2.testutil.DataSourceContractTest;
+import com.google.android.exoplayer2.upstream.test.R;
 import com.google.android.exoplayer2.util.Util;
 import com.google.common.collect.ImmutableList;
 import org.junit.runner.RunWith;
@@ -0,0 +1,19 @@
+xml version="1.0" encoding="utf-8"?>
+
+
+<manifest package="com.google.android.exoplayer2.upstream">
+  <uses-sdk/>
+manifest>
@@ -13,14 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.android.exoplayer2.upstream.crypto;
+package com.google.android.exoplayer2.upstream;
 
 import static com.google.android.exoplayer2.util.Util.castNonNull;
 import static java.lang.Math.min;
 
 import androidx.annotation.Nullable;
-import com.google.android.exoplayer2.upstream.DataSink;
-import com.google.android.exoplayer2.upstream.DataSpec;
 import java.io.IOException;
 import javax.crypto.Cipher;
 
@@ -13,17 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.android.exoplayer2.upstream.crypto;
+package com.google.android.exoplayer2.upstream;
 
 import static com.google.android.exoplayer2.util.Assertions.checkNotNull;
 import static com.google.android.exoplayer2.util.Util.castNonNull;
 
 import android.net.Uri;
 import androidx.annotation.Nullable;
 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.upstream.TransferListener;
 import java.io.IOException;
 import java.util.List;
 import java.util.Map;
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.android.exoplayer2.upstream.crypto;
+package com.google.android.exoplayer2.upstream;
 
 import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.util.Assertions;
@@ -0,0 +1,19 @@
+xml version="1.0" encoding="utf-8"?>
+
+
+<manifest package="com.google.android.exoplayer2.upstream">
+  <uses-sdk/>
+manifest>
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.android.exoplayer2.upstream.crypto;
+package com.google.android.exoplayer2.upstream;
 
 import static com.google.common.truth.Truth.assertThat;
 import static java.lang.Math.min;

library/common/src/androidTest/AndroidManifest.xml renamed to library/datasource/src/androidTest/AndroidManifest.xml

@@ -19,8 +19,8 @@
 import android.net.Uri;
 import androidx.test.core.app.ApplicationProvider;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
-import com.google.android.exoplayer2.common.test.R;
 import com.google.android.exoplayer2.testutil.DataSourceContractTest;
+import com.google.android.exoplayer2.upstream.test.R;
 import com.google.android.exoplayer2.util.Util;
 import com.google.common.collect.ImmutableList;
 import org.junit.runner.RunWith;

library/common/src/androidTest/java/com/google/android/exoplayer2/upstream/ContentDataSourceTest.java renamed to library/datasource/src/androidTest/java/com/google/android/exoplayer2/upstream/ContentDataSourceTest.java

@@ -0,0 +1,19 @@
+xml version="1.0" encoding="utf-8"?>
+
+
+<manifest package="com.google.android.exoplayer2.upstream">
+  <uses-sdk/>
+manifest>

library/common/src/androidTest/java/com/google/android/exoplayer2/upstream/RawResourceDataSourceContractTest.java renamed to library/datasource/src/androidTest/java/com/google/android/exoplayer2/upstream/RawResourceDataSourceContractTest.java

@@ -13,14 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.android.exoplayer2.upstream.crypto;
+package com.google.android.exoplayer2.upstream;
 
 import static com.google.android.exoplayer2.util.Util.castNonNull;
 import static java.lang.Math.min;
 
 import androidx.annotation.Nullable;
-import com.google.android.exoplayer2.upstream.DataSink;
-import com.google.android.exoplayer2.upstream.DataSpec;
 import java.io.IOException;
 import javax.crypto.Cipher;
 

library/common/src/androidTest/res/raw/resource1 renamed to library/datasource/src/androidTest/res/raw/resource1

@@ -13,17 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.android.exoplayer2.upstream.crypto;
+package com.google.android.exoplayer2.upstream;
 
 import static com.google.android.exoplayer2.util.Assertions.checkNotNull;
 import static com.google.android.exoplayer2.util.Util.castNonNull;
 
 import android.net.Uri;
 import androidx.annotation.Nullable;
 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.upstream.TransferListener;
 import java.io.IOException;
 import java.util.List;
 import java.util.Map;

library/common/src/androidTest/res/raw/resource2 renamed to library/datasource/src/androidTest/res/raw/resource2

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.android.exoplayer2.upstream.crypto;
+package com.google.android.exoplayer2.upstream;
 
 import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.util.Assertions;

library/datasource/src/main/AndroidManifest.xml

@@ -0,0 +1,19 @@
+xml version="1.0" encoding="utf-8"?>
+
+
+<manifest package="com.google.android.exoplayer2.upstream">
+  <uses-sdk/>
+manifest>

library/common/src/main/java/com/google/android/exoplayer2/upstream/crypto/AesCipherDataSink.java renamed to library/datasource/src/main/java/com/google/android/exoplayer2/upstream/AesCipherDataSink.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.android.exoplayer2.upstream.crypto;
+package com.google.android.exoplayer2.upstream;
 
 import static com.google.common.truth.Truth.assertThat;
 import static java.lang.Math.min;