summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNanang Izzuddin <nanang@teluu.com>2011-12-20 10:01:35 +0000
committerNanang Izzuddin <nanang@teluu.com>2011-12-20 10:01:35 +0000
commit7d9daa07205d5fd4dc560687bb3715f68113bcc5 (patch)
tree47ce053e47aa02135295fc16660e697073583d97
parentf7f47c2b3b622e5d00faf456b4b7ab10c63a2f49 (diff)
Misc (re #1393): fix bitrate calculation in stream.c and wav_playlist.c.
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@3917 74dad513-b988-da41-8d7b-12977e46ad98
-rw-r--r--pjmedia/src/pjmedia/stream.c5
-rw-r--r--pjmedia/src/pjmedia/wav_playlist.c2
2 files changed, 3 insertions, 4 deletions
diff --git a/pjmedia/src/pjmedia/stream.c b/pjmedia/src/pjmedia/stream.c
index 52a6a73c..fba0c39b 100644
--- a/pjmedia/src/pjmedia/stream.c
+++ b/pjmedia/src/pjmedia/stream.c
@@ -2089,9 +2089,8 @@ PJ_DEF(pj_status_t) pjmedia_stream_create( pjmedia_endpt *endpt,
stream->port.info.fmt.id = stream->codec_param.info.fmt_id;
if (stream->codec_param.info.fmt_id == PJMEDIA_FORMAT_L16) {
/* Raw format */
- afd->avg_bps = afd->max_bps = afd->clock_rate *
- afd->bits_per_sample / 8;
-
+ afd->avg_bps = afd->max_bps = afd->clock_rate * afd->channel_count *
+ afd->bits_per_sample;
stream->port.put_frame = &put_frame;
stream->port.get_frame = &get_frame;
diff --git a/pjmedia/src/pjmedia/wav_playlist.c b/pjmedia/src/pjmedia/wav_playlist.c
index ca5e4c55..bd8ca356 100644
--- a/pjmedia/src/pjmedia/wav_playlist.c
+++ b/pjmedia/src/pjmedia/wav_playlist.c
@@ -475,7 +475,7 @@ PJ_DEF(pj_status_t) pjmedia_wav_playlist_create(pj_pool_t *pool,
afd->frame_time_usec = ptime * 1000;
afd->avg_bps = afd->max_bps = afd->clock_rate *
afd->channel_count *
- afd->bits_per_sample / 8;
+ afd->bits_per_sample;
has_wave_info = PJ_TRUE;