mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-07 13:30:03 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

bluetooth: Fix usage of RTP structures in SBC codec

Browse source 
Rename struct rtp_payload to rtp_sbc_payload as it is specific for SBC
codec payload.

Add proper checks for endianity in rtp.h header and use uint8_t type
where appropriated.

Field frame_count is only 4 bit number, so add checks to prevent overflow.

And because is_fragmented field is not parsed by decoder there is no
support for decoding fragmented SBC frames. So throw an error in this case.
This commit is contained in:
Pali Rohár 2019-07-21 17:07:02 +02:00 • committed by Tanu Kaskinen
parent 064277b4ee
commit 9e70d05201
2 changed files with 58 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

58
src/modules/bluetooth/rtp.h
View file

@ -3,6 +3,7 @@
* BlueZ - Bluetooth protocol stack for Linux
*
* Copyright (C) 2004-2010 Marcel Holtmann <marcel@holtmann.org>
* Copyright (C) 2019 Pali Rohár <pali.rohar@gmail.com>
*
*
* This library is free software; you can redistribute it and/or
@ -19,16 +20,20 @@
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
#if __BYTE_ORDER == __LITTLE_ENDIAN
#include <endian.h>
#include <stdint.h>
#if defined(__BYTE_ORDER) && defined(__LITTLE_ENDIAN) && \
__BYTE_ORDER == __LITTLE_ENDIAN
struct rtp_header {
unsigned cc:4;
unsigned x:1;
unsigned p:1;
unsigned v:2;
uint8_t cc:4;
uint8_t x:1;
uint8_t p:1;
uint8_t v:2;
unsigned pt:7;
unsigned m:1;
uint8_t pt:7;
uint8_t m:1;
uint16_t sequence_number;
uint32_t timestamp;
@ -36,24 +41,25 @@ struct rtp_header {
uint32_t csrc[0];
} __attribute__ ((packed));
struct rtp_payload {
unsigned frame_count:4;
unsigned rfa0:1;
unsigned is_last_fragment:1;
unsigned is_first_fragment:1;
unsigned is_fragmented:1;
struct rtp_sbc_payload {
uint8_t frame_count:4;
uint8_t rfa0:1;
uint8_t is_last_fragment:1;
uint8_t is_first_fragment:1;
uint8_t is_fragmented:1;
} __attribute__ ((packed));
#elif __BYTE_ORDER == __BIG_ENDIAN
#elif defined(__BYTE_ORDER) && defined(__BIG_ENDIAN) && \
__BYTE_ORDER == __BIG_ENDIAN
struct rtp_header {
unsigned v:2;
unsigned p:1;
unsigned x:1;
unsigned cc:4;
uint8_t v:2;
uint8_t p:1;
uint8_t x:1;
uint8_t cc:4;
unsigned m:1;
unsigned pt:7;
uint8_t m:1;
uint8_t pt:7;
uint16_t sequence_number;
uint32_t timestamp;
@ -61,12 +67,12 @@ struct rtp_header {
uint32_t csrc[0];
} __attribute__ ((packed));
struct rtp_payload {
unsigned is_fragmented:1;
unsigned is_first_fragment:1;
unsigned is_last_fragment:1;
unsigned rfa0:1;
unsigned frame_count:4;
struct rtp_sbc_payload {
uint8_t is_fragmented:1;
uint8_t is_first_fragment:1;
uint8_t is_last_fragment:1;
uint8_t rfa0:1;
uint8_t frame_count:4;
} __attribute__ ((packed));
#else