/*
* RTP packetization for MPEG video
- * Copyright (c) 2002 Fabrice Bellard.
+ * Copyright (c) 2002 Fabrice Bellard
+ * Copyright (c) 2007 Luca Abeni
*
* This file is part of FFmpeg.
*
* License along with FFmpeg; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "avformat.h"
-#include "rtp_internal.h"
-#include "mpegvideo.h"
+#include "libavcodec/mpegvideo.h"
+#include "avformat.h"
+#include "rtpenc.h"
/* NOTE: a single frame must be passed with sequence header if
needed. XXX: use slices. */
void ff_rtp_send_mpegvideo(AVFormatContext *s1, const uint8_t *buf1, int size)
{
- RTPDemuxContext *s = s1->priv_data;
- AVStream *st = s1->streams[0];
+ RTPMuxContext *s = s1->priv_data;
int len, h, max_packet_size;
uint8_t *q;
int begin_of_slice, end_of_slice, frame_type, temporal_reference;
begin_of_sequence = 1;
}
- if (r - buf1 < len) {
+ if (r - buf1 - 4 <= len) {
/* The current slice fits in the packet */
if (begin_of_slice == 0) {
/* no slice at the beginning of the packet... */
}
r1 = r;
} else {
- if (r - r1 < max_packet_size) {
+ if ((r1 - buf1 > 4) && (r - r1 < max_packet_size)) {
len = r1 - buf1 - 4;
end_of_slice = 1;
}
memcpy(q, buf1, len);
q += len;
- /* 90 KHz time stamp */
- s->timestamp = s->base_timestamp +
- av_rescale((int64_t)s->cur_timestamp * st->codec->time_base.num, 90000, st->codec->time_base.den); //FIXME pass timestamps
+ /* 90kHz time stamp */
+ s->timestamp = s->cur_timestamp;
ff_rtp_send_data(s1, s->buf, q - s->buf, (len == size));
buf1 += len;
begin_of_slice = end_of_slice;
end_of_slice = 0;
}
- s->cur_timestamp++;
}