Fix memory leaks in FFmpegController, #1720 #3461
Conversation
The method `getPeeksForFile` in `FFmpegController` is leaking memory when generating thumbnails. This commit will: - Add a `@try-@finally` block in the while loop to free the packet - Replace `av_free` by `av_frame_free`, when freeing an `AVFrame` - Add a call to `sws_freeContext` to free the `SwsContext` - Replace deprecated method `avcodec_close` with `avcodec_free_context` - Add `nullable` annotation to declaration of `probeVideoInfoForFile` This is a stopgap fix and does not address all of the potential leaks in the method. This commit focuses on the leaks that occur during the normal flow when generating thumbnails. Error flows will still leak memory. At some point this method should be refactored to always properly free memory.
|
I'm expecting significant merge conflicts between this PR and #3566. The HDR PR has a lot of changes to FFmpegControler.m including some, but not all of the fixes for memory leaks in this PR. I suggest getting that PR merged first and then having me deal with resolving merge conflicts in this PR. |
|
Hi @CarterLi, I think I went through the hard times; I'm resuming the development and handling outstanding PRs these days. Eight PRs have been merged and I expect a new release soon. Are you still interested in implementing HDR in IINA? If you could prepare a PR, I will be able to finish the review within three days. In this case, please include only the implementation part (changes to the video layer and probably the inspector), and add a follow-up PR later for the preference/menu/UI part, so that we can have fewer merge conflicts. It'd also be great if you could add PRs for your fix to #3625 and #3626. If you are too busy, I can still incorporate your previous code in IINA on my own, but that also requires your permission. Thank you very much! |
|
Seems that all changes were included in the HDR branch except for the |
The method
getPeeksForFileinFFmpegControlleris leaking memorywhen generating thumbnails. This commit will:
Add a
@try-@finallyblock in the while loop to free the packetReplace
av_freebyav_frame_free, when freeing anAVFrameAdd a call to
sws_freeContextto free theSwsContextReplace deprecated method
avcodec_closewithavcodec_free_contextAdd
nullableannotation to declaration ofprobeVideoInfoForFileThis is a stopgap fix and does not address all of the potential leaks
in the method. This commit focuses on the leaks that occur during the
normal flow when generating thumbnails. Error flows will still leak
memory. At some point this method should be refactored to always
properly free memory.
Description: