Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
ITADataSources
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Iterations
Merge Requests
0
Merge Requests
0
Requirements
Requirements
List
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Operations
Operations
Incidents
Analytics
Analytics
Code Review
Insights
Issue
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Institute of Technical Acoustics (ITA)
ITADataSources
Commits
e941e65f
Commit
e941e65f
authored
Feb 21, 2017
by
Anne Heimes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bugfix recivedByteTatal Error
parent
17506775
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
6 deletions
+8
-6
include/ITANetAudioMessage.h
include/ITANetAudioMessage.h
+2
-0
src/ITANetAudioMessage.cpp
src/ITANetAudioMessage.cpp
+5
-5
src/ITANetAudioStream.cpp
src/ITANetAudioStream.cpp
+1
-1
No files found.
include/ITANetAudioMessage.h
View file @
e941e65f
...
@@ -97,6 +97,8 @@ public:
...
@@ -97,6 +97,8 @@ public:
private:
private:
int
m_nMessageType
;
int
m_nMessageType
;
int
m_nMessageId
;
int
m_nMessageId
;
unsigned
long
m_iBytesReceivedTotal
;
VistaByteBufferSerializer
m_oOutgoing
;
//!< Serialization buffer for messages
VistaByteBufferSerializer
m_oOutgoing
;
//!< Serialization buffer for messages
VistaByteBufferDeSerializer
m_oIncoming
;
//!< Deserialization buffer for messages
VistaByteBufferDeSerializer
m_oIncoming
;
//!< Deserialization buffer for messages
std
::
vector
<
VistaType
::
byte
>
m_vecIncomingBuffer
;
// Net IO buffer
std
::
vector
<
VistaType
::
byte
>
m_vecIncomingBuffer
;
// Net IO buffer
...
...
src/ITANetAudioMessage.cpp
View file @
e941e65f
...
@@ -144,16 +144,16 @@ bool CITANetAudioMessage::ReadMessage( int timeout)
...
@@ -144,16 +144,16 @@ bool CITANetAudioMessage::ReadMessage( int timeout)
m_vecIncomingBuffer
.
resize
(
nMessagePayloadSize
);
m_vecIncomingBuffer
.
resize
(
nMessagePayloadSize
);
// Receive all incoming data (potentially splitted)
// Receive all incoming data (potentially splitted)
int
iBytesReceivedTotal
=
0
;
m_
iBytesReceivedTotal
=
0
;
while
(
nMessagePayloadSize
>
iBytesReceivedTotal
)
while
(
nMessagePayloadSize
>
m_iBytesReceivedTotal
)
{
{
int
iIncommingBytes
=
m_pConnection
->
WaitForIncomingData
(
0
);
int
iIncommingBytes
=
m_pConnection
->
WaitForIncomingData
(
0
);
int
iBytesReceived
;
int
iBytesReceived
;
if
(
nMessagePayloadSize
<
iIncommingBytes
)
if
(
nMessagePayloadSize
<
iIncommingBytes
)
iBytesReceived
=
m_pConnection
->
Receive
(
&
m_vecIncomingBuffer
[
iBytesReceivedTotal
],
nMessagePayloadSize
-
iBytesReceivedTotal
);
iBytesReceived
=
m_pConnection
->
Receive
(
&
m_vecIncomingBuffer
[
m_iBytesReceivedTotal
],
nMessagePayloadSize
-
m_iBytesReceivedTotal
);
else
else
iBytesReceived
=
m_pConnection
->
Receive
(
&
m_vecIncomingBuffer
[
iBytesReceivedTotal
],
iIncommingBytes
);
iBytesReceived
=
m_pConnection
->
Receive
(
&
m_vecIncomingBuffer
[
m_iBytesReceivedTotal
],
iIncommingBytes
);
iBytesReceivedTotal
+=
iBytesReceived
;
m_
iBytesReceivedTotal
+=
iBytesReceived
;
#if NET_AUDIO_SHOW_TRAFFIC
#if NET_AUDIO_SHOW_TRAFFIC
vstr
::
out
()
<<
"[ CITANetAudioMessage ] "
<<
std
::
setw
(
3
)
<<
std
::
floor
(
iBytesReceivedTotal
/
float
(
nMessagePayloadSize
)
*
100.0
f
)
<<
"% transmitted"
<<
std
::
endl
;
vstr
::
out
()
<<
"[ CITANetAudioMessage ] "
<<
std
::
setw
(
3
)
<<
std
::
floor
(
iBytesReceivedTotal
/
float
(
nMessagePayloadSize
)
*
100.0
f
)
<<
"% transmitted"
<<
std
::
endl
;
#endif
#endif
...
...
src/ITANetAudioStream.cpp
View file @
e941e65f
...
@@ -323,7 +323,7 @@ void CITANetAudioStream::IncrementBlockPointer()
...
@@ -323,7 +323,7 @@ void CITANetAudioStream::IncrementBlockPointer()
oLog
.
iFreeSamples
=
GetRingBufferFreeSamples
(
);
oLog
.
iFreeSamples
=
GetRingBufferFreeSamples
(
);
m_pStreamLogger
->
log
(
oLog
);
m_pStreamLogger
->
log
(
oLog
);
m_pNetAudioStreamingClient
->
TriggerBlockIncrement
();
//
m_pNetAudioStreamingClient->TriggerBlockIncrement();
}
}
int
CITANetAudioStream
::
Transmit
(
const
ITASampleFrame
&
sfNewSamples
,
int
iNumSamples
)
int
CITANetAudioStream
::
Transmit
(
const
ITASampleFrame
&
sfNewSamples
,
int
iNumSamples
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment