|
|
|
@ -291,7 +291,7 @@ RTPDemuxContext *rtp_parse_open(AVFormatContext *s1, AVStream *st, URLContext *r |
|
|
|
|
s->rtp_payload_data = rtp_payload_data; |
|
|
|
|
rtp_init_statistics(&s->statistics, 0); // do we know the initial sequence from sdp?
|
|
|
|
|
if (!strcmp(ff_rtp_enc_name(payload_type), "MP2T")) { |
|
|
|
|
s->ts = mpegts_parse_open(s->ic); |
|
|
|
|
s->ts = ff_mpegts_parse_open(s->ic); |
|
|
|
|
if (s->ts == NULL) { |
|
|
|
|
av_free(s); |
|
|
|
|
return NULL; |
|
|
|
@ -424,7 +424,7 @@ int rtp_parse_packet(RTPDemuxContext *s, AVPacket *pkt, |
|
|
|
|
// TODO: Move to a dynamic packet handler (like above)
|
|
|
|
|
if (s->read_buf_index >= s->read_buf_size) |
|
|
|
|
return -1; |
|
|
|
|
ret = mpegts_parse_packet(s->ts, pkt, s->buf + s->read_buf_index, |
|
|
|
|
ret = ff_mpegts_parse_packet(s->ts, pkt, s->buf + s->read_buf_index, |
|
|
|
|
s->read_buf_size - s->read_buf_index); |
|
|
|
|
if (ret < 0) |
|
|
|
|
return -1; |
|
|
|
@ -473,7 +473,7 @@ int rtp_parse_packet(RTPDemuxContext *s, AVPacket *pkt, |
|
|
|
|
|
|
|
|
|
if (!st) { |
|
|
|
|
/* specific MPEG2TS demux support */ |
|
|
|
|
ret = mpegts_parse_packet(s->ts, pkt, buf, len); |
|
|
|
|
ret = ff_mpegts_parse_packet(s->ts, pkt, buf, len); |
|
|
|
|
if (ret < 0) |
|
|
|
|
return -1; |
|
|
|
|
if (ret < len) { |
|
|
|
@ -560,7 +560,7 @@ void rtp_parse_close(RTPDemuxContext *s) |
|
|
|
|
{ |
|
|
|
|
// TODO: fold this into the protocol specific data fields.
|
|
|
|
|
if (!strcmp(ff_rtp_enc_name(s->payload_type), "MP2T")) { |
|
|
|
|
mpegts_parse_close(s->ts); |
|
|
|
|
ff_mpegts_parse_close(s->ts); |
|
|
|
|
} |
|
|
|
|
av_free(s); |
|
|
|
|
} |
|
|
|
|