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

No longer need FFmpeg parsers

Browse source
This commit is contained in:
Andreas Öman 2010-06-23 21:33:52 +00:00
parent 4146e3c677
commit 5f77e67b3e
2 changed files with 0 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
src/transports.c
View file

@ -60,9 +60,6 @@ static void transport_data_timeout(void *aux);
static void static void
stream_init(th_stream_t *st) stream_init(th_stream_t *st)
{ {
AVCodec *c;
enum CodecID id;
st->st_cc_valid = 0; st->st_cc_valid = 0;
st->st_startcond = 0xffffffff; st->st_startcond = 0xffffffff;
@ -74,32 +71,6 @@ stream_init(th_stream_t *st)
st->st_pcr_last = AV_NOPTS_VALUE; st->st_pcr_last = AV_NOPTS_VALUE;
st->st_pcr_drift = 0; st->st_pcr_drift = 0;
st->st_pcr_recovery_fails = 0; st->st_pcr_recovery_fails = 0;
/* Open ffmpeg context and parser */
switch(st->st_type) {
case SCT_MPEG2VIDEO: id = CODEC_ID_MPEG2VIDEO; break;
case SCT_MPEG2AUDIO: id = CODEC_ID_MP3; break;
case SCT_H264: id = CODEC_ID_H264; break;
case SCT_AC3: id = CODEC_ID_AC3; break;
default: id = CODEC_ID_NONE; break;
}
assert(st->st_ctx == NULL);
assert(st->st_parser == NULL);
if(id == CODEC_ID_NONE)
return;
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);
pthread_mutex_unlock(&ffmpeg_lock);
st->st_parser = av_parser_init(id);
} else {
abort();
}
} }
@ -115,20 +86,6 @@ stream_clean(th_stream_t *st)
st->st_demuxer_fd = -1; st->st_demuxer_fd = -1;
} }
if(st->st_parser != NULL)
av_parser_close(st->st_parser);
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);
st->st_parser = NULL;
st->st_ctx = NULL;
free(st->st_priv); free(st->st_priv);
st->st_priv = NULL; st->st_priv = NULL;

7
src/tvhead.h
View file

@ -435,13 +435,6 @@ typedef struct th_stream {
int st_meta_change; int st_meta_change;
/* Codec */
struct AVCodecContext *st_ctx;
struct AVCodecParserContext *st_parser;
/* CA ID's on this stream */ /* CA ID's on this stream */
struct caid_list st_caids; struct caid_list st_caids;