diff options
Diffstat (limited to 'tinyRTP/include/tinyrtp/rtp')
| -rwxr-xr-x | tinyRTP/include/tinyrtp/rtp/trtp_rtp_header.h | 63 | ||||
| -rwxr-xr-x | tinyRTP/include/tinyrtp/rtp/trtp_rtp_packet.h | 35 | ||||
| -rwxr-xr-x | tinyRTP/include/tinyrtp/rtp/trtp_rtp_session.h | 6 |
3 files changed, 51 insertions, 53 deletions
diff --git a/tinyRTP/include/tinyrtp/rtp/trtp_rtp_header.h b/tinyRTP/include/tinyrtp/rtp/trtp_rtp_header.h index 15d177c..8b8a3b3 100755 --- a/tinyRTP/include/tinyrtp/rtp/trtp_rtp_header.h +++ b/tinyRTP/include/tinyrtp/rtp/trtp_rtp_header.h @@ -2,19 +2,19 @@ * Copyright (C) 2012 Doubango Telecom <http://www.doubango.org> * * Contact: Mamadou Diop <diopmamadou(at)doubango.org> -* +* * This file is part of Open Source Doubango Framework. * * DOUBANGO is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. -* +* * DOUBANGO 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 General Public License for more details. -* +* * You should have received a copy of the GNU General Public License * along with DOUBANGO. * @@ -37,36 +37,35 @@ TRTP_BEGIN_DECLS #define TRTP_RTP_HEADER_MIN_SIZE 12 #define TRTP_RTP_HEADER(self) ((trtp_rtp_header_t*)(self)) -typedef struct trtp_rtp_header_s -{ - TSK_DECLARE_OBJECT; - /* RFC 3550 section 5.1 - RTP Fixed Header Fields - 0 1 2 3 - 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 - +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - |V=2|P|X| CC |M| PT | sequence number | - +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - | timestamp | - +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - | synchronization source (SSRC) identifier | - +=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+ - | contributing source (CSRC) identifiers | - | .... | - +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - */ - unsigned version:2; - unsigned padding:1; - unsigned extension:1; - unsigned csrc_count:4; - unsigned marker:1; - unsigned payload_type:7; - uint16_t seq_num; - uint32_t timestamp; - uint32_t ssrc; - uint32_t csrc[15]; +typedef struct trtp_rtp_header_s { + TSK_DECLARE_OBJECT; + /* RFC 3550 section 5.1 - RTP Fixed Header Fields + 0 1 2 3 + 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 + +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + |V=2|P|X| CC |M| PT | sequence number | + +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + | timestamp | + +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + | synchronization source (SSRC) identifier | + +=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+ + | contributing source (CSRC) identifiers | + | .... | + +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + */ + unsigned version:2; + unsigned padding:1; + unsigned extension:1; + unsigned csrc_count:4; + unsigned marker:1; + unsigned payload_type:7; + uint16_t seq_num; + uint32_t timestamp; + uint32_t ssrc; + uint32_t csrc[15]; - // for internal use - enum tmedia_codec_id_e codec_id; + // for internal use + enum tmedia_codec_id_e codec_id; } trtp_rtp_header_t; diff --git a/tinyRTP/include/tinyrtp/rtp/trtp_rtp_packet.h b/tinyRTP/include/tinyrtp/rtp/trtp_rtp_packet.h index c7f8cf3..b9d81b3 100755 --- a/tinyRTP/include/tinyrtp/rtp/trtp_rtp_packet.h +++ b/tinyRTP/include/tinyrtp/rtp/trtp_rtp_packet.h @@ -2,19 +2,19 @@ * Copyright (C) 2012 Doubango Telecom <http://www.doubango.org> * * Contact: Mamadou Diop <diopmamadou(at)doubango.org> -* +* * This file is part of Open Source Doubango Framework. * * DOUBANGO is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. -* +* * DOUBANGO 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 General Public License for more details. -* +* * You should have received a copy of the GNU General Public License * along with DOUBANGO. * @@ -37,23 +37,22 @@ TRTP_BEGIN_DECLS -typedef struct trtp_rtp_packet_s -{ - TSK_DECLARE_OBJECT; +typedef struct trtp_rtp_packet_s { + TSK_DECLARE_OBJECT; + + trtp_rtp_header_t* header; - trtp_rtp_header_t* header; + struct { + void* data; + const void* data_const; // never free()d. an alternative to "data" + tsk_size_t size; + } payload; - struct{ - void* data; - const void* data_const; // never free()d. an alternative to "data" - tsk_size_t size; - } payload; - - /* extension header as per RFC 3550 section 5.3.1 */ - struct{ - void* data; - tsk_size_t size; /* contains the first two 16-bit fields */ - } extension; + /* extension header as per RFC 3550 section 5.3.1 */ + struct { + void* data; + tsk_size_t size; /* contains the first two 16-bit fields */ + } extension; } trtp_rtp_packet_t; typedef tsk_list_t trtp_rtp_packets_L_t; diff --git a/tinyRTP/include/tinyrtp/rtp/trtp_rtp_session.h b/tinyRTP/include/tinyrtp/rtp/trtp_rtp_session.h index 475502a..f5d8770 100755 --- a/tinyRTP/include/tinyrtp/rtp/trtp_rtp_session.h +++ b/tinyRTP/include/tinyrtp/rtp/trtp_rtp_session.h @@ -2,19 +2,19 @@ * Copyright (C) 2012 Doubango Telecom <http://www.doubango.org> * * Contact: Mamadou Diop <diopmamadou(at)doubango.org> -* +* * This file is part of Open Source Doubango Framework. * * DOUBANGO is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. -* +* * DOUBANGO 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 General Public License for more details. -* +* * You should have received a copy of the GNU General Public License * along with DOUBANGO. * |
