RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-30 03:12:08 +00:00
Code Issues Projects Releases Wiki Activity

Fix A/V synch for RTP streams that do not contain MPEG1 or 2

Browse Source 
(correctly compute the presentation times based on the RTP timestamps
and the RTCP SR packets)

Originally committed as revision 14045 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Luca Abeni 2008-07-02 10:23:27 +00:00
parent 49de8d1e9c
commit d6b9e57af2
1 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
libavformat/rtpdec.c
View File

@ -282,6 +282,7 @@ RTPDemuxContext *rtp_parse_open(AVFormatContext *s1, AVStream *st, URLContext *r
s->st = st; s->st = st;
s->rtp_payload_data = rtp_payload_data; s->rtp_payload_data = rtp_payload_data;
rtp_init_statistics(&s->statistics, 0); // do we know the initial sequence from sdp? rtp_init_statistics(&s->statistics, 0); // do we know the initial sequence from sdp?
av_set_pts_info(s->st, 32, 1, 90000);
if (!strcmp(ff_rtp_enc_name(payload_type), "MP2T")) { if (!strcmp(ff_rtp_enc_name(payload_type), "MP2T")) {
s->ts = mpegts_parse_open(s->ic); s->ts = mpegts_parse_open(s->ic);
if (s->ts == NULL) { if (s->ts == NULL) {
@ -299,6 +300,9 @@ RTPDemuxContext *rtp_parse_open(AVFormatContext *s1, AVStream *st, URLContext *r
st->need_parsing = AVSTREAM_PARSE_FULL; st->need_parsing = AVSTREAM_PARSE_FULL;
break; break;
default: default:
if (st->codec->codec_type == CODEC_TYPE_AUDIO) {
av_set_pts_info(st, 32, 1, st->codec->sample_rate);
}
break; break;
} }
} }
@ -361,32 +365,16 @@ static int rtp_parse_mp4_au(RTPDemuxContext *s, const uint8_t *buf)
*/ */
static void finalize_packet(RTPDemuxContext *s, AVPacket *pkt, uint32_t timestamp) static void finalize_packet(RTPDemuxContext *s, AVPacket *pkt, uint32_t timestamp)
{ {
switch(s->st->codec->codec_id) {
case CODEC_ID_MP2:
case CODEC_ID_MPEG1VIDEO:
case CODEC_ID_MPEG2VIDEO:
if (s->last_rtcp_ntp_time != AV_NOPTS_VALUE) { if (s->last_rtcp_ntp_time != AV_NOPTS_VALUE) {
int64_t addend; int64_t addend;
int delta_timestamp; int delta_timestamp;
/* XXX: is it really necessary to unify the timestamp base ? */
/* compute pts from timestamp with received ntp_time */ /* compute pts from timestamp with received ntp_time */
delta_timestamp = timestamp - s->last_rtcp_timestamp; delta_timestamp = timestamp - s->last_rtcp_timestamp;
/* convert to 90 kHz without overflow */ /* convert to the PTS timebase */
addend = (s->last_rtcp_ntp_time - s->first_rtcp_ntp_time) >> 14; addend = av_rescale(s->last_rtcp_ntp_time - s->first_rtcp_ntp_time, s->st->time_base.den, (uint64_t)s->st->time_base.num << 32);
addend = (addend * 5625) >> 14;
pkt->pts = addend + delta_timestamp; pkt->pts = addend + delta_timestamp;
} }
break;
case CODEC_ID_AAC:
case CODEC_ID_H264:
case CODEC_ID_MPEG4:
pkt->pts = timestamp;
break;
default:
/* no timestamp info yet */
break;
}
pkt->stream_index = s->st->index; pkt->stream_index = s->st->index;
} }