Merge pull request #12 from androidx/main

Merge from androidx/media main branch

.github/ISSUE_TEMPLATE/bug.yml

@@ -5,37 +5,31 @@ body:
   - type: markdown
     attributes:
       value: |
-        We can only process bug reports that are actionable. Unclear bug reports or reports with
-        insufficient information may not get attention.
+        We can only process bug reports that are actionable. Unclear bug reports or reports with insufficient information may not get attention.
 
         Before filing a bug:
         -------------------------
 
-        - Search existing issues, including issues that are closed:
-          https://github.com/androidx/media/issues?q=is%3Aissue
-        - For ExoPlayer-related bugs, please also check for existing issues on the ExoPlayer
-          tracker: https://github.com/google/ExoPlayer/issues?q=is%3Aissue
+        - Search existing issues, including issues that are closed: https://github.com/androidx/media/issues?q=is%3Aissue
+        - For ExoPlayer-related bugs, please also check for existing issues on the ExoPlayer tracker: https://github.com/google/ExoPlayer/issues?q=is%3Aissue
   - type: dropdown
     attributes:
-      label: Media3 Version
+      label: Version
       description: What version of Media3 (or ExoPlayer) are you using?
       options:
-        - Media3 1.1.0-alpha01
-        - Media3 1.0.2
-        - Media3 1.0.1
-        - Media3 1.0.0
-        - Media3 1.0.0-rc02
-        - Media3 1.0.0-rc01
-        - Media3 1.0.0-beta03
-        - Media3 1.0.0-beta02
-        - Media3 1.0.0-beta01
-        - Media3 1.0.0-alpha03
-        - Media3 1.0.0-alpha02
-        - Media3 1.0.0-alpha01
-        - Media3 `main` branch
-        - ExoPlayer 2.18.7
-        - ExoPlayer 2.18.6
-        - ExoPlayer 2.18.5
+        - Media3 main branch
+        - Media3 pre-release (alpha, beta or RC not in this list)
+        - Media3 1.4.1
+        - Media3 1.4.0
+        - Media3 1.3.1
+        - Media3 1.3.0
+        - Media3 1.2.1
+        - Media3 1.2.0
+        - Media3 1.1.1 / ExoPlayer 2.19.1
+        - Media3 1.1.0 / ExoPlayer 2.19.0
+        - Media3 1.0.2 / ExoPlayer 2.18.7
+        - Media3 1.0.1 / ExoPlayer 2.18.6
+        - Media3 1.0.0 / ExoPlayer 2.18.5
         - ExoPlayer 2.18.4
         - ExoPlayer 2.18.3
         - ExoPlayer 2.18.2
@@ -50,10 +44,16 @@ body:
         - ExoPlayer 2.14.2
         - ExoPlayer 2.14.1
         - ExoPlayer 2.14.0
-        - ExoPlayer `dev-v2` branch
+        - ExoPlayer dev-v2 branch
         - Older (unsupported)
     validations:
       required: true
+  - type: textarea
+    attributes:
+      label: More version details
+      description: >
+        Required if you selected `main` or `dev-v2` (please provide an exact commit SHA),
+        or 'pre-release' or 'older' (please provide the version).
   - type: textarea
     attributes:
       label: Devices that reproduce the issue
@@ -114,7 +114,7 @@ body:
         * Attach a file here
         * Include a media URL
         * Refer to a piece of media from the demo app (e.g. `Misc > Dizzy (MP4)`)
-        * If you don't want to post media publicly please email the info to dev.exoplayer@gmail.com with subject 'Issue #\<issuenumber\>' after filing this issue, and note that you will do this here.
+        * If you don't want to post media publicly please email the info to android-media-github@google.com with subject 'Issue #\<issuenumber\>' after filing this issue, and note that you will do this here.
         * If you are certain the issue does not depend on the media being played, enter "Not applicable" here.
 
         For DRM-protected media please also include the scheme and license server URL.
@@ -124,8 +124,8 @@ body:
     attributes:
       label: Bug Report
       description: |
