Fixed ticket #70: Frame timestamp not propagated correctly in PJMEDIA
git-svn-id: https://svn.pjsip.org/repos/pjproject/trunk@887 74dad513-b988-da41-8d7b-12977e46ad98
This commit is contained in:
parent
2fa9422ff2
commit
c357d64b0a
|
@ -920,6 +920,19 @@ PJ_DECL(pj_status_t) pj_get_timestamp(pj_timestamp *ts);
|
|||
*/
|
||||
PJ_DECL(pj_status_t) pj_get_timestamp_freq(pj_timestamp *freq);
|
||||
|
||||
/**
|
||||
* Set timestamp from 32bit values.
|
||||
* @param t The timestamp to be set.
|
||||
* @param hi The high 32bit part.
|
||||
* @param lo The low 32bit part.
|
||||
*/
|
||||
PJ_INLINE(void) pj_set_timestamp32(pj_timestamp *t, pj_uint32_t hi,
|
||||
pj_uint32_t lo)
|
||||
{
|
||||
t->u32.hi = hi;
|
||||
t->u32.lo = lo;
|
||||
}
|
||||
|
||||
/**
|
||||
* Add timestamp t2 to t1.
|
||||
* @param t1 t1.
|
||||
|
@ -938,6 +951,23 @@ PJ_INLINE(void) pj_add_timestamp(pj_timestamp *t1, const pj_timestamp *t2)
|
|||
#endif
|
||||
}
|
||||
|
||||
/**
|
||||
* Add timestamp t2 to t1.
|
||||
* @param t1 t1.
|
||||
* @param t2 t2.
|
||||
*/
|
||||
PJ_INLINE(void) pj_add_timestamp32(pj_timestamp *t1, pj_uint32_t t2)
|
||||
{
|
||||
#if PJ_HAS_INT64
|
||||
t1->u64 += t2;
|
||||
#else
|
||||
pj_uint32_t old = t1->u32.lo;
|
||||
t1->u32.lo += t2;
|
||||
if (t1->u32.lo < old)
|
||||
++t1->u32.hi;
|
||||
#endif
|
||||
}
|
||||
|
||||
/**
|
||||
* Substract timestamp t2 from t1.
|
||||
* @param t1 t1.
|
||||
|
@ -958,6 +988,43 @@ PJ_INLINE(void) pj_sub_timestamp(pj_timestamp *t1, const pj_timestamp *t2)
|
|||
#endif
|
||||
}
|
||||
|
||||
/**
|
||||
* Substract timestamp t2 from t1.
|
||||
* @param t1 t1.
|
||||
* @param t2 t2.
|
||||
*/
|
||||
PJ_INLINE(void) pj_sub_timestamp32(pj_timestamp *t1, pj_uint32_t t2)
|
||||
{
|
||||
#if PJ_HAS_INT64
|
||||
t1->u64 -= t2;
|
||||
#else
|
||||
if (t1->u32.lo >= t2)
|
||||
t1->u32.lo -= t2;
|
||||
else {
|
||||
t1->u32.lo -= t2;
|
||||
--t1->u32.hi;
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the timestamp difference between t2 and t1 (that is t2 minus t1),
|
||||
* and return a 32bit signed integer difference.
|
||||
*/
|
||||
PJ_INLINE(pj_int32_t) pj_timestamp_diff32(const pj_timestamp *t1,
|
||||
const pj_timestamp *t2)
|
||||
{
|
||||
/* Be careful with the signess (I think!) */
|
||||
#if PJ_HAS_INT64
|
||||
pj_int64_t diff = t2->u64 - t1->u64;
|
||||
return (pj_int32_t) diff;
|
||||
#else
|
||||
pj_int32 diff = t2->u32.lo - t1->u32.lo;
|
||||
return diff;
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Calculate the elapsed time, and store it in pj_time_val.
|
||||
* This function calculates the elapsed time using highest precision
|
||||
|
|
|
@ -1311,11 +1311,11 @@ static pj_status_t read_port( pjmedia_conf *conf,
|
|||
* Write the mixed signal to the port.
|
||||
*/
|
||||
static pj_status_t write_port(pjmedia_conf *conf, struct conf_port *cport,
|
||||
pj_uint32_t timestamp,
|
||||
const pj_timestamp *timestamp,
|
||||
pjmedia_frame_type *frm_type)
|
||||
{
|
||||
pj_int16_t *buf;
|
||||
unsigned j;
|
||||
unsigned j, ts;
|
||||
pj_status_t status;
|
||||
|
||||
*frm_type = PJMEDIA_FRAME_TYPE_AUDIO;
|
||||
|
@ -1331,6 +1331,9 @@ static pj_status_t write_port(pjmedia_conf *conf, struct conf_port *cport,
|
|||
|
||||
pjmedia_frame frame;
|
||||
|
||||
/* Adjust the timestamp */
|
||||
frame.timestamp.u64 = timestamp->u64 * cport->clock_rate /
|
||||
conf->clock_rate;
|
||||
frame.type = PJMEDIA_FRAME_TYPE_NONE;
|
||||
frame.buf = NULL;
|
||||
frame.size = 0;
|
||||
|
@ -1457,7 +1460,10 @@ static pj_status_t write_port(pjmedia_conf *conf, struct conf_port *cport,
|
|||
frame.type = PJMEDIA_FRAME_TYPE_AUDIO;
|
||||
frame.buf = (pj_int16_t*)cport->mix_buf;
|
||||
frame.size = conf->samples_per_frame * BYTES_PER_SAMPLE;
|
||||
frame.timestamp.u64 = timestamp;
|
||||
/* No need to adjust timestamp, port has the same
|
||||
* clock rate as conference bridge
|
||||
*/
|
||||
frame.timestamp = *timestamp;
|
||||
|
||||
TRACE_((THIS_FILE, "put_frame %.*s, count=%d",
|
||||
(int)cport->name.slen, cport->name.ptr,
|
||||
|
@ -1491,6 +1497,7 @@ static pj_status_t write_port(pjmedia_conf *conf, struct conf_port *cport,
|
|||
|
||||
/* Transmit while we have enough frame in the tx_buf. */
|
||||
status = PJ_SUCCESS;
|
||||
ts = 0;
|
||||
while (cport->tx_buf_count >= cport->samples_per_frame &&
|
||||
status == PJ_SUCCESS)
|
||||
{
|
||||
|
@ -1505,7 +1512,15 @@ static pj_status_t write_port(pjmedia_conf *conf, struct conf_port *cport,
|
|||
frame.type = PJMEDIA_FRAME_TYPE_AUDIO;
|
||||
frame.buf = cport->tx_buf;
|
||||
frame.size = cport->samples_per_frame * BYTES_PER_SAMPLE;
|
||||
frame.timestamp.u64 = timestamp;
|
||||
/* Adjust timestamp as port may have different clock rate
|
||||
* than the bridge.
|
||||
*/
|
||||
frame.timestamp.u64 = timestamp->u64 * cport->clock_rate /
|
||||
conf->clock_rate;
|
||||
|
||||
/* Add timestamp for individual frame */
|
||||
frame.timestamp.u64 += ts;
|
||||
ts += cport->samples_per_frame;
|
||||
|
||||
TRACE_((THIS_FILE, "put_frame %.*s, count=%d",
|
||||
(int)cport->name.slen, cport->name.ptr,
|
||||
|
@ -1746,7 +1761,7 @@ static pj_status_t get_frame(pjmedia_port *this_port,
|
|||
/* Var "ci" is to count how many ports have been visited. */
|
||||
++ci;
|
||||
|
||||
status = write_port( conf, conf_port, frame->timestamp.u32.lo,
|
||||
status = write_port( conf, conf_port, &frame->timestamp,
|
||||
&frm_type);
|
||||
if (status != PJ_SUCCESS) {
|
||||
/* bennylp: why do we need this????
|
||||
|
|
Loading…
Reference in New Issue