Fix Segfault if SAF is used with concat demuxer #846
Merged
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.
Description
If Storage Access Framework protocol is used with concat demuxer (https://trac.ffmpeg.org/wiki/Concatenate#demuxer) - ffmpeg-kit segfaults as
saf_open
andsaf_close
are called from a separate ffmpeg thread that is not attached with JNI and there are no checks ifGetEnv
was successful.This PR adds code to attach/detach thread in
saf_open
andsaf_close
that fixes said segfault. After this change concat demuxer works with SAF with no further issues.Type of Change
Checks
Android
is relevant for SAF)Tests (in Android code)
mylist.txt
) with said SAF links (even one saf link here is enough to cause segfault):ffmpeg -y -f concat -safe 0 -protocol_whitelist saf,file,crypto -i mylist.txt -c copy saf:3.mp4
Segfault will occur (if fix was not applied).