* License along with FFmpeg; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+
+#include "libavcodec/bitstream.h"
#include "avformat.h"
#include "mpegts.h"
-#include "bitstream.h"
#include <unistd.h>
#include "network.h"
s->st = st;
s->rtp_payload_data = rtp_payload_data;
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")) {
s->ts = mpegts_parse_open(s->ic);
if (s->ts == NULL) {
st->need_parsing = AVSTREAM_PARSE_FULL;
break;
default:
+ if (st->codec->codec_type == CODEC_TYPE_AUDIO) {
+ av_set_pts_info(st, 32, 1, st->codec->sample_rate);
+ }
break;
}
}
if (infos == NULL)
return -1;
- /* decode the first 2 bytes where are stored the AUHeader sections
+ /* decode the first 2 bytes where the AUHeader sections are stored
length in bits */
au_headers_length = AV_RB16(buf);
*/
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) {
- int64_t addend;
-
- int delta_timestamp;
- /* XXX: is it really necessary to unify the timestamp base ? */
- /* compute pts from timestamp with received ntp_time */
- delta_timestamp = timestamp - s->last_rtcp_timestamp;
- /* convert to 90 kHz without overflow */
- addend = (s->last_rtcp_ntp_time - s->first_rtcp_ntp_time) >> 14;
- addend = (addend * 5625) >> 14;
- 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;
+ if (s->last_rtcp_ntp_time != AV_NOPTS_VALUE) {
+ int64_t addend;
+ int delta_timestamp;
+
+ /* compute pts from timestamp with received ntp_time */
+ delta_timestamp = timestamp - s->last_rtcp_timestamp;
+ /* convert to the PTS timebase */
+ 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);
+ pkt->pts = addend + delta_timestamp;
}
pkt->stream_index = s->st->index;
}
const uint8_t *buf, int len)
{
unsigned int ssrc, h;
- int payload_type, seq, ret;
+ int payload_type, seq, ret, flags = 0;
AVStream *st;
uint32_t timestamp;
int rv= 0;
/* return the next packets, if any */
if(s->st && s->parse_packet) {
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, pkt, ×tamp, NULL, 0);
+ rv= s->parse_packet(s, pkt, ×tamp, NULL, 0, flags);
finalize_packet(s, pkt, timestamp);
return rv;
} else {
return 1;
}
} else if (s->parse_packet) {
- rv = s->parse_packet(s, pkt, ×tamp, buf, len);
+ rv = s->parse_packet(s, pkt, ×tamp, buf, len, flags);
} else {
// at this point, the RTP header has been stripped; This is ASSUMING that there is only 1 CSRC, which in't wise.
switch(st->codec->codec_id) {