summaryrefslogtreecommitdiffstats
path: root/stream
diff options
context:
space:
mode:
authorMarcoen Hirschberg <m.hirschberg@activevideo.com>2014-05-26 20:16:40 +0200
committerwm4 <wm4@nowhere>2014-05-28 21:37:44 +0200
commit6e58b20cced05c303f1b35d5baa5f79b8ad612f5 (patch)
tree1010851871a329115500d70272cf35d1ebc961e7 /stream
parentb442b522f6d7064caaacc52021f7020b4ad4d261 (diff)
downloadmpv-6e58b20cced05c303f1b35d5baa5f79b8ad612f5.tar.bz2
mpv-6e58b20cced05c303f1b35d5baa5f79b8ad612f5.tar.xz
audio: change values from bytes-per-second to bits-per-second
The i_bps members of the sh_audio and dev_video structs are mostly used for displaying the average audio and video bitrates. Keeping them in bits-per-second avoids truncating them to bytes-per-second and changing them back lateron.
Diffstat (limited to 'stream')
-rw-r--r--stream/tv.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/stream/tv.c b/stream/tv.c
index aa7367f276..9d7e17a871 100644
--- a/stream/tv.c
+++ b/stream/tv.c
@@ -803,9 +803,10 @@ static int demux_open_tv(demuxer_t *demuxer, enum demux_check check)
sh_a->format = audio_format;
int samplesize = af_fmt2bits(audio_format) / 8;
+ int block_align = samplesize * sh_audio->channels.num;
+ int bytes_per_second = sh_audio->samplerate * block_align;
- sh_audio->i_bps =
- sh_audio->samplerate * samplesize * sh_audio->channels.num;
+ sh_audio->i_bps = bytes_per_second * 8;
// emulate WF for win32 codecs:
sh_audio->wf = talloc_zero(sh_audio, MP_WAVEFORMATEX);
@@ -813,8 +814,8 @@ static int demux_open_tv(demuxer_t *demuxer, enum demux_check check)
sh_audio->wf->nChannels = sh_audio->channels.num;
sh_audio->wf->wBitsPerSample = samplesize * 8;
sh_audio->wf->nSamplesPerSec = sh_audio->samplerate;
- sh_audio->wf->nBlockAlign = samplesize * sh_audio->channels.num;
- sh_audio->wf->nAvgBytesPerSec = sh_audio->i_bps;
+ sh_audio->wf->nBlockAlign = block_align;
+ sh_audio->wf->nAvgBytesPerSec = bytes_per_second;
MP_VERBOSE(tvh, " TV audio: %d channels, %d bits, %d Hz\n",
sh_audio->wf->nChannels, sh_audio->wf->wBitsPerSample,