Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "[Backport][Android] pause audio playback when headphone is disconnected" #17868

Merged
merged 1 commit into from May 19, 2020
Merged

Revert "[Backport][Android] pause audio playback when headphone is disconnected" #17868

merged 1 commit into from May 19, 2020

Conversation

matthuisman
Copy link
Contributor

@matthuisman matthuisman commented May 14, 2020

This reverts commit 46d79a9.
from the PR here: #17541
which is a backport of this PR: #17030

This commit is causing Kodi to pause playback on frame-rate switches after content is playing (late switch)

Discussion here
xbmc/inputstream.adaptive#440 (comment)

Confirmed fix here:
xbmc/inputstream.adaptive#440 (comment)
https://www.kodinerds.net/index.php/Thread/67624-Disney-Addon/?postID=590508#post590508

To reproduce the issue - use either Leia or Matrix nightly on Android.
Set frame-rate switch time to 6 seconds.
Play content with different frame-rate - observe kodi pauses after the framerate switch

You can also get same behaviour when content is playing, going into kodi settings and changing frame-rate

Test builds with this commit reverted

ARM:
https://jenkins.kodi.tv/job/Android-ARM/18067/artifact/kodi-20200514-ee2959ce-PR17868-merge-armeabi-v7a.apk

ARM64:
https://jenkins.kodi.tv/job/Android-ARM64/14703/artifact/kodi-20200514-ee2959ce-PR17868-merge-arm64-v8a.apk

Should I also do PR to revert the Matrix commit?
Or leave it and give the author a chance to update?
18.7 is close - so think it's safer to remove from Leia

Description

Motivation and Context

How Has This Been Tested?

Kodi 18.7 built without the commit tested vs Kodi 18.7 with the commit by user on Nvidia shield.
Confirmed using the build without the commit (and also Kodi 18.6) that the issue does not happen

Screenshots (if appropriate):

Types of change

  • Bug fix (non-breaking change which fixes an issue)
  • Clean up (non-breaking change which removes non-working, unmaintained functionality)
  • Improvement (non-breaking change which improves existing functionality)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that will cause existing functionality to change)
  • Cosmetic change (non-breaking change that doesn't touch code)
  • None of the above (please explain below)

Checklist:

  • My code follows the Code Guidelines of this project
  • My change requires a change to the documentation, either Doxygen or wiki
  • I have updated the documentation accordingly
  • I have read the Contributing document
  • I have added tests to cover my change
  • All new and existing tests passed

@matthuisman
Copy link
Contributor Author

matthuisman commented May 14, 2020

@jenkins4kodi build android

@phunkyfish
Copy link
Contributor

We would only revert this if another solution is not found before the release gets cut.

Hopefully a fix can be found before that.

@matthuisman
Copy link
Contributor Author

@phunkyfish
Sorry, I was getting confused between the PRs :)

I thought for some reason I had done a revert PR on matrix and that got merged - but I was looking at the original PR.

@DaveTBlake DaveTBlake added v18 Leia Type: Fix non-breaking change which fixes an issue labels May 19, 2020
@DaveTBlake
Copy link
Member

DaveTBlake commented May 19, 2020

The backport #17541 of improvement #17030 should never have happened, and is causing a regression. I have no hesitation in reverting this Leia change.

@DaveTBlake DaveTBlake added this to the Leia 18.7 milestone May 19, 2020
@matthuisman matthuisman changed the title Revert "[Android] pause audio playback when headphone is disconnected" Revert Leia "[Android] pause audio playback when headphone is disconnected" May 19, 2020
@matthuisman matthuisman changed the title Revert Leia "[Android] pause audio playback when headphone is disconnected" Revert Leia "[Backport][Android] pause audio playback when headphone is disconnected" May 19, 2020
@matthuisman matthuisman changed the title Revert Leia "[Backport][Android] pause audio playback when headphone is disconnected" Revert "[Backport][Android] pause audio playback when headphone is disconnected" May 19, 2020
@DaveTBlake
Copy link
Member

jenkins build this please

@DaveTBlake DaveTBlake merged commit cccfc56 into xbmc:Leia May 19, 2020
@matthuisman matthuisman deleted the leia_no_noisy_revert branch May 19, 2020 20:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Type: Fix non-breaking change which fixes an issue v18 Leia
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants