summaryrefslogtreecommitdiffstats
path: root/video/decode
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 /video/decode
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 'video/decode')
-rw-r--r--video/decode/dec_video.c4
-rw-r--r--video/decode/dec_video.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/video/decode/dec_video.c b/video/decode/dec_video.c
index dcadb5e491..57307b7399 100644
--- a/video/decode/dec_video.c
+++ b/video/decode/dec_video.c
@@ -388,8 +388,8 @@ int video_reconfig_filters(struct dec_video *d_video,
struct sh_video *sh = d_video->header->video;
MP_VERBOSE(d_video, "VIDEO: %dx%d %5.3f fps %5.1f kbps (%4.1f kB/s)\n",
- p.w, p.h, sh->fps, sh->i_bps * 0.008,
- sh->i_bps / 1000.0);
+ p.w, p.h, sh->fps, sh->i_bps / 1000.0,
+ sh->i_bps / 8000.0);
MP_VERBOSE(d_video, "VDec: vo config request - %d x %d (%s)\n",
p.w, p.h, vo_format_name(p.imgfmt));
diff --git a/video/decode/dec_video.h b/video/decode/dec_video.h
index 58ec99a86b..e0f07e0531 100644
--- a/video/decode/dec_video.h
+++ b/video/decode/dec_video.h
@@ -73,7 +73,7 @@ struct dec_video {
double decoded_pts;
float stream_aspect; // aspect ratio in media headers (DVD IFO files)
- int i_bps; // == bitrate (compressed bytes/sec)
+ int i_bps; // == bitrate (compressed bits/sec)
float fps; // FPS from demuxer or from user override
float initial_decoder_aspect;