projects
/
paraslash.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Get rid of afd->path.
[paraslash.git]
/
ortp_send.c
diff --git
a/ortp_send.c
b/ortp_send.c
index 9095a8f87272a5d1ae26ae8c6f0a42cae0a4aa41..0c6cccb902a7be84f0f4ce1d40c699c7ff544cda 100644
(file)
--- a/
ortp_send.c
+++ b/
ortp_send.c
@@
-11,35
+11,36
@@
#include "server.cmdline.h"
#include "para.h"
#include "server.cmdline.h"
#include "para.h"
+#include "error.h"
+#include "string.h"
#include "afh.h"
#include "afh.h"
+#include "afs.h"
#include "server.h"
#include "vss.h"
#include "send.h"
#include "list.h"
#include "ortp.h"
#include "server.h"
#include "vss.h"
#include "send.h"
#include "list.h"
#include "ortp.h"
-#include "string.h"
-/**
\cond convert in_addr to ascii
*/
+/**
Convert in_addr to ascii.
*/
#define TARGET_ADDR(oc) inet_ntoa((oc)->addr)
#define TARGET_ADDR(oc) inet_ntoa((oc)->addr)
-/** \endcond */
-/**
describes one entry in the list of targets for the ortp sender
*/
+/**
Describes one entry in the list of targets for the ortp sender.
*/
struct ortp_target {
struct ortp_target {
-
/** address info
*/
+
/** Address info.
*/
struct in_addr addr;
struct in_addr addr;
-
/** whether the ortp sender is activated
*/
+
/** Whether the ortp sender is activated.
*/
int status;
int status;
-
/** the ortp timestamp increases by this amount
*/
+
/** The ortp timestamp increases by this amount.
*/
uint32_t chunk_ts;
uint32_t chunk_ts;
-
/** the currently used timestamp for this target
*/
+
/** The currently used timestamp for this target.
*/
uint32_t last_ts;
uint32_t last_ts;
-
/** the position of this target in the list of targets
*/
+
/** The position of this target in the list of targets.
*/
struct list_head node;
struct list_head node;
-
/** the UDP port
*/
+
/** The UDP port.
*/
int port;
int port;
-
/** non-zero if at least one chunk has been sent to this target
*/
+
/** Non-zero if at least one chunk has been sent to this target.
*/
int streaming;
int streaming;
-
/** the session pointer from libortp
*/
+
/** The session pointer from libortp.
*/
RtpSession *session;
};
RtpSession *session;
};
@@
-168,6
+169,8
@@
static void ortp_send(long unsigned current_chunk, long unsigned chunks_sent,
if (self->status != SENDER_ON)
return;
if (self->status != SENDER_ON)
return;
+
+// PARA_NOTICE_LOG("sending %lu\n", current_chunk);
chunk_tv = vss_chunk_time();
if (!chunk_tv)
return;
chunk_tv = vss_chunk_time();
if (!chunk_tv)
return;