From 9f3868d6a07ba4baf1b73aa1239800f72ab9dacc Mon Sep 17 00:00:00 2001 From: Ian Baker Date: Tue, 15 Mar 2022 16:39:10 +0000 Subject: [PATCH 1/3] Rename ServerSideInsertedAdsMediaSource in the dev guide It was renamed to ServerSideAdInsertionMediaSource in https://github.com/google/ExoPlayer/commit/cbceb2a275c29ddc044d42b9896b8d0d49ba305f --- docs/ad-insertion.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/ad-insertion.md b/docs/ad-insertion.md index 99bc0af08ba..33a50c158b4 100644 --- a/docs/ad-insertion.md +++ b/docs/ad-insertion.md @@ -301,7 +301,7 @@ provide a custom `MediaSource` that accepts URIs with the `ssai://` scheme similar to `ImaServerSideAdInsertionMediaSource`. The actual logic of creating the ad structure can be delegated to the general -purpose `ServerSideInsertedAdsMediaSource`, which wraps a stream `MediaSource` +purpose `ServerSideAdInsertionMediaSource`, which wraps a stream `MediaSource` and allows the user to set and update the `AdPlaybackState` representing the ad metadata. From a308c691d120e0b8496b2e843635edd9cc7dcef0 Mon Sep 17 00:00:00 2001 From: ibaker Date: Fri, 25 Mar 2022 10:57:57 +0000 Subject: [PATCH 2/3] Switch the bug template to a form Also force people to use one of the templates Documentation: https://docs.github.com/en/communities/using-templates-to-encourage-useful-issues-and-pull-requests/syntax-for-issue-forms PiperOrigin-RevId: 437210882 (cherry picked from commit e11d105f393f98908f8650e4d3dc6720876d7bd1) --- .github/ISSUE_TEMPLATE/bug.md | 44 ------------ .github/ISSUE_TEMPLATE/bug.yml | 108 ++++++++++++++++++++++++++++++ .github/ISSUE_TEMPLATE/config.yml | 1 + 3 files changed, 109 insertions(+), 44 deletions(-) delete mode 100644 .github/ISSUE_TEMPLATE/bug.md create mode 100644 .github/ISSUE_TEMPLATE/bug.yml create mode 100644 .github/ISSUE_TEMPLATE/config.yml diff --git a/.github/ISSUE_TEMPLATE/bug.md b/.github/ISSUE_TEMPLATE/bug.md deleted file mode 100644 index e56037b4446..00000000000 --- a/.github/ISSUE_TEMPLATE/bug.md +++ /dev/null @@ -1,44 +0,0 @@ ---- -name: Bug report -about: Issue template for a bug report. -title: '' -labels: bug, needs triage -assignees: '' ---- - -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/google/ExoPlayer/issues?q=is%3Aissue -- Consult our developer website: https://exoplayer.dev/ -- Check the supported formats: https://exoplayer.dev/supported-formats.html -- Try playing problematic media in the demo app: - http://exoplayer.dev/demo-application.html - -When reporting a bug: -------------------------- - -Describe how the issue can be reproduced, ideally using the ExoPlayer demo app -or a small sample app that you’re able to share as source code on GitHub. To -increase the chance of your issue getting attention, please also include: - -- Clear reproduction steps including observed and expected behavior -- Output of running "adb bugreport" in the console shortly after encountering - the issue -- URI to test content for reproduction -- For protected content: - - DRM scheme and license server URL - - Authentication HTTP headers - -- ExoPlayer version number -- Android version -- Android device - -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). diff --git a/.github/ISSUE_TEMPLATE/bug.yml b/.github/ISSUE_TEMPLATE/bug.yml new file mode 100644 index 00000000000..5d7f107c5f2 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/bug.yml @@ -0,0 +1,108 @@ +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. + + Before filing a bug: + ------------------------- + + - 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.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 dev.exoplayer@gmail.com with subject 'Issue #\' 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 dev.exoplayer@gmail.com with subject 'Issue #\'. + + **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. diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml new file mode 100644 index 00000000000..3ba13e0cec6 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -0,0 +1 @@ +blank_issues_enabled: false From ea8f6a1fe9235464b317429195d6f6e11e9e7ed3 Mon Sep 17 00:00:00 2001 From: ybai001 Date: Wed, 8 Jun 2022 11:08:10 +0800 Subject: [PATCH 3/3] Add decoder 7.1.4 output channel support Since Android 12L, Android adds spatialization support. Decoder will output 7.1.4ch PCM to get better immersive experience, e.g. Dolby DD+JOC decoder. --- .../src/main/java/com/google/android/exoplayer2/util/Util.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/library/common/src/main/java/com/google/android/exoplayer2/util/Util.java b/library/common/src/main/java/com/google/android/exoplayer2/util/Util.java index f32b869607c..ae25483f4f7 100644 --- a/library/common/src/main/java/com/google/android/exoplayer2/util/Util.java +++ b/library/common/src/main/java/com/google/android/exoplayer2/util/Util.java @@ -1644,6 +1644,9 @@ public static int getAudioTrackChannelConfig(int channelCount) { // 8 ch output is not supported before Android L. return AudioFormat.CHANNEL_INVALID; } + case 12: + return Util.SDK_INT >= 32 ? AudioFormat.CHANNEL_OUT_7POINT1POINT4 + : AudioFormat.CHANNEL_INVALID; default: return AudioFormat.CHANNEL_INVALID; }