8000 Fix CPU is consumed by OSC while hidden, #3601 by low-batt · Pull Request #3602 · iina/iina · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Fix CPU is consumed by OSC while hidden, #3601 #3602

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

Merged
merged 1 commit into from
Oct 13, 2022

Conversation

low-batt
Copy link
Contributor
@low-batt low-batt commented Jan 3, 2022

The fix in PR #3434 MUST be merged before merging this commit..

This commit will:

  • Change MainWindowController.hideUI to stop the timer that updates
    the OSC

  • Change MainWindowController.showUI to sync the UI and start the timer

  • Change PlaybackInfo.constrainVideoPosition to check that`videoPosition
    is not nil

  • This change has been discussed with the author.

  • It implements / fixes issue CPU is consumed by OSC while hidden #3601.


Description:
See issue for details. Don't miss the above note about merging PR #3434 first!

8000
The fix in PR iina#3434 MUST be merged before merging this commit..

This commit will:
- Change MainWindowController.hideUI to stop the timer that updates
  the OSC
- Change MainWindowController.showUI to sync the UI and start the timer
- Change PlaybackInfo.constrainVideoPosition to check that`videoPosition
  is not nil
@low-batt
Copy link
Contributor Author
low-batt commented Jan 4, 2022

Hold off reviewing this one. Causes a hang in mpv. Testing a fix for the fix.

@low-batt
Copy link
Contributor Author
low-batt commented Jan 10, 2022

The hang was traced to mpv and handling of FLAC files.

This "fix" is faulty and can trigger a main thread hang in mpv_get_property see the issue for more details. Closing this PR.

@low-batt low-batt closed this Jan 10, 2022
@low-batt
Copy link
Contributor Author

The concern over this change was due to a user reporting a hang immediately after this fix was merged into a fork of IINA. Eventually that hang was traced to a mpv problem with FLAC encoded files. Reopening.

@low-batt low-batt reopened this Oct 12, 2022
@uiryuu uiryuu merged commit 42b19d5 into iina:develop Oct 13, 2022
@uiryuu
Copy link
Member
uiryuu commented Oct 13, 2022

Thanks for the PR!

@low-batt low-batt deleted the fix-3601 branch October 13, 2022 19:32
@low-batt low-batt linked an issue Oct 17, 2022 that may be closed by this pull request
1 task
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

CPU is consumed by OSC while hidden
2 participants
0