-        After filing this issue please run `adb bugreport` shortly after reproducing the problem (ideally in the [demo app](https://github.com/androidx/media/tree/release/demos/main)) to capture a zip file, and email this to dev.exoplayer@gmail.com with subject 'Issue #\<issuenumber\>'.
+        After filing this issue please run `adb bugreport` shortly after reproducing the problem (ideally in the [demo app](https://github.com/androidx/media/tree/release/demos/main)) to capture a zip file, and email this to android-media-github@google.com with subject 'Issue #\<issuenumber\>'.
 
         **Note:** Logcat output is **not** the same as a full bug report, and is often missing information that's useful for diagnosing issues. Please ensure you're sending a full bug report zip file.
       options:
-        - label: You will email the zip file produced by `adb bugreport` to dev.exoplayer@gmail.com after filing this issue.
+        - label: You will email the zip file produced by `adb bugreport` to android-media-github@google.com after filing this issue.

.github/ISSUE_TEMPLATE/question.md

@@ -39,6 +39,6 @@ Don't forget to check ExoPlayer's supported formats and devices, if applicable
 (https://developer.android.com/guide/topics/media/exoplayer/supported-formats).
 
 If there's something you don't want to post publicly, please submit the issue,
-then email the link/bug report to dev.exoplayer@gmail.com using a subject in the
-format "Issue #1234", where #1234 is your issue number (we don't reply to
-emails).
+then email the link/bug report to android-media-github@google.com using a
+subject in the format "Issue #1234", where #1234 is your issue number (we don't
+reply to emails).

CONTRIBUTING.md

@@ -38,6 +38,24 @@ you made on top of `main` using
 $ git diff -U0 main... | google-java-format-diff.py -p1 -i
 ```
 
+### Push access to PR branches
+
+Please ensure maintainers of this repository have push access to your PR branch
+by ticking the `Allow edits from maintainers` checkbox when creating the PR (or
+after it's created). See the
+[GitHub docs](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-a-pull-request-from-a-fork)
+for more info. This allows us to make changes and fixes to the PR while it goes
+through internal review, and ensures we don't create an
+['evil' merge](https://git-scm.com/docs/gitglossary#Documentation/gitglossary.txt-aiddefevilmergeaevilmerge)
+when it gets merged.
+
+This checkbox only appears on PRs from individual-owned forks
+(https://github.com/orgs/community/discussions/5634). If you open a PR from an
+organization-owned fork we will ask you to open a new one from an
+individual-owned fork. If this isn't possible we can still merge the PR, but it
+will result in an 'evil' merge because the changes and fixes we make during
+internal review will be part of the merge commit.
+
 ## Contributor license agreement
 
 Contributions to any Google project must be accompanied by a Contributor

README.md

@@ -1,19 +1,21 @@
 # AndroidX Media
 
 AndroidX Media is a collection of libraries for implementing media use cases on
-Android, including local playback (via ExoPlayer) and media sessions.
+Android, including local playback (via ExoPlayer), video editing (via Transformer) and media sessions.
 
 ## Documentation
 
 *   The [developer guide][] provides a wealth of information.
 *   The [class reference][] documents the classes and methods.
 *   The [release notes][] document the major changes in each release.
+*   The [media dev center][] provides samples and guidelines.
 *   Follow our [developer blog][] to keep up to date with the latest
     developments!
 
 [developer guide]: https://developer.android.com/guide/topics/media/media3
 [class reference]: https://developer.android.com/reference/androidx/media3/common/package-summary
 [release notes]: RELEASENOTES.md
+[media dev center]: https://developer.android.com/media
 [developer blog]: https://medium.com/google-exoplayer
 
 ## Migration for existing ExoPlayer and MediaSession projects
@@ -45,13 +47,21 @@ also possible to clone this GitHub repository and depend on the modules locally.
 #### 1. Add module dependencies
 
 The easiest way to get started using AndroidX Media is to add gradle
-dependencies on the libraries you need in the `build.gradle` file of your app
-module.
+dependencies on the libraries you need in the `build.gradle.kts` file of your
+app module.
 
 For example, to depend on ExoPlayer with DASH playback support and UI components
 you can add dependencies on the modules like this:
 
-```gradle
+```kotlin
+implementation("androidx.media3:media3-exoplayer:1.X.X")
+implementation("androidx.media3:media3-exoplayer-dash:1.X.X")
+implementation("androidx.media3:media3-ui:1.X.X")
+```
+
+Or in Gradle Groovy DSL `build.gradle`:
+
+```groovy
 implementation 'androidx.media3:media3-exoplayer:1.X.X'
 implementation 'androidx.media3:media3-exoplayer-dash:1.X.X'
 implementation 'androidx.media3:media3-ui:1.X.X'
@@ -73,20 +83,22 @@ details.
 #### 2. Turn on Java 8 support
 
 If not enabled already, you also need to turn on Java 8 support in all
-`build.gradle` files depending on AndroidX Media, by adding the following to the
-`android` section:
+`build.gradle.kts` files depending on AndroidX Media, by adding the following to
+the `android` section:
 
-```gradle
+```kotlin
 compileOptions {
-  targetCompatibility JavaVersion.VERSION_1_8
+  targetCompatibility = JavaVersion.VERSION_1_8
 }
 ```
 
-#### 3. Enable multidex
+Or in Gradle Groovy DSL `build.gradle`:
 
-If your Gradle `minSdkVersion` is 20 or lower, you should
-[enable multidex](https://developer.android.com/studio/build/multidex) in order
-to prevent build errors.
+```groovy
+compileOptions {
+  targetCompatibility JavaVersion.VERSION_1_8
+}
+```
 
 ### Locally
 
@@ -98,24 +110,59 @@ First, clone the repository into a local directory:
 
 ```sh
 git clone https://github.com/androidx/media.git
-cd media
 ```
 
-Next, add the following to your project's `settings.gradle` file, replacing
+Next, add the following to your project's `settings.gradle.kts` file, replacing
 `path/to/media` with the path to your local copy:
 
-```gradle
-gradle.ext.androidxMediaModulePrefix = 'media-'
+```kotlin
+(gradle as ExtensionAware).extra["androidxMediaModulePrefix"] = "media3-"
+apply(from = file("path/to/media/core_settings.gradle"))
+```
+
+Or in Gradle Groovy DSL `settings.gradle`:
+
+```groovy
+gradle.ext.androidxMediaModulePrefix = 'media3-'
 apply from: file("path/to/media/core_settings.gradle")
 ```
 
 You should now see the AndroidX Media modules appear as part of your project.
-You can depend on them as you would on any other local module, for example:
+You can depend on them from `build.gradle.kts` as you would on any other local
+module, for example:
+
+```kotlin
+implementation(project(":media3-lib-exoplayer"))
+implementation(project(":media3-lib-exoplayer-dash"))
+implementation(project(":media3-lib-ui"))
+```
+
+Or in Gradle Groovy DSL `build.gradle`:
+
+```groovy
+implementation project(':media3-lib-exoplayer')
+implementation project(':media3-lib-exoplayer-dash')
+implementation project(':media3-lib-ui')
+```
+
+#### MIDI module
+
+By default the [MIDI module](libraries/decoder_midi) is disabled as a local
+dependency, because it requires additional Maven repository config. If you want
+to use it as a local dependency, please configure the JitPack repository as
+[described in the module README](libraries/decoder_midi/README.md#getting-the-module),
+and then enable building the module in your `settings.gradle.kts` file:
+
+```kotlin
+gradle.extra.apply {
+  set("androidxMediaEnableMidiModule", true)
+}
+```
+
+Or in Gradle Groovy DSL `settings.gradle`:
 
-```gradle
-implementation project(':media-lib-exoplayer')
-implementation project(':media-lib-exoplayer-dash')
-implementation project(':media-lib-ui')
+```groovy
+gradle.ext.androidxMediaEnableMidiModule = true
 ```
 
 ## Developing AndroidX Media