generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mpegts: factorize mpegts filter creator code

Browse Source 
Signed-off-by: Marton Balint <cus@passwd.hu>
This commit is contained in:
Marton Balint
2014-03-02 14:28:06 +01:00
parent 4acc86bcfb
commit 6bab55b84c
1 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
libavformat/mpegts.c
View File

@@ -405,14 +405,10 @@ static void write_section_data(AVFormatContext *s, MpegTSFilter *tss1,
} }
} }
static MpegTSFilter *mpegts_open_section_filter(MpegTSContext *ts, static MpegTSFilter *mpegts_open_filter(MpegTSContext *ts, unsigned int pid,
unsigned int pid, enum MpegTSFilterType type)
SectionCallback *section_cb,
void *opaque,
int check_crc)
{ {
MpegTSFilter *filter; MpegTSFilter *filter;
MpegTSSectionFilter *sec;
av_dlog(ts->stream, "Filter: pid=0x%x\n", pid); av_dlog(ts->stream, "Filter: pid=0x%x\n", pid);
@@ -423,12 +419,26 @@ static MpegTSFilter *mpegts_open_section_filter(MpegTSContext *ts,
return NULL; return NULL;
ts->pids[pid] = filter; ts->pids[pid] = filter;
filter->type = MPEGTS_SECTION; filter->type = type;
filter->pid = pid; filter->pid = pid;
filter->es_id = -1; filter->es_id = -1;
filter->last_cc = -1; filter->last_cc = -1;
filter->last_pcr= -1; filter->last_pcr= -1;
return filter;
}
static MpegTSFilter *mpegts_open_section_filter(MpegTSContext *ts,
unsigned int pid,
SectionCallback *section_cb,
void *opaque,
int check_crc)
{
MpegTSFilter *filter;
MpegTSSectionFilter *sec;
if (!(filter = mpegts_open_filter(ts, pid, MPEGTS_SECTION)))
return NULL;
sec = &filter->u.section_filter; sec = &filter->u.section_filter;
sec->section_cb = section_cb; sec->section_cb = section_cb;
sec->opaque = opaque; sec->opaque = opaque;
@@ -448,17 +458,8 @@ static MpegTSFilter *mpegts_open_pes_filter(MpegTSContext *ts, unsigned int pid,
MpegTSFilter *filter; MpegTSFilter *filter;
MpegTSPESFilter *pes; MpegTSPESFilter *pes;
if (pid >= NB_PID_MAX || ts->pids[pid]) if (!(filter = mpegts_open_filter(ts, pid, MPEGTS_PES)))
return NULL; return NULL;
filter = av_mallocz(sizeof(MpegTSFilter));
if (!filter)
return NULL;
ts->pids[pid] = filter;
filter->type = MPEGTS_PES;
filter->pid = pid;
filter->es_id = -1;
filter->last_cc = -1;
pes = &filter->u.pes_filter; pes = &filter->u.pes_filter;
pes->pes_cb = pes_cb; pes->pes_cb = pes_cb;