KB8PMY
/
QnetGateway
mirror of https://github.com/n7tae/QnetGateway.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

put unsigned short for streamid in structs for dvap data

Browse Source
pull/1/head
Tom Early 9 years ago
parent 8d4265e4f7
commit 455dcbd1b7
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File

17
dvap_rptr.cpp
Unescape View File

@ -71,7 +71,7 @@ using namespace libconfig;
typedef struct dvap_hdr_tag { typedef struct dvap_hdr_tag {
unsigned char hdr0; // 0x2f unsigned char hdr0; // 0x2f
unsigned char hdr1; // 0xa0 unsigned char hdr1; // 0xa0
unsigned char streamid[2]; unsigned short streamid;
unsigned char framepos; unsigned char framepos;
unsigned char seq; unsigned char seq;
unsigned char flag[3]; unsigned char flag[3];
@ -86,7 +86,7 @@ typedef struct dvap_hdr_tag {
typedef struct dvap_data_tag { typedef struct dvap_data_tag {
unsigned char hdr0; // 0x12 unsigned char hdr0; // 0x12
unsigned char hdr1; // 0xc0 unsigned char hdr1; // 0xc0
unsigned char streamid[2]; unsigned short streamid;
unsigned char framepos; unsigned char framepos;
unsigned char seq; unsigned char seq;
unsigned char audio[12]; unsigned char audio[12];
@ -1195,9 +1195,9 @@ static void readFrom20000()
unsigned char streamid[2] = {0x00, 0x00}; unsigned char streamid[2] = {0x00, 0x00};
unsigned char sync_codes[3] = {0x55, 0x2d, 0x16}; unsigned char sync_codes[3] = {0x55, 0x2d, 0x16};
SPKT net_buf; SPKT net_buf;
u_int16_t stream_id_to_dvap = 0; unsigned short stream_id_to_dvap = 0;
u_int8_t frame_pos_to_dvap = 0; unsigned char frame_pos_to_dvap = 0;
u_int8_t seq_to_dvap = 0; unsigned char seq_to_dvap = 0;
unsigned char silence[12] = { 0x4e,0x8d,0x32,0x88,0x26,0x1a,0x3f,0x61,0xe8,0x70,0x4f,0x93 }; unsigned char silence[12] = { 0x4e,0x8d,0x32,0x88,0x26,0x1a,0x3f,0x61,0xe8,0x70,0x4f,0x93 };
bool written_to_q = false; bool written_to_q = false;
@ -1295,8 +1295,7 @@ static void readFrom20000()
SDVAP_HDR dh; SDVAP_HDR dh;
stream_id_to_dvap = (rand_r(&aseed) % 65535U) + 1U; stream_id_to_dvap = (rand_r(&aseed) % 65535U) + 1U;
memcpy(&dh, DVP_HDR, 2); memcpy(&dh, DVP_HDR, 2);
//sid = (isit_bigendian())?do_swapu16(stream_id_to_dvap):stream_id_to_dvap; dh.streamid = stream_id_to_dvap;
memcpy(&dh.streamid, &stream_id_to_dvap, 2);
dh.framepos = 0x80; dh.framepos = 0x80;
dh.seq = 0; dh.seq = 0;
//memset(dvp_buf + 6, ' ', 41); //memset(dvp_buf + 6, ' ', 41);
@ -1345,7 +1344,7 @@ static void readFrom20000()
memcpy(&dd, DVP_DAT, 2); memcpy(&dd, DVP_DAT, 2);
if (memcmp(net_buf.rf_audio.buff + 9, sync_codes, 3) == 0) if (memcmp(net_buf.rf_audio.buff + 9, sync_codes, 3) == 0)
frame_pos_to_dvap = 0; frame_pos_to_dvap = 0;
memcpy(dd.streamid, &stream_id_to_dvap, 2); dd.streamid = stream_id_to_dvap;
dd.framepos = frame_pos_to_dvap; dd.framepos = frame_pos_to_dvap;
if ((net_buf.myicm.ctrl & 0x40) != 0) if ((net_buf.myicm.ctrl & 0x40) != 0)
dd.framepos |= 0x40U; dd.framepos |= 0x40U;
@ -1420,7 +1419,7 @@ static void readFrom20000()
memcpy(&dd, DVP_DAT, 2); memcpy(&dd, DVP_DAT, 2);
if (memcmp(silence + 9, sync_codes, 3) == 0) if (memcmp(silence + 9, sync_codes, 3) == 0)
frame_pos_to_dvap = 0; frame_pos_to_dvap = 0;
memcpy(dd.streamid, &stream_id_to_dvap, 2); dd.streamid = stream_id_to_dvap;
dd.framepos = frame_pos_to_dvap; dd.framepos = frame_pos_to_dvap;
dd.seq = seq_to_dvap; dd.seq = seq_to_dvap;
memcpy(dd.audio, silence, 12); memcpy(dd.audio, silence, 12);

Write Preview
Loading…
Cancel
Save

Powered by TurnKey Linux.