Mercurial > libavformat.hg

comparison mpegts.c @ 2236:117edddfce20 libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
update SectionCallback and PESCallback typedefs to match functions
author mru
date Sun, 08 Jul 2007 13:42:51 +0000
parents 3427d0c63a32
children 6831f12fbf76
comparison
equal deleted inserted replaced
2235:18074bcfb54d 2236:117edddfce20
41 enum MpegTSFilterType { 41 enum MpegTSFilterType {
42 MPEGTS_PES, 42 MPEGTS_PES,
43 MPEGTS_SECTION, 43 MPEGTS_SECTION,
44 }; 44 };
45 45
46 typedef void PESCallback(void *opaque, const uint8_t *buf, int len, int is_start); 46 typedef struct MpegTSFilter MpegTSFilter;
47
48 typedef void PESCallback(MpegTSFilter *f, const uint8_t *buf, int len, int is_start);
47 49
48 typedef struct MpegTSPESFilter { 50 typedef struct MpegTSPESFilter {
49 PESCallback *pes_cb; 51 PESCallback *pes_cb;
50 void *opaque; 52 void *opaque;
51 } MpegTSPESFilter; 53 } MpegTSPESFilter;
52 54
53 typedef void SectionCallback(void *opaque, const uint8_t *buf, int len); 55 typedef void SectionCallback(MpegTSFilter *f, const uint8_t *buf, int len);
54 56
55 typedef void SetServiceCallback(void *opaque, int ret); 57 typedef void SetServiceCallback(void *opaque, int ret);
56 58
57 typedef struct MpegTSSectionFilter { 59 typedef struct MpegTSSectionFilter {
58 int section_index; 60 int section_index;
62 int end_of_section_reached:1; 64 int end_of_section_reached:1;
63 SectionCallback *section_cb; 65 SectionCallback *section_cb;
64 void *opaque; 66 void *opaque;
65 } MpegTSSectionFilter; 67 } MpegTSSectionFilter;
66 68
67 typedef struct MpegTSFilter { 69 struct MpegTSFilter {
68 int pid; 70 int pid;
69 int last_cc; /* last cc code (-1 if first packet) */ 71 int last_cc; /* last cc code (-1 if first packet) */
70 enum MpegTSFilterType type; 72 enum MpegTSFilterType type;
71 union { 73 union {
72 MpegTSPESFilter pes_filter; 74 MpegTSPESFilter pes_filter;
73 MpegTSSectionFilter section_filter; 75 MpegTSSectionFilter section_filter;
74 } u; 76 } u;
75 } MpegTSFilter; 77 };
76 78
77 typedef struct MpegTSService { 79 typedef struct MpegTSService {
78 int running:1; 80 int running:1;
79 int sid; /**< MPEG Program Number of stream */ 81 int sid; /**< MPEG Program Number of stream */
80 char *provider_name; /**< DVB Network name, "" if not DVB stream */ 82 char *provider_name; /**< DVB Network name, "" if not DVB stream */