mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-12-17 08:56:49 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

a2dp: use unsigned for sizes

Browse source
This commit is contained in:
Wim Taymans 2020-12-05 08:30:14 +01:00
parent 4797018e4f
commit c3c1a1184c
2 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

18
spa/plugins/bluez5/a2dp-sink.c
View file

@ -74,7 +74,7 @@ struct buffer {
struct port { struct port {
struct spa_audio_info current_format; struct spa_audio_info current_format;
int frame_size; uint32_t frame_size;
unsigned int have_format:1; unsigned int have_format:1;
uint64_t info_all; uint64_t info_all;
@ -130,16 +130,16 @@ struct impl {
void *codec_data; void *codec_data;
struct spa_audio_info codec_format; struct spa_audio_info codec_format;
int block_size; uint32_t block_size;
int num_blocks; uint32_t num_blocks;
uint8_t buffer[4096]; uint8_t buffer[4096];
int buffer_used; uint32_t buffer_used;
int frame_count; uint32_t frame_count;
uint16_t seqnum; uint16_t seqnum;
uint32_t timestamp; uint32_t timestamp;
uint64_t sample_count; uint64_t sample_count;
uint8_t tmp_buffer[512]; uint8_t tmp_buffer[512];
int tmp_buffer_used; uint32_t tmp_buffer_used;
}; };
#define NAME "a2dp-sink" #define NAME "a2dp-sink"
@ -353,7 +353,7 @@ static int send_buffer(struct impl *this)
return written; return written;
} }
static int encode_buffer(struct impl *this, const void *data, int size) static int encode_buffer(struct impl *this, const void *data, uint32_t size)
{ {
int processed; int processed;
size_t out_encoded; size_t out_encoded;
@ -365,7 +365,7 @@ static int encode_buffer(struct impl *this, const void *data, int size)
this, size, this->buffer_used, port->frame_size, this->block_size, this, size, this->buffer_used, port->frame_size, this->block_size,
this->frame_count); this->frame_count);
if (this->buffer_used >= (int)sizeof(this->buffer)) if (this->buffer_used >= sizeof(this->buffer))
return -ENOSPC; return -ENOSPC;
if (size < this->block_size - this->tmp_buffer_used) { if (size < this->block_size - this->tmp_buffer_used) {
@ -417,7 +417,7 @@ static int flush_buffer(struct impl *this, bool force)
return 0; return 0;
} }
static int add_data(struct impl *this, const void *data, int size) static int add_data(struct impl *this, const void *data, uint32_t size)
{ {
int processed, total = 0; int processed, total = 0;

2
spa/plugins/bluez5/a2dp-source.c
View file

@ -72,7 +72,7 @@ struct buffer {
struct port { struct port {
struct spa_audio_info current_format; struct spa_audio_info current_format;
int frame_size; uint32_t frame_size;
unsigned int have_format:1; unsigned int have_format:1;
uint64_t info_all; uint64_t info_all;