highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lavc/videotoolboxenc: flush/free frames on close

Browse Source 
Prevents encode callback from running after codec is closed.
Fixes a crash when an error is returned.

Signed-off-by: Rick Kern <kernrj@gmail.com>
This commit is contained in:
Rick Kern
2016-10-10 09:13:39 -04:00
parent 9ea91e4114
commit aa413b810a
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/videotoolboxenc.c
View File

@@ -145,6 +145,11 @@ static void set_async_error(VTEncContext *vtctx, int err)
pthread_mutex_unlock(&vtctx->lock); pthread_mutex_unlock(&vtctx->lock);
} }
static void clear_frame_queue(VTEncContext *vtctx)
{
set_async_error(vtctx, 0);
}
static int vtenc_q_pop(VTEncContext *vtctx, bool wait, CMSampleBufferRef *buf, ExtraSEI **sei) static int vtenc_q_pop(VTEncContext *vtctx, bool wait, CMSampleBufferRef *buf, ExtraSEI **sei)
{ {
BufNode *info; BufNode *info;
@@ -1966,6 +1971,9 @@ static av_cold int vtenc_close(AVCodecContext *avctx)
if(!vtctx->session) return 0; if(!vtctx->session) return 0;
VTCompressionSessionCompleteFrames(vtctx->session,
kCMTimeIndefinite);
clear_frame_queue(vtctx);
pthread_cond_destroy(&vtctx->cv_sample_sent); pthread_cond_destroy(&vtctx->cv_sample_sent);
pthread_mutex_destroy(&vtctx->lock); pthread_mutex_destroy(&vtctx->lock);
CFRelease(vtctx->session); CFRelease(vtctx->session);