Commit e2eccee7 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Use ISO 80000 units for byte quantities as adequate

parent b5a14d4d
......@@ -799,7 +799,7 @@ static int MMSOpen( access_t *p_access, vlc_url_t *p_url, int i_proto )
{
var_buffer_add16( &buffer, 0x0000 );
msg_Info( p_access,
"selecting stream[0x%x] %s (%d kb/s)",
"selecting stream[0x%x] %s (%d Kib/s)",
i,
( p_sys->asfh.stream[i].i_cat == ASF_STREAM_AUDIO ) ?
"audio" : "video" ,
......@@ -809,7 +809,7 @@ static int MMSOpen( access_t *p_access, vlc_url_t *p_url, int i_proto )
{
var_buffer_add16( &buffer, 0x0002 );
msg_Info( p_access,
"ignoring stream[0x%x] %s (%d kb/s)",
"ignoring stream[0x%x] %s (%d Kib/s)",
i,
( p_sys->asfh.stream[i].i_cat == ASF_STREAM_AUDIO ) ?
"audio" : "video" ,
......
......@@ -148,7 +148,7 @@ static void Close( vlc_object_t *p_this )
demux_t *p_demux = (demux_t*)p_this;
demux_sys_t *p_sys = p_demux->p_sys;
msg_Info( p_demux ,"closing %s (%"PRId64" Kbytes dumped)", p_sys->psz_file,
msg_Info( p_demux ,"closing %s (%"PRId64" KiB dumped)", p_sys->psz_file,
p_sys->i_write / 1024 );
if( p_sys->p_file != stdout )
......
......@@ -885,7 +885,7 @@ static void Close( vlc_object_t *p_this )
/* If in dump mode, then close the file */
if( p_sys->b_file_out )
{
msg_Info( p_demux ,"closing %s (%"PRId64" Kbytes dumped)",
msg_Info( p_demux ,"closing %s (%"PRId64" KiB dumped)",
p_sys->psz_file, p_sys->i_write / 1024 );
if( p_sys->p_file != stdout )
......
......@@ -211,7 +211,7 @@ static void Close( vlc_object_t * p_this )
(uint64_t)p_stream->i_duration;
}
msg_Info( p_mux, "stream[%d] duration:%"PRId64" totalsize:%"PRId64
" frames:%d fps:%f kb/s:%d",
" frames:%d fps:%f KiB/s:%d",
i_stream,
(int64_t)p_stream->i_duration / (int64_t)1000000,
p_stream->i_totalsize,
......
......@@ -1036,7 +1036,7 @@ static void Direct3DDestroyScene(vout_display_t *vd)
* It copies picture surface into a texture and renders into a scene.
*
* This function is intented for higher end 3D cards, with pixel shader support
* and at least 64 MB of video RAM.
* and at least 64 MiB of video RAM.
*/
static void Direct3DRenderScene(vout_display_t *vd, LPDIRECT3DSURFACE9 surface)
{
......
......@@ -331,7 +331,7 @@ es_out_t *input_EsOutTimeshiftNew( input_thread_t *p_input, es_out_t *p_next_out
p_sys->i_tmp_size_max = 50*1024*1024;
else
p_sys->i_tmp_size_max = __MAX( i_tmp_size_max, 1*1024*1024 );
msg_Dbg( p_input, "using timeshift granularity of %d MBytes",
msg_Dbg( p_input, "using timeshift granularity of %d MiB",
(int)p_sys->i_tmp_size_max/(1024*1024) );
char *psz_tmp_path = var_CreateGetNonEmptyString( p_input, "input-timeshift-path" );
......@@ -1074,7 +1074,7 @@ static ts_storage_t *TsStorageNew( const char *psz_tmp_path, int64_t i_tmp_size_
p_storage->i_cmd_r = 0;
p_storage->i_cmd_max = 30000;
p_storage->p_cmd = malloc( p_storage->i_cmd_max * sizeof(*p_storage->p_cmd) );
//fprintf( stderr, "\nSTORAGE name=%s size=%d kbytes\n", p_storage->psz_file, p_storage->i_cmd_max * sizeof(*p_storage->p_cmd) /1024 );
//fprintf( stderr, "\nSTORAGE name=%s size=%d KiB\n", p_storage->psz_file, p_storage->i_cmd_max * sizeof(*p_storage->p_cmd) /1024 );
if( !p_storage->p_cmd || !p_storage->p_filew || !p_storage->p_filer )
{
......
......@@ -685,7 +685,7 @@ static void AStreamPrebufferBlock( stream_t *s )
(p_sys->stat.i_read_time + 1);
msg_Dbg( s, "prebuffering done %"PRId64" bytes in %"PRId64"s - "
"%"PRId64" kbytes/s",
"%"PRId64" KiB/s",
p_sys->stat.i_bytes,
p_sys->stat.i_read_time / INT64_C(1000000),
i_byterate / 1024 );
......@@ -1440,7 +1440,7 @@ static void AStreamPrebufferStream( stream_t *s )
(p_sys->stat.i_read_time+1);
msg_Dbg( s, "pre-buffering done %"PRId64" bytes in %"PRId64"s - "
"%"PRId64" kbytes/s",
"%"PRId64" KiB/s",
p_sys->stat.i_bytes,
p_sys->stat.i_read_time / INT64_C(1000000),
i_byterate / 1024 );
......
......@@ -486,11 +486,11 @@ static char *size_str( long int l_size )
char *psz_tmp = NULL;
int i_retval = 0;
if( l_size >> 30 )
i_retval = asprintf( &psz_tmp, _("%.1f GB"), (float)l_size/(1<<30) );
i_retval = asprintf( &psz_tmp, _("%.1f GiB"), (float)l_size/(1<<30) );
else if( l_size >> 20 )
i_retval = asprintf( &psz_tmp, _("%.1f MB"), (float)l_size/(1<<20) );
i_retval = asprintf( &psz_tmp, _("%.1f MiB"), (float)l_size/(1<<20) );
else if( l_size >> 10 )
i_retval = asprintf( &psz_tmp, _("%.1f kB"), (float)l_size/(1<<10) );
i_retval = asprintf( &psz_tmp, _("%.1f KiB"), (float)l_size/(1<<10) );
else
i_retval = asprintf( &psz_tmp, _("%ld B"), l_size );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment