351-Rebase Attempt for ffmpeg stability fixes #531
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sometimes when restarting the camera ffmpeg hung itself in some state, when calling avformat_open_input, which seemed to last forever. - Reopen stream if av_read_frame returns EOF Sometimes ffmpeg starts returning an EOF error when calling av_read_frame. Once this happens it seems no more images will ever be captured. - Reopen stream if av_read_frame returns -110 Means something like Connection failed; cant remember. Anyway. Once this happens it seems no more images will ever be captured.
…av_open_input_file.
… define if it exists.
- don't spawn a new thread for every attempt to open a stream while reconnecting.
|
I compared this pull request to my local version (which i merged into ZoneMinder/master manually), and we've gotten the same results. |
knight-of-ni
pushed a commit
that referenced
this pull request
Nov 13, 2014
351-Rebase Attempt for ffmpeg stability fixes
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
zm_ffmpeg_camera.cpp was the biggest issue here as @Sune1337 had done some cleanup into functions and merge struggles to make sense of structural changes. Anyway I thought I would put this up here as an option to get #351 in.
I find sometimes rebase is a better option for a stale pull request as it reapplies the commits in the pull request to the current master, as opposed the the merge which brings all the changes since the pull was created into the pull branch.
Anyone who wants to check this out locally as the changed file view in Github is struggling with the structural changes also. https://help.github.com/articles/checking-out-pull-requests-locally/
If you work out how to merge #351 let me know and I can delete this request.