-
Notifications
You must be signed in to change notification settings - Fork 6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #3493 from google/dev-v2-r2.6.0
r2.6.0
- Loading branch information
Showing
491 changed files
with
21,228 additions
and
7,178 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -39,6 +39,7 @@ proguard-project.txt | |
|
|
||
| # Other | ||
| .DS_Store | ||
| cmake-build-debug | ||
| dist | ||
| tmp | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,71 @@ | ||
| # Mercurial's .hgignore files can only be used in the root directory. | ||
| # You can still apply these rules by adding | ||
| # include:path/to/this/directory/.hgignore to the top-level .hgignore file. | ||
|
|
||
| # Ensure same syntax as in .gitignore can be used | ||
| syntax:glob | ||
|
|
||
| # Android generated | ||
| bin | ||
| gen | ||
| libs | ||
| obj | ||
| lint.xml | ||
|
|
||
| # IntelliJ IDEA | ||
| .idea | ||
| *.iml | ||
| *.ipr | ||
| *.iws | ||
| classes | ||
| gen-external-apklibs | ||
|
|
||
| # Eclipse | ||
| .project | ||
| .classpath | ||
| .settings | ||
| .checkstyle | ||
| .cproject | ||
|
|
||
| # Gradle | ||
| .gradle | ||
| build | ||
| buildout | ||
| out | ||
|
|
||
| # Maven | ||
| target | ||
| release.properties | ||
| pom.xml.* | ||
|
|
||
| # Ant | ||
| ant.properties | ||
| local.properties | ||
| proguard.cfg | ||
| proguard-project.txt | ||
|
|
||
| # Other | ||
| .DS_Store | ||
| cmake-build-debug | ||
| dist | ||
| tmp | ||
|
|
||
| # VP9 extension | ||
| extensions/vp9/src/main/jni/libvpx | ||
| extensions/vp9/src/main/jni/libvpx_android_configs | ||
| extensions/vp9/src/main/jni/libyuv | ||
|
|
||
| # Opus extension | ||
| extensions/opus/src/main/jni/libopus | ||
|
|
||
| # FLAC extension | ||
| extensions/flac/src/main/jni/flac | ||
|
|
||
| # FFmpeg extension | ||
| extensions/ffmpeg/src/main/jni/ffmpeg | ||
|
|
||
| # Cronet extension | ||
| extensions/cronet/jniLibs/* | ||
| !extensions/cronet/jniLibs/README.md | ||
| extensions/cronet/libs/* | ||
| !extensions/cronet/libs/README.md |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| # ExoPlayer demos # | ||
|
|
||
| This directory contains applications that demonstrate how to use ExoPlayer. | ||
| Browse the individual demos and their READMEs to learn more. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| # IMA demo application # | ||
|
|
||
| This folder contains a demo application that showcases ExoPlayer integration | ||
| with the IMA SDK. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| // Copyright (C) 2017 The Android Open 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: '../../constants.gradle' | ||
| apply plugin: 'com.android.application' | ||
|
|
||
| android { | ||
| compileSdkVersion project.ext.compileSdkVersion | ||
| buildToolsVersion project.ext.buildToolsVersion | ||
|
|
||
| defaultConfig { | ||
| minSdkVersion 16 | ||
| targetSdkVersion project.ext.targetSdkVersion | ||
| } | ||
|
|
||
| buildTypes { | ||
| release { | ||
| shrinkResources true | ||
| minifyEnabled true | ||
| proguardFiles getDefaultProguardFile('proguard-android.txt') | ||
| } | ||
| debug { | ||
| jniDebuggable = true | ||
| } | ||
| } | ||
|
|
||
| lintOptions { | ||
| // The demo app does not have translations. | ||
| disable 'MissingTranslation' | ||
| } | ||
| } | ||
|
|
||
| dependencies { | ||
| compile project(modulePrefix + 'library-core') | ||
| compile project(modulePrefix + 'library-ui') | ||
| compile project(modulePrefix + 'extension-ima') | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <!-- Copyright (C) 2017 The Android Open 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. | ||
| --> | ||
| <manifest xmlns:android="http://schemas.android.com/apk/res/android" | ||
| package="com.google.android.exoplayer2.imademo" | ||
| android:versionCode="2600" | ||
| android:versionName="2.6.0"> | ||
|
|
||
| <uses-permission android:name="android.permission.INTERNET"/> | ||
| <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="26"/> | ||
|
|
||
| <application android:label="@string/application_name" android:icon="@mipmap/ic_launcher" | ||
| android:largeHeap="true" android:allowBackup="false"> | ||
|
|
||
| <activity android:name="com.google.android.exoplayer2.imademo.MainActivity" | ||
| android:configChanges="keyboard|keyboardHidden|orientation|screenSize|screenLayout|smallestScreenSize|uiMode" | ||
| android:label="@string/application_name" | ||
| android:theme="@style/PlayerTheme"> | ||
| <intent-filter> | ||
| <action android:name="android.intent.action.MAIN"/> | ||
| <category android:name="android.intent.category.LAUNCHER"/> | ||
| </intent-filter> | ||
| </activity> | ||
|
|
||
| </application> | ||
|
|
||
| </manifest> |
58 changes: 58 additions & 0 deletions
58
demos/ima/src/main/java/com/google/android/exoplayer2/imademo/MainActivity.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,58 @@ | ||
| /* | ||
| * Copyright (C) 2017 The Android Open 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.imademo; | ||
|
|
||
| import android.app.Activity; | ||
| import android.os.Bundle; | ||
| import com.google.android.exoplayer2.ExoPlayer; | ||
| import com.google.android.exoplayer2.ui.SimpleExoPlayerView; | ||
|
|
||
| /** | ||
| * Main Activity for the IMA plugin demo. {@link ExoPlayer} objects are created by | ||
| * {@link PlayerManager}, which this class instantiates. | ||
| */ | ||
| public final class MainActivity extends Activity { | ||
|
|
||
| private SimpleExoPlayerView playerView; | ||
| private PlayerManager player; | ||
|
|
||
| @Override | ||
| protected void onCreate(Bundle savedInstanceState) { | ||
| super.onCreate(savedInstanceState); | ||
| setContentView(R.layout.main_activity); | ||
| playerView = findViewById(R.id.player_view); | ||
| player = new PlayerManager(this); | ||
| } | ||
|
|
||
| @Override | ||
| public void onResume() { | ||
| super.onResume(); | ||
| player.init(this, playerView); | ||
| } | ||
|
|
||
| @Override | ||
| public void onPause() { | ||
| super.onPause(); | ||
| player.reset(); | ||
| } | ||
|
|
||
| @Override | ||
| public void onDestroy() { | ||
| player.release(); | ||
| super.onDestroy(); | ||
| } | ||
|
|
||
| } |
Oops, something went wrong.