diff options
author | Martin Storsjö <martin@martin.st> | 2012-12-10 16:38:32 +0400 |
---|---|---|
committer | Martin Storsjö <martin@martin.st> | 2012-12-21 16:14:40 +0400 |
commit | 90c784cc13f6bf21a8eb69f3b88b50c7a70f6c59 (patch) | |
tree | ce93cf089348b7be81dd4af2f38d35efb6be9325 /libavformat | |
parent | 0a0e340f5b8d9135540befcfa72dcf06e1a05cee (diff) |
rtpdec: Pass the sequence number to depacketizers
This allows depacketizers to figure out if packets have been lost.
Signed-off-by: Martin Storsjö <martin@martin.st>
Diffstat (limited to 'libavformat')
-rw-r--r-- | libavformat/rdt.c | 6 | ||||
-rw-r--r-- | libavformat/rtpdec.c | 5 | ||||
-rw-r--r-- | libavformat/rtpdec.h | 3 | ||||
-rw-r--r-- | libavformat/rtpdec_amr.c | 11 | ||||
-rw-r--r-- | libavformat/rtpdec_asf.c | 3 | ||||
-rw-r--r-- | libavformat/rtpdec_formats.h | 2 | ||||
-rw-r--r-- | libavformat/rtpdec_h263.c | 2 | ||||
-rw-r--r-- | libavformat/rtpdec_h263_rfc2190.c | 7 | ||||
-rw-r--r-- | libavformat/rtpdec_h264.c | 3 | ||||
-rw-r--r-- | libavformat/rtpdec_jpeg.c | 3 | ||||
-rw-r--r-- | libavformat/rtpdec_latm.c | 3 | ||||
-rw-r--r-- | libavformat/rtpdec_mpeg4.c | 3 | ||||
-rw-r--r-- | libavformat/rtpdec_qcelp.c | 3 | ||||
-rw-r--r-- | libavformat/rtpdec_qdm2.c | 3 | ||||
-rw-r--r-- | libavformat/rtpdec_qt.c | 2 | ||||
-rw-r--r-- | libavformat/rtpdec_svq3.c | 3 | ||||
-rw-r--r-- | libavformat/rtpdec_vp8.c | 11 | ||||
-rw-r--r-- | libavformat/rtpdec_xiph.c | 10 |
18 files changed, 43 insertions, 40 deletions
diff --git a/libavformat/rdt.c b/libavformat/rdt.c index 35540de4a6..77c1c8c920 100644 --- a/libavformat/rdt.c +++ b/libavformat/rdt.c @@ -293,7 +293,7 @@ ff_rdt_parse_header(const uint8_t *buf, int len, static int rdt_parse_packet (AVFormatContext *ctx, PayloadContext *rdt, AVStream *st, AVPacket *pkt, uint32_t *timestamp, - const uint8_t *buf, int len, int flags) + const uint8_t *buf, int len, uint16_t rtp_seq, int flags) { int seq = 1, res; AVIOContext pb; @@ -348,7 +348,7 @@ ff_rdt_parse_packet(RDTDemuxContext *s, AVPacket *pkt, timestamp= 0; ///< Should not be used if buf is NULL, but should be set to the timestamp of the packet returned.... rv= s->parse_packet(s->ic, s->dynamic_protocol_context, s->streams[s->prev_stream_id], - pkt, ×tamp, NULL, 0, flags); + pkt, ×tamp, NULL, 0, 0, flags); return rv; } @@ -375,7 +375,7 @@ ff_rdt_parse_packet(RDTDemuxContext *s, AVPacket *pkt, rv = s->parse_packet(s->ic, s->dynamic_protocol_context, s->streams[s->prev_stream_id], - pkt, ×tamp, buf, len, flags); + pkt, ×tamp, buf, len, 0, flags); return rv; } diff --git a/libavformat/rtpdec.c b/libavformat/rtpdec.c index b83a79bdbb..10439305dd 100644 --- a/libavformat/rtpdec.c +++ b/libavformat/rtpdec.c @@ -539,7 +539,7 @@ static int rtp_parse_packet_internal(RTPDemuxContext *s, AVPacket *pkt, return 0; } else if (s->parse_packet) { rv = s->parse_packet(s->ic, s->dynamic_protocol_context, - s->st, pkt, ×tamp, buf, len, flags); + s->st, pkt, ×tamp, buf, len, seq, flags); } else { /* At this point, the RTP header has been stripped; * This is ASSUMING that there is only 1 CSRC, which isn't wise. */ @@ -682,7 +682,8 @@ static int rtp_parse_one_packet(RTPDemuxContext *s, AVPacket *pkt, * the packet is left with pts == AV_NOPTS_VALUE */ timestamp = RTP_NOTS_VALUE; rv = s->parse_packet(s->ic, s->dynamic_protocol_context, - s->st, pkt, ×tamp, NULL, 0, flags); + s->st, pkt, ×tamp, NULL, 0, 0, + flags); finalize_packet(s, pkt, timestamp); return rv; } else { diff --git a/libavformat/rtpdec.h b/libavformat/rtpdec.h index 668a1f7c98..98e266a687 100644 --- a/libavformat/rtpdec.h +++ b/libavformat/rtpdec.h @@ -101,6 +101,7 @@ typedef struct RTPStatistics { * updated by the function if returning older, buffered data * @param buf pointer to raw RTP packet data * @param len length of buf + * @param seq RTP sequence number of the packet * @param flags flags from the RTP packet header (RTP_FLAG_*) */ typedef int (*DynamicPayloadPacketHandlerProc)(AVFormatContext *ctx, @@ -108,7 +109,7 @@ typedef int (*DynamicPayloadPacketHandlerProc)(AVFormatContext *ctx, AVStream *st, AVPacket *pkt, uint32_t *timestamp, const uint8_t * buf, - int len, int flags); + int len, uint16_t seq, int flags); struct RTPDynamicProtocolHandler { const char enc_name[50]; diff --git a/libavformat/rtpdec_amr.c b/libavformat/rtpdec_amr.c index 1e60287465..fd18ff22d4 100644 --- a/libavformat/rtpdec_amr.c +++ b/libavformat/rtpdec_amr.c @@ -51,13 +51,10 @@ static void amr_free_context(PayloadContext *data) av_free(data); } -static int amr_handle_packet(AVFormatContext *ctx, - PayloadContext *data, - AVStream *st, - AVPacket * pkt, - uint32_t * timestamp, - const uint8_t * buf, - int len, int flags) +static int amr_handle_packet(AVFormatContext *ctx, PayloadContext *data, + AVStream *st, AVPacket *pkt, uint32_t *timestamp, + const uint8_t *buf, int len, uint16_t seq, + int flags) { const uint8_t *frame_sizes = NULL; int frames; diff --git a/libavformat/rtpdec_asf.c b/libavformat/rtpdec_asf.c index 7c13b967f5..e425650696 100644 --- a/libavformat/rtpdec_asf.c +++ b/libavformat/rtpdec_asf.c @@ -168,7 +168,8 @@ struct PayloadContext { static int asfrtp_parse_packet(AVFormatContext *s, PayloadContext *asf, AVStream *st, AVPacket *pkt, uint32_t *timestamp, - const uint8_t *buf, int len, int flags) + const uint8_t *buf, int len, uint16_t seq, + int flags) { AVIOContext *pb = &asf->pb; int res, mflags, len_off; diff --git a/libavformat/rtpdec_formats.h b/libavformat/rtpdec_formats.h index c538b93cca..e449ddfac3 100644 --- a/libavformat/rtpdec_formats.h +++ b/libavformat/rtpdec_formats.h @@ -33,7 +33,7 @@ int ff_wms_parse_sdp_a_line(AVFormatContext *s, const char *p); int ff_h263_handle_packet(AVFormatContext *ctx, PayloadContext *data, AVStream *st, AVPacket *pkt, uint32_t *timestamp, - const uint8_t *buf, int len, int flags); + const uint8_t *buf, int len, uint16_t seq, int flags); extern RTPDynamicProtocolHandler ff_amr_nb_dynamic_handler; extern RTPDynamicProtocolHandler ff_amr_wb_dynamic_handler; diff --git a/libavformat/rtpdec_h263.c b/libavformat/rtpdec_h263.c index 78773b9f66..bdb5195396 100644 --- a/libavformat/rtpdec_h263.c +++ b/libavformat/rtpdec_h263.c @@ -25,7 +25,7 @@ int ff_h263_handle_packet(AVFormatContext *ctx, PayloadContext *data, AVStream *st, AVPacket *pkt, uint32_t *timestamp, - const uint8_t *buf, int len, int flags) + const uint8_t *buf, int len, uint16_t seq, int flags) { uint8_t *ptr; uint16_t header; diff --git a/libavformat/rtpdec_h263_rfc2190.c b/libavformat/rtpdec_h263_rfc2190.c index 4957b337c7..4792a9fdc5 100644 --- a/libavformat/rtpdec_h263_rfc2190.c +++ b/libavformat/rtpdec_h263_rfc2190.c @@ -57,7 +57,8 @@ static void h263_free_context(PayloadContext *data) static int h263_handle_packet(AVFormatContext *ctx, PayloadContext *data, AVStream *st, AVPacket *pkt, uint32_t *timestamp, - const uint8_t *buf, int len, int flags) + const uint8_t *buf, int len, uint16_t seq, + int flags) { /* Corresponding to header fields in the RFC */ int f, p, i, sbit, ebit, src, r; @@ -65,7 +66,7 @@ static int h263_handle_packet(AVFormatContext *ctx, PayloadContext *data, if (data->newformat) return ff_h263_handle_packet(ctx, data, st, pkt, timestamp, buf, len, - flags); + seq, flags); if (data->buf && data->timestamp != *timestamp) { /* Dropping old buffered, unfinished data */ @@ -122,7 +123,7 @@ static int h263_handle_packet(AVFormatContext *ctx, PayloadContext *data, "signalled with a static payload type.\n"); data->newformat = 1; return ff_h263_handle_packet(ctx, data, st, pkt, timestamp, buf, - len, flags); + len, seq, flags); } } diff --git a/libavformat/rtpdec_h264.c b/libavformat/rtpdec_h264.c index 7408b43101..2df0930f61 100644 --- a/libavformat/rtpdec_h264.c +++ b/libavformat/rtpdec_h264.c @@ -165,7 +165,8 @@ static int sdp_parse_fmtp_config_h264(AVStream *stream, // return 0 on packet, no more left, 1 on packet, 1 on partial packet static int h264_handle_packet(AVFormatContext *ctx, PayloadContext *data, AVStream *st, AVPacket *pkt, uint32_t *timestamp, - const uint8_t *buf, int len, int flags) + const uint8_t *buf, int len, uint16_t seq, + int flags) { uint8_t nal; uint8_t type; diff --git a/libavformat/rtpdec_jpeg.c b/libavformat/rtpdec_jpeg.c index 25bb88d0d1..ed9c86ceb9 100644 --- a/libavformat/rtpdec_jpeg.c +++ b/libavformat/rtpdec_jpeg.c @@ -219,7 +219,8 @@ static void create_default_qtables(uint8_t *qtables, uint8_t q) static int jpeg_parse_packet(AVFormatContext *ctx, PayloadContext *jpeg, AVStream *st, AVPacket *pkt, uint32_t *timestamp, - const uint8_t *buf, int len, int flags) + const uint8_t *buf, int len, uint16_t seq, + int flags) { uint8_t type, q, width, height; const uint8_t *qtables = NULL; diff --git a/libavformat/rtpdec_latm.c b/libavformat/rtpdec_latm.c index 3fa04682b8..7d4ae1e448 100644 --- a/libavformat/rtpdec_latm.c +++ b/libavformat/rtpdec_latm.c @@ -51,7 +51,8 @@ static void latm_free_context(PayloadContext *data) static int latm_parse_packet(AVFormatContext *ctx, PayloadContext *data, AVStream *st, AVPacket *pkt, uint32_t *timestamp, - const uint8_t *buf, int len, int flags) + const uint8_t *buf, int len, uint16_t seq, + int flags) { int ret, cur_len; diff --git a/libavformat/rtpdec_mpeg4.c b/libavformat/rtpdec_mpeg4.c index dda48d8972..13d051ae85 100644 --- a/libavformat/rtpdec_mpeg4.c +++ b/libavformat/rtpdec_mpeg4.c @@ -159,7 +159,8 @@ static int rtp_parse_mp4_au(PayloadContext *data, const uint8_t *buf) /* Follows RFC 3640 */ static int aac_parse_packet(AVFormatContext *ctx, PayloadContext *data, AVStream *st, AVPacket *pkt, uint32_t *timestamp, - const uint8_t *buf, int len, int flags) + const uint8_t *buf, int len, uint16_t seq, + int flags) { if (rtp_parse_mp4_au(data, buf)) return -1; diff --git a/libavformat/rtpdec_qcelp.c b/libavformat/rtpdec_qcelp.c index 56f3e17819..45a89ae4f7 100644 --- a/libavformat/rtpdec_qcelp.c +++ b/libavformat/rtpdec_qcelp.c @@ -210,7 +210,8 @@ static int return_stored_frame(AVFormatContext *ctx, PayloadContext *data, static int qcelp_parse_packet(AVFormatContext *ctx, PayloadContext *data, AVStream *st, AVPacket *pkt, uint32_t *timestamp, - const uint8_t *buf, int len, int flags) + const uint8_t *buf, int len, uint16_t seq, + int flags) { if (buf) return store_packet(ctx, data, st, pkt, timestamp, buf, len); diff --git a/libavformat/rtpdec_qdm2.c b/libavformat/rtpdec_qdm2.c index a2ce510d26..0d7b5bb87a 100644 --- a/libavformat/rtpdec_qdm2.c +++ b/libavformat/rtpdec_qdm2.c @@ -237,7 +237,8 @@ static int qdm2_restore_block(PayloadContext *qdm, AVStream *st, AVPacket *pkt) static int qdm2_parse_packet(AVFormatContext *s, PayloadContext *qdm, AVStream *st, AVPacket *pkt, uint32_t *timestamp, - const uint8_t *buf, int len, int flags) + const uint8_t *buf, int len, uint16_t seq, + int flags) { int res = AVERROR_INVALIDDATA, n; const uint8_t *end = buf + len, *p = buf; diff --git a/libavformat/rtpdec_qt.c b/libavformat/rtpdec_qt.c index 3093132672..6350507fc2 100644 --- a/libavformat/rtpdec_qt.c +++ b/libavformat/rtpdec_qt.c @@ -42,7 +42,7 @@ struct PayloadContext { static int qt_rtp_parse_packet(AVFormatContext *s, PayloadContext *qt, AVStream *st, AVPacket *pkt, uint32_t *timestamp, const uint8_t *buf, - int len, int flags) + int len, uint16_t seq, int flags) { AVIOContext pb; GetBitContext gb; diff --git a/libavformat/rtpdec_svq3.c b/libavformat/rtpdec_svq3.c index 087a1e3346..aa880e5954 100644 --- a/libavformat/rtpdec_svq3.c +++ b/libavformat/rtpdec_svq3.c @@ -41,7 +41,8 @@ struct PayloadContext { static int svq3_parse_packet (AVFormatContext *s, PayloadContext *sv, AVStream *st, AVPacket *pkt, uint32_t *timestamp, - const uint8_t *buf, int len, int flags) + const uint8_t *buf, int len, uint16_t seq, + int flags) { int config_packet, start_packet, end_packet; diff --git a/libavformat/rtpdec_vp8.c b/libavformat/rtpdec_vp8.c index 99ca60a6f7..1259eff509 100644 --- a/libavformat/rtpdec_vp8.c +++ b/libavformat/rtpdec_vp8.c @@ -36,13 +36,10 @@ struct PayloadContext { uint32_t timestamp; }; -static int vp8_handle_packet(AVFormatContext *ctx, - PayloadContext *vp8, - AVStream *st, - AVPacket *pkt, - uint32_t *timestamp, - const uint8_t *buf, - int len, int flags) +static int vp8_handle_packet(AVFormatContext *ctx, PayloadContext *vp8, + AVStream *st, AVPacket *pkt, uint32_t *timestamp, + const uint8_t *buf, int len, uint16_t seq, + int flags) { int start_partition, end_packet; int extended_bits, part_id; diff --git a/libavformat/rtpdec_xiph.c b/libavformat/rtpdec_xiph.c index 40415d8f2f..db39462f4a 100644 --- a/libavformat/rtpdec_xiph.c +++ b/libavformat/rtpdec_xiph.c @@ -70,12 +70,10 @@ static void xiph_free_context(PayloadContext * data) av_free(data); } -static int xiph_handle_packet(AVFormatContext * ctx, - PayloadContext * data, - AVStream * st, - AVPacket * pkt, - uint32_t * timestamp, - const uint8_t * buf, int len, int flags) +static int xiph_handle_packet(AVFormatContext *ctx, PayloadContext *data, + AVStream *st, AVPacket *pkt, uint32_t *timestamp, + const uint8_t *buf, int len, uint16_t seq, + int flags) { int ident, fragmented, tdt, num_pkts, pkt_len; |