int
ff_rdt_parse_header(const uint8_t *buf, int len,
- int *set_id, int *seq_no, int *stream_id, uint32_t *timestamp)
+ int *set_id, int *seq_no, int *stream_id,
+ int *is_keyframe, uint32_t *timestamp)
{
int consumed = 10;
if (set_id) *set_id = (buf[0]>>1) & 0x1f;
if (seq_no) *seq_no = AV_RB16(buf+1);
if (timestamp) *timestamp = AV_RB32(buf+4);
- if (stream_id) *stream_id = buf[3] & 0x3f;
+ if (stream_id) *stream_id = (buf[3]>>1) & 0x1f;
+ if (is_keyframe) *is_keyframe = !(buf[3] & 0x1);
return consumed;
}
ff_rdt_parse_packet(RDTDemuxContext *s, AVPacket *pkt,
const uint8_t *buf, int len)
{
- int seq_no, flags = 0, stream_id, set_id;
+ int seq_no, flags = 0, stream_id, set_id, is_keyframe;
uint32_t timestamp;
int rv= 0;
if (len < 12)
return -1;
- rv = ff_rdt_parse_header(buf, len, &set_id, &seq_no, &stream_id, ×tamp);
+ rv = ff_rdt_parse_header(buf, len, &set_id, &seq_no, &stream_id, &is_keyframe, ×tamp);
if (rv < 0)
return rv;
- if (!(stream_id & 1) && (set_id != s->prev_set_id || timestamp != s->prev_timestamp)) {
+ if (is_keyframe && (set_id != s->prev_set_id || timestamp != s->prev_timestamp)) {
flags |= PKT_FLAG_KEY;
s->prev_set_id = set_id;
s->prev_timestamp = timestamp;
* @param set_id will be set to the set ID this packet belongs to
* @param seq_no will be set to the sequence number this packet belongs to
* @param stream_id will be set to the stream ID this packet belongs to
+ * @param is_keyframe will be whether this packet belongs to a keyframe
* @param timestamp will be set to the timestamp of the packet
* @return the amount of bytes consumed, or <0 on error
*/
int ff_rdt_parse_header(const uint8_t *buf, int len,
- int *set_id, int *seq_no, int *stream_id, uint32_t *timestamp);
+ int *set_id, int *seq_no, int *stream_id,
+ int *is_keyframe, uint32_t *timestamp);
/**
* Parse RDT-style packet data (header + media data).
if (ret != len)
return -1;
if (rt->transport == RTSP_TRANSPORT_RDT &&
- ff_rdt_parse_header(buf, len, &id, NULL, NULL, NULL) < 0)
+ ff_rdt_parse_header(buf, len, &id, NULL, NULL, NULL, NULL) < 0)
return -1;
/* find the matching stream */