diff options
| author | Nanang Izzuddin <nanang@teluu.com> | 2011-07-19 03:42:28 +0000 |
|---|---|---|
| committer | Nanang Izzuddin <nanang@teluu.com> | 2011-07-19 03:42:28 +0000 |
| commit | cd283c8825c9a94400f27735acb1c9385e90ffc8 (patch) | |
| tree | 56d5722310fa8957ce5d1ba7cbd137cf8802dcc7 /pjmedia/src/pjmedia/mem_player.c | |
| parent | ed8f8d08abba9040f769e922aa0c1adbde86fbbc (diff) | |
Re #1326: Initial code integration from branch 2.0-dev to trunk as "2.0-pre-alpha-svn".
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@3664 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjmedia/src/pjmedia/mem_player.c')
| -rw-r--r-- | pjmedia/src/pjmedia/mem_player.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/pjmedia/src/pjmedia/mem_player.c b/pjmedia/src/pjmedia/mem_player.c index c32bcb09..b0b6fa9c 100644 --- a/pjmedia/src/pjmedia/mem_player.c +++ b/pjmedia/src/pjmedia/mem_player.c @@ -25,7 +25,7 @@ #define THIS_FILE "mem_player.c" -#define SIGNATURE PJMEDIA_PORT_SIGNATURE('M', 'P', 'l', 'y') +#define SIGNATURE PJMEDIA_SIG_PORT_MEM_PLAYER #define BYTES_PER_SAMPLE 2 struct mem_player @@ -48,7 +48,7 @@ struct mem_player static pj_status_t mem_put_frame(pjmedia_port *this_port, - const pjmedia_frame *frame); + pjmedia_frame *frame); static pj_status_t mem_get_frame(pjmedia_port *this_port, pjmedia_frame *frame); static pj_status_t mem_on_destroy(pjmedia_port *this_port); @@ -125,7 +125,7 @@ PJ_DEF(pj_status_t) pjmedia_mem_player_set_eof_cb( pjmedia_port *port, static pj_status_t mem_put_frame( pjmedia_port *this_port, - const pjmedia_frame *frame) + pjmedia_frame *frame) { PJ_UNUSED_ARG(this_port); PJ_UNUSED_ARG(frame); @@ -165,7 +165,7 @@ static pj_status_t mem_get_frame( pjmedia_port *this_port, player->eof = PJ_FALSE; } - size_needed = this_port->info.bytes_per_frame; + size_needed = PJMEDIA_PIA_AVG_FSZ(&this_port->info); size_written = 0; endpos = player->buffer + player->buf_size; @@ -200,11 +200,11 @@ static pj_status_t mem_get_frame( pjmedia_port *this_port, } } - frame->size = this_port->info.bytes_per_frame; + frame->size = PJMEDIA_PIA_AVG_FSZ(&this_port->info); frame->timestamp.u64 = player->timestamp.u64; frame->type = PJMEDIA_FRAME_TYPE_AUDIO; - player->timestamp.u64 += this_port->info.samples_per_frame; + player->timestamp.u64 += PJMEDIA_PIA_SPF(&this_port->info); return PJ_SUCCESS; } |