Merge pull request #11062 from google/release-v2-r2.18.5

r2.18.5

.github/ISSUE_TEMPLATE/bug.yml

@@ -2,112 +2,18 @@ name: Bug Report
 description: Report a bug in the ExoPlayer library
 labels: ["bug", "needs triage"]
 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.
+- type: markdown
+  attributes:
+    value: |
+      **Please do not file new issues in this repository.**
 
-        Before filing a bug:
-        -------------------------
+      All new bugs should be filed in the
+      [Media3 issue tracker](https://github.com/androidx/media/issues/new?template=bug.yml).
 
-        - Search existing issues, including issues that are closed: https://github.com/google/ExoPlayer/issues?q=is%3Aissue
-        - Consult our developer website: https://exoplayer.dev/
-        - Check the supported formats: https://exoplayer.dev/supported-formats.html
-  - type: dropdown
-    attributes:
-      label: ExoPlayer Version
-      description: What version of ExoPlayer are you using?
-      options:
-        - 2.18.4
-        - 2.18.3
-        - 2.18.2
-        - 2.18.1
-        - 2.18.0
-        - 2.17.1
-        - 2.17.0
-        - 2.16.1
-        - 2.16.0
-        - 2.15.1
-        - 2.15.0
-        - 2.14.2
-        - 2.14.1
-        - 2.14.0
-        - 2.13.3
-        - Older (unsupported)
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Devices that reproduce the issue
-      placeholder: |
-        Example:
-        * Pixel 4 running Android 12
-        * Samsung S21 running Android 11
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Devices that do not reproduce the issue
-      placeholder: |
-        Example:
-        * Pixel 3 running Android Pie
-  - type: dropdown
-    attributes:
-      label: Reproducible in the demo app?
-      description: Please try and reproduce the issue in the [ExoPlayer demo app](https://exoplayer.dev/demo-application.html).
-      options:
-        - "Yes"
-        - "No"
-        - Not tested
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Reproduction steps
-      description: Clear and complete steps we can use to reproduce the problem
-      placeholder: |
-        Example:
-        1. Play the attached media in the demo app
-        2. Seek forward 10s
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Expected result
-      placeholder: |
-        Example:
-        The media plays successfully
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Actual result
-      placeholder: |
-        Example:
-        Playback crashes with the following stack trace:
-        ...
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: Media
-      description: |
-        Media we can use to reproduce the problem. Either:
-        * 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 [email protected] 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.
-    validations:
-      required: true
-  - type: checkboxes
-    attributes:
-      label: Bug Report
-      description: |
-        After filing this issue please run `adb bugreport` shortly after reproducing the problem (ideally in the [demo app](https://exoplayer.dev/demo-application.html)) to capture a zip file, and email this to [email protected] 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 [email protected] after filing this issue.
+      We will continue to update and reply to existing issues in this repository
+      and will keep existing feature requests active.
+- type: textarea
+  attributes:
+    label: Bug
+  validations:
+    required: true

.github/ISSUE_TEMPLATE/feature_request.md

@@ -6,23 +6,10 @@ labels: enhancement, needs triage
 assignees: ''
 ---
 
-Before filing a feature request:
------------------------
-- Search existing open issues, specifically with the label ‘enhancement’:
-  https://github.com/google/ExoPlayer/labels/enhancement
-- Search existing pull requests: https://github.com/google/ExoPlayer/pulls
+**Please do not file new issues in this repository.**
 
-When filing a feature request:
------------------------
-Replace the content in the sections below.
+All new feature requests should be filed in the
+[Media3 issue tracker](https://github.com/androidx/media/issues/new?template=feature_request.md).
 
-### [REQUIRED] Use case description
-Describe the use case or problem you are trying to solve in detail. If there are
-any standards or specifications involved, please provide the relevant details.
-
-### Proposed solution
-A clear and concise description of your proposed solution, if you have one.
-
-### Alternatives considered
-A clear and concise description of any alternative solutions you considered,
-if applicable.
+We will continue to update and reply to existing issues in this repository and
+will keep existing feature requests active.

.github/ISSUE_TEMPLATE/question.md

@@ -6,38 +6,10 @@ labels: question, needs triage
 assignees: ''
 ---
 
-Unfortunately we can't answer all questions. Unclear questions or questions with
-insufficient information may not get attention.
+**Please do not file new issues in this repository.**
 
-Before filing a question:
--------------------------
+All new questions should be filed in the
+[Media3 issue tracker](https://github.com/androidx/media/issues/new?template=question.md).
 
-- Ask general Android development questions on Stack Overflow
-- Search existing issues, including issues that are closed
-  https://github.com/google/ExoPlayer/issues?q=is%3Aissue
-- Consult our developer website (https://exoplayer.dev/) and Javadoc
-  (https://exoplayer.dev/doc/reference/)
-
-When filing a question:
--------------------------
-
-Describe your question in detail.
-
-In case your question refers to a problem you are seeing in your app:
-
-- Output of running `$ adb bugreport` in the console
-
-In case your question is related to a piece of media:
-
-- URI to test content
-- For protected content:
-  - DRM scheme and license server URL
-  - Authentication HTTP headers
-
-Don't forget to check supported formats and devices
-(https://exoplayer.dev/supported-formats.html).
-
-If there's something you don't want to post publicly, please submit the issue,
-then email the link/bug report to [email protected] using a subject in the
-format "Issue #1234", where #1234 is your issue number (we don't reply to
-emails).
+We will continue to update and reply to existing issues in this repository and
+will keep existing feature requests active.

CONTRIBUTING.md

@@ -2,40 +2,7 @@
 
 ## Reporting issues ##
 
-We use the [GitHub issue tracker](https://github.com/google/ExoPlayer/issues)
-to track bugs, feature requests and questions.
-
-Before filing a new issue, please search the tracker to check if it's already
-covered by an existing report. Avoiding duplicates helps us maximize the time we
-can spend fixing bugs and adding new features.
-
-When filing an issue, be sure to provide enough information for us to
-efficiently diagnose and reproduce the problem. In particular, please include
-all of the information requested in the issue template.
-
-## Pull requests ##
-
-We will also consider high quality pull requests. These should merge
-into the `dev-v2` branch. Before a pull request can be accepted you must submit
-a Contributor License Agreement, as described below.
-
-## Contributor license agreement ##
-
-Contributions to any Google project must be accompanied by a Contributor
-License Agreement. This is not a copyright **assignment**, it simply gives
-Google permission to use and redistribute your contributions as part of the
-project.
-
-  * If you are an individual writing original source code and you're sure you
-    own the intellectual property, then you'll need to sign an [individual
-    CLA][].
-
-  * If you work for a company that wants to allow you to contribute your work,
-    then you'll need to sign a [corporate CLA][].
-
-You generally only need to submit a CLA once, so if you've already submitted
-one (even if it was for a different project), you probably don't need to do it
-again.
-
-[individual CLA]: https://developers.google.com/open-source/cla/individual
-[corporate CLA]: https://developers.google.com/open-source/cla/corporate
+The ExoPlayer project is now developed as part of the
+[AndroidX Media](https://github.com/androidx/media/blob/release/CONTRIBUTING.md)
+project. Please use that project to file bugs, feature requests, questions and
+pull requests.

README.md

@@ -1,27 +1,35 @@
 # ExoPlayer <img src="https://img.shields.io/github/v/release/google/ExoPlayer.svg?label=latest"/>
 
-ExoPlayer is an application level media player for Android. It provides an
-alternative to Android’s MediaPlayer API for playing audio and video both
-locally and over the Internet. ExoPlayer supports features not currently
-supported by Android’s MediaPlayer API, including DASH and SmoothStreaming
-adaptive playbacks. Unlike the MediaPlayer API, ExoPlayer is easy to customize
-and extend, and can be updated through Play Store application updates.
+ExoPlayer is an application level media player for Android. The latest version
+is published as part of [AndroidX Media][] under a new package name and all
+future development will be in that project.
+
+Please refer to our [migration guide and script][] to move your codebase to the
+Media3 package names.
+
+[AndroidX Media]: https://github.com/androidx/media
+[migration guide and script]: https://developer.android.com/guide/topics/media/media3/getting-started/migration-guide
 
 ## Documentation
 
-* The [developer guide][] provides a wealth of information.
-* The [class reference][] documents ExoPlayer classes.
-* The [release notes][] document the major changes in each release.
-* Follow our [developer blog][] to keep up to date with the latest ExoPlayer
-  developments!
+*   The [developer guide][] provides a wealth of information.
+*   The [class reference][] documents ExoPlayer classes. Note that the classes
+    are documented with their Media3 package names.
+*   The [release notes][] document the major changes in each release.
+*   Follow our [developer blog][] to keep up to date with the latest ExoPlayer
+    developments!
 
-[developer guide]: https://exoplayer.dev/guide.html
-[class reference]: https://exoplayer.dev/doc/reference
+[developer guide]: https://developer.android.com/guide/topics/media/exoplayer
+[class reference]: https://developer.android.com/reference/androidx/media3/common/package-summary
 [release notes]: https://github.com/google/ExoPlayer/blob/release-v2/RELEASENOTES.md
 [developer blog]: https://medium.com/google-exoplayer
 
 ## Using ExoPlayer
 
+Please refer to
+[AndroidX Media](https://github.com/androidx/media/blob/release/README.md) for
+the usage instructions of the latest release.
+
 ExoPlayer modules can be obtained from [the Google Maven repository][]. It's
 also possible to clone the repository and depend on the modules locally.
 
@@ -125,16 +133,3 @@ implementation project(':exoplayer-library-core')
 implementation project(':exoplayer-library-dash')
 implementation project(':exoplayer-library-ui')
 ```
-
-## Developing ExoPlayer
-
-#### Project branches
-
-* Development work happens on the `dev-v2` branch. Pull requests should
-  normally be made to this branch.
-* The `release-v2` branch holds the most recent release.
-
-#### Using Android Studio
-
-To develop ExoPlayer using Android Studio, simply open the ExoPlayer project in
-the root directory of the repository.

RELEASENOTES.md

@@ -1,5 +1,12 @@
 # Release notes
 
+### 2.18.5 (2023-03-22)
+
+This release corresponds to the
+[AndroidX Media3 1.0.0 release](https://github.com/androidx/media/releases/tag/1.0.0).
+
+There are no changes since 2.18.4.
+
 ### 2.18.4 (2023-03-02)
 
 This release corresponds to the

constants.gradle

@@ -13,8 +13,8 @@
 // limitations under the License.
 project.ext {
     // ExoPlayer version and version code.
-    releaseVersion = '2.18.4'
-    releaseVersionCode = 2_018_004
+    releaseVersion = '2.18.5'
+    releaseVersionCode = 2_018_005
     minSdkVersion = 16
     appTargetSdkVersion = 33
     // API version before restricting local file access.

docs/ad-insertion.md

@@ -2,6 +2,10 @@
 title: Ad insertion
 ---
 
+This documentation may be out-of-date. Please refer to the
+[documentation for the latest ExoPlayer release][] on developer.android.com.
+{:.info}
+
 ExoPlayer can be used for both client-side and server-side ad insertion.
 
 ## Client-side ad insertion ##
@@ -310,10 +314,11 @@ metadata.
 
 Often, server-side inserted ad streams contain timed events to notify the player
 about ad metadata. Please see [supported formats][] for information on what
-timed metadata formats are supported by ExoPlayer. Custom ads SDK `MediaSource`s
-can listen for timed metadata events from the player, e.g., via
-`ExoPlayer.addMetadataOutput`.
+timed metadata formats are supported by ExoPlayer. Custom ads SDK `MediaSource`
+implementations can listen for timed metadata events from the player via
+`Player.Listener.onMetadata`.
 
+[documentation for the latest ExoPlayer release]: https://developer.android.com/guide/topics/media/exoplayer/ad-insertion
 [VAST]: https://www.iab.com/wp-content/uploads/2015/06/VASTv3_0.pdf
 [VMAP]: https://www.iab.com/guidelines/digital-video-multiple-ad-playlist-vmap-1-0-1/
 [ExoPlayer UI components]: {{ site.baseurl }}/ui-components.html

docs/analytics.md

@@ -2,6 +2,10 @@
 title: Analytics
 ---
 
+This documentation may be out-of-date. Please refer to the
+[documentation for the latest ExoPlayer release][] on developer.android.com.
+{:.info}
+
 ExoPlayer supports a wide range of playback analytics needs. Ultimately,
 analytics is about collecting, interpreting, aggregating and summarizing data
 from playbacks. This data can be used either on the device, for example for
@@ -260,5 +264,6 @@ player.addAnalyticsListener(new ExtendedListener() {
 ~~~
 {: .language-java}
 
+[documentation for the latest ExoPlayer release]: https://developer.android.com/guide/topics/media/exoplayer/analytics
 [`PlaybackStats` Javadoc]: {{ site.exo_sdk }}/analytics/PlaybackStats.html
 [aggregate the analytics data]: {{ site.baseurl }}/analytics.html#aggregate-analytics-data-of-multiple-playbacks

docs/battery-consumption.md

@@ -2,6 +2,10 @@
 title: Battery consumption
 ---
 
+This documentation may be out-of-date. Please refer to the
+[documentation for the latest ExoPlayer release][] on developer.android.com.
+{:.info}
+
 ## How important is battery consumption due to media playback? ##
 
 Avoiding unnecessary battery consumption is an important aspect of developing a
@@ -73,4 +77,5 @@ the increased power consumption for audio only use cases on older devices is
 something an app developer must decide, taking their requirements and app usage
 patterns into account.
 
+[documentation for the latest ExoPlayer release]: https://developer.android.com/guide/topics/media/exoplayer/battery-consumption
 [Monsoon power monitor]: https://www.msoon.com/battery-configuration