Mercurial > libavformat.hg
diff rdt.c @ 4029:9a0a46d465ae libavformat
Add is_keyframe param to ff_rdt_parse_header(). See ML discussion in
"[PATCH] RDT/Realmedia patches #2" thread.
author | rbultje |
---|---|
date | Sat, 15 Nov 2008 20:41:59 +0000 |
parents | 4a266106f604 |
children | c7354edc3496 |
line wrap: on
line diff
--- a/rdt.c Sat Nov 15 20:17:19 2008 +0000 +++ b/rdt.c Sat Nov 15 20:41:59 2008 +0000 @@ -173,7 +173,8 @@ 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; @@ -238,7 +239,8 @@ 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; } @@ -287,7 +289,7 @@ 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; @@ -304,10 +306,10 @@ 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;