StarMirror/toxcore
1
0
Fork 0
mirror of https://github.com/irungentoo/toxcore.git synced 2024-03-22 13:30:51 +08:00
Code Issues Projects Releases Wiki Activity

Audio group chats still have some small issues.

Browse Source
This commit is contained in:
irungentoo 2014-11-10 20:23:48 -05:00
parent 534efc7349
commit f0f68efee8
No known key found for this signature in database
GPG Key ID: 10349DC9BED89E98
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
toxav/group.c
View File

@ -205,17 +205,19 @@ static Group_AV *new_group_av(Group_Chats *g_c, unsigned int audio_channels, uns
group_av->audio_data = audio_callback; group_av->audio_data = audio_callback;
group_av->userdata = userdata; group_av->userdata = userdata;
return 0; return group_av;
} }
static void group_av_peer_new(void *object, int groupnumber, int friendgroupnumber) static void group_av_peer_new(void *object, int groupnumber, int friendgroupnumber)
{ {
Group_AV *group_av = object;
Group_Peer_AV *peer_av = calloc(1, sizeof(Group_Peer_AV)); Group_Peer_AV *peer_av = calloc(1, sizeof(Group_Peer_AV));
if (!peer_av) if (!peer_av)
return; return;
peer_av->buffer = create_queue(3); //TODO Use variable instead. peer_av->buffer = create_queue(3); //TODO Use variable instead.
group_peer_set_object(group_av->g_c, groupnumber, friendgroupnumber, peer_av);
} }
static void group_av_peer_delete(void *object, int groupnumber, int friendgroupnumber, void *peer_object) static void group_av_peer_delete(void *object, int groupnumber, int friendgroupnumber, void *peer_object)
@ -315,11 +317,12 @@ static int decode_audio_packet(Group_AV *group_av, Group_Peer_AV *peer_av, int g
} }
if (out_audio) { if (out_audio) {
//TODO callback
/*
if (group_av->audio_data) if (group_av->audio_data)
audio_data( group_av->audio_data(group_av->g_c->m, groupnumber, friendgroupnumber, out_audio, out_audio_samples,
*/ peer_av->decoder_channels, group_av->audio_sample_rate, group_av->userdata);
free(out_audio);
return 0; return 0;
} }
@ -329,15 +332,17 @@ static int decode_audio_packet(Group_AV *group_av, Group_Peer_AV *peer_av, int g
static int handle_group_audio_packet(void *object, int groupnumber, int friendgroupnumber, void *peer_object, static int handle_group_audio_packet(void *object, int groupnumber, int friendgroupnumber, void *peer_object,
const uint8_t *packet, uint16_t length) const uint8_t *packet, uint16_t length)
{ {
if (!peer_object || !object || length <= sizeof(uint16_t)) if (!peer_object || !object || length <= sizeof(uint16_t)) {
return -1; return -1;
}
Group_Peer_AV *peer_av = peer_object; Group_Peer_AV *peer_av = peer_object;
Group_Audio_Packet *pk = calloc(1, sizeof(Group_Audio_Packet) + (length - sizeof(uint16_t))); Group_Audio_Packet *pk = calloc(1, sizeof(Group_Audio_Packet) + (length - sizeof(uint16_t)));
if (!pk) if (!pk) {
return -1; return -1;
}
uint16_t sequnum; uint16_t sequnum;
memcpy(&sequnum, packet, sizeof(sequnum)); memcpy(&sequnum, packet, sizeof(sequnum));
@ -350,6 +355,8 @@ static int handle_group_audio_packet(void *object, int groupnumber, int friendgr
return -1; return -1;
} }
while (decode_audio_packet(object, peer_av, groupnumber, friendgroupnumber) == 0);
return 0; return 0;
} }

2
toxcore/group.c
View File

@ -1822,7 +1822,7 @@ static int handle_lossy(void *object, int friendcon_id, const uint8_t *data, uin
--lossy_length; --lossy_length;
if (g_c->lossy_packethandlers[message_id].function) { if (g_c->lossy_packethandlers[message_id].function) {
if (g_c->lossy_packethandlers[message_id].function(g->object, groupnumber, index, g->group[peer_index].object, if (g_c->lossy_packethandlers[message_id].function(g->object, groupnumber, peer_index, g->group[peer_index].object,
lossy_data, lossy_length) == -1) { lossy_data, lossy_length) == -1) {
return -1; return -1;
} }