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

get rid of one layer of callback obfuscation

Browse Source 
Originally committed as revision 9178 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer
2007-06-02 23:11:17 +00:00
parent b229219417
commit 9deb6d71b8
1 changed files with 4 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
libavformat/mpegts.c
View File

@@ -111,9 +111,6 @@ struct MpegTSContext {
/** list of PMTs in the last PAT seen */ /** list of PMTs in the last PAT seen */
MpegTSService **services; MpegTSService **services;
/* set service context (XXX: allocated it ?) */
SetServiceCallback *set_service_cb;
void *set_service_opaque;
/** filter for the PAT */ /** filter for the PAT */
MpegTSFilter *pat_filter; MpegTSFilter *pat_filter;
/** filter for the PMT for the MPEG program number specified by req_sid */ /** filter for the PMT for the MPEG program number specified by req_sid */
@@ -529,7 +526,7 @@ static void pmt_cb(void *opaque, const uint8_t *section, int section_len)
} }
} }
/* all parameters are there */ /* all parameters are there */
ts->set_service_cb(ts->set_service_opaque, 0); ts->stop_parse=1;
mpegts_close_filter(ts, ts->pmt_filter); mpegts_close_filter(ts, ts->pmt_filter);
ts->pmt_filter = NULL; ts->pmt_filter = NULL;
} }
@@ -573,7 +570,7 @@ static void pat_cb(void *opaque, const uint8_t *section, int section_len)
} }
} }
/* not found */ /* not found */
ts->set_service_cb(ts->set_service_opaque, -1); ts->stop_parse=1;
found: found:
mpegts_close_filter(ts, ts->pat_filter); mpegts_close_filter(ts, ts->pat_filter);
@@ -633,11 +630,8 @@ static void pat_scan_cb(void *opaque, const uint8_t *section, int section_len)
ts->pat_filter = NULL; ts->pat_filter = NULL;
} }
static void mpegts_set_service(MpegTSContext *ts, int sid, static void mpegts_set_service(MpegTSContext *ts, int sid)
SetServiceCallback *set_service_cb, void *opaque)
{ {
ts->set_service_cb = set_service_cb;
ts->set_service_opaque = opaque;
ts->req_sid = sid; ts->req_sid = sid;
ts->pat_filter = mpegts_open_section_filter(ts, PAT_PID, ts->pat_filter = mpegts_open_section_filter(ts, PAT_PID,
pat_cb, ts, 1); pat_cb, ts, 1);
@@ -1158,12 +1152,6 @@ static int mpegts_probe(AVProbeData *p)
#endif #endif
} }
static void set_service_cb(void *opaque, int ret)
{
MpegTSContext *ts = opaque;
ts->stop_parse = 1;
}
/* return the 90 kHz PCR and the extension for the 27 MHz PCR. return /* return the 90 kHz PCR and the extension for the 27 MHz PCR. return
(-1) if not available */ (-1) if not available */
static int parse_pcr(int64_t *ppcr_high, int *ppcr_low, static int parse_pcr(int64_t *ppcr_high, int *ppcr_low,
@@ -1266,7 +1254,7 @@ static int mpegts_read_header(AVFormatContext *s,
otherwise try to filter all PATs */ otherwise try to filter all PATs */
url_fseek(pb, pos, SEEK_SET); url_fseek(pb, pos, SEEK_SET);
mpegts_set_service(ts, sid, set_service_cb, ts); mpegts_set_service(ts, sid);
handle_packets(ts, s->probesize); handle_packets(ts, s->probesize);
} }