Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
jami-daemon
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
savoirfairelinux
jami-daemon
Commits
ff313727
Commit
ff313727
authored
13 years ago
by
Rafaël Carré
Committed by
Tristan Matthews
13 years ago
Browse files
Options
Downloads
Patches
Plain Diff
AudioRtpSession : privatize members
parent
0105c75e
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
daemon/src/audio/audiortp/AudioRtpSession.cpp
+2
-2
2 additions, 2 deletions
daemon/src/audio/audiortp/AudioRtpSession.cpp
daemon/src/audio/audiortp/AudioRtpSession.h
+21
-25
21 additions, 25 deletions
daemon/src/audio/audiortp/AudioRtpSession.h
with
23 additions
and
27 deletions
daemon/src/audio/audiortp/AudioRtpSession.cpp
+
2
−
2
View file @
ff313727
...
...
@@ -45,11 +45,11 @@ namespace sfl
AudioRtpSession
::
AudioRtpSession
(
SIPCall
*
sipcall
,
RtpMethod
type
,
ost
::
RTPDataQueue
*
queue
,
ost
::
Thread
*
thread
)
:
AudioRtpRecordHandler
(
sipcall
)
,
_ca
(
sipcall
)
,
_type
(
type
)
,
_timestamp
(
0
)
,
_timestampIncrement
(
0
)
,
_timestampCount
(
0
)
,
_isStarted
(
false
)
,
_type
(
type
)
,
_queue
(
queue
)
,
_thread
(
thread
)
{
...
...
This diff is collapsed.
Click to expand it.
daemon/src/audio/audiortp/AudioRtpSession.h
+
21
−
25
View file @
ff313727
...
...
@@ -67,6 +67,17 @@ class AudioRtpSession : public AudioRtpRecordHandler
RtpMethod
getAudioRtpType
()
{
return
_type
;
}
void
updateSessionMedia
(
AudioCodec
*
audioCodec
);
int
startRtpThread
(
AudioCodec
*
);
/**
* Used mostly when receiving a reinvite
*/
void
updateDestinationIpAddress
(
void
);
protected
:
bool
onRTPPacketRecv
(
ost
::
IncomingRTPPkt
&
);
/**
* Send DTMF over RTP (RFC2833). The timestamp and sequence number must be
* incremented as if it was microphone audio. This function change the payload type of the rtp session,
...
...
@@ -76,19 +87,20 @@ class AudioRtpSession : public AudioRtpRecordHandler
void
sendDtmfEvent
(
sfl
::
DtmfEvent
*
dtmf
);
/**
*
Used mostly when receiving a reinvite
*
Send encoded data to peer
*/
void
updateDestinationIpAddress
(
void
);
int
startRtpThread
(
AudioCodec
*
);
void
sendMicData
();
void
stopRtpThread
(
void
)
;
SIPCall
*
_ca
;
bool
onRTPPacketRecv
(
ost
::
IncomingRTPPkt
&
)
;
RtpMethod
_type
;
private
:
protected
:
/**
* Set the audio codec for this RTP session
*/
void
setSessionMedia
(
AudioCodec
*
);
/**
* Set RTP Sockets send/receive timeouts
...
...
@@ -106,25 +118,11 @@ class AudioRtpSession : public AudioRtpRecordHandler
*/
void
receiveSpeakerData
();
/**
* Send encoded data to peer
*/
void
sendMicData
();
/**
* Set the audio codec for this RTP session
*/
void
setSessionMedia
(
AudioCodec
*
);
SIPCall
*
_ca
;
// Main destination address for this rtp session.
// Stored in case or reINVITE, which may require to forget
// this destination and update a new one.
ost
::
InetHostAddress
_remote_ip
;
// Main destination port for this rtp session.
// Stored in case reINVITE, which may require to forget
// this destination and update a new one
...
...
@@ -142,15 +140,13 @@ class AudioRtpSession : public AudioRtpRecordHandler
int
_timestampIncrement
;
/**
* Timestamp reset freq
e
uncy specified in number of packet sent
* Timestamp reset frequ
e
ncy specified in number of packet sent
*/
short
_timestampCount
;
bool
_isStarted
;
RtpMethod
_type
;
ost
::
RTPDataQueue
*
_queue
;
ost
::
Thread
*
_thread
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment