RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Read optional components of the RDT packet header, such as extended setID 

and streamID and the length. of the packet in case of packet concatenation.
Discussed in ML thread "[PATCH] RDT/Realmedia patches #2".

Originally committed as revision 15853 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Ronald S. Bultje 2008-11-17 14:32:01 +00:00
parent 6bafd6f53e
commit 43af8b2b42
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libavformat/rdt.c
View File

@ -177,7 +177,8 @@ ff_rdt_parse_header(const uint8_t *buf, int len,
int *pis_keyframe, uint32_t *ptimestamp) int *pis_keyframe, uint32_t *ptimestamp)
{ {
GetBitContext gb; GetBitContext gb;
int consumed = 0, set_id, seq_no, stream_id, is_keyframe; int consumed = 0, set_id, seq_no, stream_id, is_keyframe,
len_included, need_reliable;
uint32_t timestamp; uint32_t timestamp;
/* skip status packets */ /* skip status packets */
@ -192,7 +193,7 @@ ff_rdt_parse_header(const uint8_t *buf, int len,
len -= pkt_len; len -= pkt_len;
consumed += pkt_len; consumed += pkt_len;
} }
if (len < 10) if (len < 16)
return -1; return -1;
/** /**
* Layout of the header (in bits): * Layout of the header (in bits):
@ -246,15 +247,23 @@ ff_rdt_parse_header(const uint8_t *buf, int len,
* http://anonsvn.wireshark.org/viewvc/trunk/epan/dissectors/packet-rdt.c * http://anonsvn.wireshark.org/viewvc/trunk/epan/dissectors/packet-rdt.c
*/ */
init_get_bits(&gb, buf, len << 3); init_get_bits(&gb, buf, len << 3);
skip_bits(&gb, 2); len_included = get_bits1(&gb);
need_reliable = get_bits1(&gb);
set_id = get_bits(&gb, 5); set_id = get_bits(&gb, 5);
skip_bits(&gb, 1); skip_bits(&gb, 1);
seq_no = get_bits(&gb, 16); seq_no = get_bits(&gb, 16);
if (len_included)
skip_bits(&gb, 16);
skip_bits(&gb, 2); skip_bits(&gb, 2);
stream_id = get_bits(&gb, 5); stream_id = get_bits(&gb, 5);
is_keyframe = !get_bits1(&gb); is_keyframe = !get_bits1(&gb);
timestamp = get_bits_long(&gb, 32); timestamp = get_bits_long(&gb, 32);
if (set_id == 0x1f)
set_id = get_bits(&gb, 16);
if (need_reliable)
skip_bits(&gb, 16); skip_bits(&gb, 16);
if (stream_id == 0x1f)
stream_id = get_bits(&gb, 16);
if (pset_id) *pset_id = set_id; if (pset_id) *pset_id = set_id;
if (pseq_no) *pseq_no = seq_no; if (pseq_no) *pseq_no = seq_no;