* RTP packetization for Xiph audio and video
* Copyright (c) 2010 Josh Allmann
*
- * This file is part of FFmpeg.
+ * This file is part of Libav.
*
- * FFmpeg is free software; you can redistribute it and/or
+ * Libav is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
- * FFmpeg is distributed in the hope that it will be useful,
+ * Libav is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
+ * License along with Libav; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
break;
}
- // Set ident. Must match the one in sdp.c
+ // Set ident.
// Probably need a non-fixed way of generating
// this, but it has to be done in SDP and passed in from there.
q = s->buf;
- *q++ = 0xfe;
- *q++ = 0xcd;
- *q++ = 0xba;
+ *q++ = (RTP_XIPH_IDENT >> 16) & 0xff;
+ *q++ = (RTP_XIPH_IDENT >> 8) & 0xff;
+ *q++ = (RTP_XIPH_IDENT ) & 0xff;
// set fragment
// 0 - whole frame (possibly multiple frames)
frag = size <= max_pkt_size ? 0 : 1;
if (!frag && !xdt) { // do we have a whole frame of raw data?
- unsigned end_ptr = (unsigned)s->buf + 6 + max_pkt_size; // what we're allowed to write
- unsigned ptr = (unsigned)s->buf_ptr + 2 + size; // what we're going to write
+ uint8_t *end_ptr = s->buf + 6 + max_pkt_size; // what we're allowed to write
+ uint8_t *ptr = s->buf_ptr + 2 + size; // what we're going to write
int remaining = end_ptr - ptr;
+ assert(s->num_frames <= s->max_frames_per_packet);
if ((s->num_frames > 0 && remaining < 0) ||
- s->num_frames >= s->max_frames_per_packet) {
+ s->num_frames == s->max_frames_per_packet) {
// send previous packets now; no room for new data
ff_rtp_send_data(s1, s->buf, s->buf_ptr - s->buf, 0);
s->num_frames = 0;