stv0g/tvheadend
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Add propper locking around ffmpeg codec open/close.

Browse source 
Fixes #58
This commit is contained in:
Andreas Öman 2009-06-03 19:29:59 +00:00
parent 1c2168f754
commit 1aa37cf1b5
4 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/dvr/dvr_rec.c
View file

@ -253,7 +253,7 @@ dvr_rec_start(dvr_entry_t *de, htsmsg_t *m)
enum CodecType codec_type;
const char *codec_name;
char urlname[512];
int err;
int err, r;
htsmsg_field_t *f;
htsmsg_t *sub, *streams;
const char *type, *lang;
@ -356,7 +356,11 @@ dvr_rec_start(dvr_entry_t *de, htsmsg_t *m)
ctx->codec_id = codec_id;
ctx->codec_type = codec_type;
if(avcodec_open(ctx, codec) < 0) {
pthread_mutex_lock(&ffmpeg_lock);
r = avcodec_open(ctx, codec);
pthread_mutex_unlock(&ffmpeg_lock);
if(r < 0) {
tvhlog(LOG_ERR, "dvr",
"%s - Cannot open codec for %s, ignoring stream",
de->de_ititle, codec_name);
@ -703,7 +707,9 @@ dvr_thread_epilog(dvr_entry_t *de)
for(i = 0; i < fctx->nb_streams; i++) {
st = fctx->streams[i];
pthread_mutex_lock(&ffmpeg_lock);
avcodec_close(st->codec);
pthread_mutex_unlock(&ffmpeg_lock);
free(st->codec);
free(st);
}

3
src/main.c
View file

@ -60,6 +60,7 @@ extern const char *htsversion_full;
time_t dispatch_clock;
static LIST_HEAD(, gtimer) gtimers;
pthread_mutex_t global_lock;
pthread_mutex_t ffmpeg_lock;
static void
handle_sigpipe(int x)
@ -290,6 +291,8 @@ main(int argc, char **argv)
hts_settings_init("tvheadend", homedir);
pthread_mutex_init(&ffmpeg_lock, NULL);
pthread_mutex_init(&global_lock, NULL);
pthread_mutex_lock(&global_lock);

9
src/transports.c
View file

@ -86,8 +86,11 @@ transport_stop(th_transport_t *t)
if(st->st_parser != NULL)
av_parser_close(st->st_parser);
if(st->st_ctx != NULL)
if(st->st_ctx != NULL) {
pthread_mutex_lock(&ffmpeg_lock);
avcodec_close(st->st_ctx);
pthread_mutex_unlock(&ffmpeg_lock);
}
av_free(st->st_ctx);
@ -244,8 +247,10 @@ transport_start(th_transport_t *t, unsigned int weight, int force_start)
c = avcodec_find_decoder(id);
if(c != NULL) {
st->st_ctx = avcodec_alloc_context();
pthread_mutex_lock(&ffmpeg_lock);
avcodec_open(st->st_ctx, c);
st->st_parser = av_parser_init(id);
pthread_mutex_unlock(&ffmpeg_lock);
st->st_parser = av_parser_init(id);
} else {
abort();
}

1
src/tvhead.h
View file

@ -37,6 +37,7 @@
#include "redblack.h"
extern pthread_mutex_t global_lock;
extern pthread_mutex_t ffmpeg_lock;
static inline void
lock_assert0(pthread_mutex_t *l, const char *file, int line)