Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc
Commits
e2eccee7
Commit
e2eccee7
authored
Mar 03, 2010
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use ISO 80000 units for byte quantities as adequate
parent
b5a14d4d
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
13 additions
and
13 deletions
+13
-13
modules/access/mms/mmstu.c
modules/access/mms/mmstu.c
+2
-2
modules/demux/demuxdump.c
modules/demux/demuxdump.c
+1
-1
modules/demux/ts.c
modules/demux/ts.c
+1
-1
modules/mux/avi.c
modules/mux/avi.c
+1
-1
modules/video_output/msw/direct3d.c
modules/video_output/msw/direct3d.c
+1
-1
src/input/es_out_timeshift.c
src/input/es_out_timeshift.c
+2
-2
src/input/stream.c
src/input/stream.c
+2
-2
src/misc/update.c
src/misc/update.c
+3
-3
No files found.
modules/access/mms/mmstu.c
View file @
e2eccee7
...
@@ -799,7 +799,7 @@ static int MMSOpen( access_t *p_access, vlc_url_t *p_url, int i_proto )
...
@@ -799,7 +799,7 @@ static int MMSOpen( access_t *p_access, vlc_url_t *p_url, int i_proto )
{
{
var_buffer_add16
(
&
buffer
,
0x0000
);
var_buffer_add16
(
&
buffer
,
0x0000
);
msg_Info
(
p_access
,
msg_Info
(
p_access
,
"selecting stream[0x%x] %s (%d
k
b/s)"
,
"selecting stream[0x%x] %s (%d
Ki
b/s)"
,
i
,
i
,
(
p_sys
->
asfh
.
stream
[
i
].
i_cat
==
ASF_STREAM_AUDIO
)
?
(
p_sys
->
asfh
.
stream
[
i
].
i_cat
==
ASF_STREAM_AUDIO
)
?
"audio"
:
"video"
,
"audio"
:
"video"
,
...
@@ -809,7 +809,7 @@ static int MMSOpen( access_t *p_access, vlc_url_t *p_url, int i_proto )
...
@@ -809,7 +809,7 @@ static int MMSOpen( access_t *p_access, vlc_url_t *p_url, int i_proto )
{
{
var_buffer_add16
(
&
buffer
,
0x0002
);
var_buffer_add16
(
&
buffer
,
0x0002
);
msg_Info
(
p_access
,
msg_Info
(
p_access
,
"ignoring stream[0x%x] %s (%d
k
b/s)"
,
"ignoring stream[0x%x] %s (%d
Ki
b/s)"
,
i
,
i
,
(
p_sys
->
asfh
.
stream
[
i
].
i_cat
==
ASF_STREAM_AUDIO
)
?
(
p_sys
->
asfh
.
stream
[
i
].
i_cat
==
ASF_STREAM_AUDIO
)
?
"audio"
:
"video"
,
"audio"
:
"video"
,
...
...
modules/demux/demuxdump.c
View file @
e2eccee7
...
@@ -148,7 +148,7 @@ static void Close( vlc_object_t *p_this )
...
@@ -148,7 +148,7 @@ static void Close( vlc_object_t *p_this )
demux_t
*
p_demux
=
(
demux_t
*
)
p_this
;
demux_t
*
p_demux
=
(
demux_t
*
)
p_this
;
demux_sys_t
*
p_sys
=
p_demux
->
p_sys
;
demux_sys_t
*
p_sys
=
p_demux
->
p_sys
;
msg_Info
(
p_demux
,
"closing %s (%"
PRId64
" K
bytes
dumped)"
,
p_sys
->
psz_file
,
msg_Info
(
p_demux
,
"closing %s (%"
PRId64
" K
iB
dumped)"
,
p_sys
->
psz_file
,
p_sys
->
i_write
/
1024
);
p_sys
->
i_write
/
1024
);
if
(
p_sys
->
p_file
!=
stdout
)
if
(
p_sys
->
p_file
!=
stdout
)
...
...
modules/demux/ts.c
View file @
e2eccee7
...
@@ -885,7 +885,7 @@ static void Close( vlc_object_t *p_this )
...
@@ -885,7 +885,7 @@ static void Close( vlc_object_t *p_this )
/* If in dump mode, then close the file */
/* If in dump mode, then close the file */
if
(
p_sys
->
b_file_out
)
if
(
p_sys
->
b_file_out
)
{
{
msg_Info
(
p_demux
,
"closing %s (%"
PRId64
" K
bytes
dumped)"
,
msg_Info
(
p_demux
,
"closing %s (%"
PRId64
" K
iB
dumped)"
,
p_sys
->
psz_file
,
p_sys
->
i_write
/
1024
);
p_sys
->
psz_file
,
p_sys
->
i_write
/
1024
);
if
(
p_sys
->
p_file
!=
stdout
)
if
(
p_sys
->
p_file
!=
stdout
)
...
...
modules/mux/avi.c
View file @
e2eccee7
...
@@ -211,7 +211,7 @@ static void Close( vlc_object_t * p_this )
...
@@ -211,7 +211,7 @@ static void Close( vlc_object_t * p_this )
(
uint64_t
)
p_stream
->
i_duration
;
(
uint64_t
)
p_stream
->
i_duration
;
}
}
msg_Info
(
p_mux
,
"stream[%d] duration:%"
PRId64
" totalsize:%"
PRId64
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
,
i_stream
,
(
int64_t
)
p_stream
->
i_duration
/
(
int64_t
)
1000000
,
(
int64_t
)
p_stream
->
i_duration
/
(
int64_t
)
1000000
,
p_stream
->
i_totalsize
,
p_stream
->
i_totalsize
,
...
...
modules/video_output/msw/direct3d.c
View file @
e2eccee7
...
@@ -1036,7 +1036,7 @@ static void Direct3DDestroyScene(vout_display_t *vd)
...
@@ -1036,7 +1036,7 @@ static void Direct3DDestroyScene(vout_display_t *vd)
* It copies picture surface into a texture and renders into a scene.
* 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
* 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 M
i
B of video RAM.
*/
*/
static
void
Direct3DRenderScene
(
vout_display_t
*
vd
,
LPDIRECT3DSURFACE9
surface
)
static
void
Direct3DRenderScene
(
vout_display_t
*
vd
,
LPDIRECT3DSURFACE9
surface
)
{
{
...
...
src/input/es_out_timeshift.c
View file @
e2eccee7
...
@@ -331,7 +331,7 @@ es_out_t *input_EsOutTimeshiftNew( input_thread_t *p_input, es_out_t *p_next_out
...
@@ -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
;
p_sys
->
i_tmp_size_max
=
50
*
1024
*
1024
;
else
else
p_sys
->
i_tmp_size_max
=
__MAX
(
i_tmp_size_max
,
1
*
1024
*
1024
);
p_sys
->
i_tmp_size_max
=
__MAX
(
i_tmp_size_max
,
1
*
1024
*
1024
);
msg_Dbg
(
p_input
,
"using timeshift granularity of %d M
Bytes
"
,
msg_Dbg
(
p_input
,
"using timeshift granularity of %d M
iB
"
,
(
int
)
p_sys
->
i_tmp_size_max
/
(
1024
*
1024
)
);
(
int
)
p_sys
->
i_tmp_size_max
/
(
1024
*
1024
)
);
char
*
psz_tmp_path
=
var_CreateGetNonEmptyString
(
p_input
,
"input-timeshift-path"
);
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_
...
@@ -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_r
=
0
;
p_storage
->
i_cmd_max
=
30000
;
p_storage
->
i_cmd_max
=
30000
;
p_storage
->
p_cmd
=
malloc
(
p_storage
->
i_cmd_max
*
sizeof
(
*
p_storage
->
p_cmd
)
);
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
)
if
(
!
p_storage
->
p_cmd
||
!
p_storage
->
p_filew
||
!
p_storage
->
p_filer
)
{
{
...
...
src/input/stream.c
View file @
e2eccee7
...
@@ -685,7 +685,7 @@ static void AStreamPrebufferBlock( stream_t *s )
...
@@ -685,7 +685,7 @@ static void AStreamPrebufferBlock( stream_t *s )
(
p_sys
->
stat
.
i_read_time
+
1
);
(
p_sys
->
stat
.
i_read_time
+
1
);
msg_Dbg
(
s
,
"prebuffering done %"
PRId64
" bytes in %"
PRId64
"s - "
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_bytes
,
p_sys
->
stat
.
i_read_time
/
INT64_C
(
1000000
),
p_sys
->
stat
.
i_read_time
/
INT64_C
(
1000000
),
i_byterate
/
1024
);
i_byterate
/
1024
);
...
@@ -1440,7 +1440,7 @@ static void AStreamPrebufferStream( stream_t *s )
...
@@ -1440,7 +1440,7 @@ static void AStreamPrebufferStream( stream_t *s )
(
p_sys
->
stat
.
i_read_time
+
1
);
(
p_sys
->
stat
.
i_read_time
+
1
);
msg_Dbg
(
s
,
"pre-buffering done %"
PRId64
" bytes in %"
PRId64
"s - "
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_bytes
,
p_sys
->
stat
.
i_read_time
/
INT64_C
(
1000000
),
p_sys
->
stat
.
i_read_time
/
INT64_C
(
1000000
),
i_byterate
/
1024
);
i_byterate
/
1024
);
...
...
src/misc/update.c
View file @
e2eccee7
...
@@ -486,11 +486,11 @@ static char *size_str( long int l_size )
...
@@ -486,11 +486,11 @@ static char *size_str( long int l_size )
char
*
psz_tmp
=
NULL
;
char
*
psz_tmp
=
NULL
;
int
i_retval
=
0
;
int
i_retval
=
0
;
if
(
l_size
>>
30
)
if
(
l_size
>>
30
)
i_retval
=
asprintf
(
&
psz_tmp
,
_
(
"%.1f GB"
),
(
float
)
l_size
/
(
1
<<
30
)
);
i_retval
=
asprintf
(
&
psz_tmp
,
_
(
"%.1f G
i
B"
),
(
float
)
l_size
/
(
1
<<
30
)
);
else
if
(
l_size
>>
20
)
else
if
(
l_size
>>
20
)
i_retval
=
asprintf
(
&
psz_tmp
,
_
(
"%.1f MB"
),
(
float
)
l_size
/
(
1
<<
20
)
);
i_retval
=
asprintf
(
&
psz_tmp
,
_
(
"%.1f M
i
B"
),
(
float
)
l_size
/
(
1
<<
20
)
);
else
if
(
l_size
>>
10
)
else
if
(
l_size
>>
10
)
i_retval
=
asprintf
(
&
psz_tmp
,
_
(
"%.1f
k
B"
),
(
float
)
l_size
/
(
1
<<
10
)
);
i_retval
=
asprintf
(
&
psz_tmp
,
_
(
"%.1f
Ki
B"
),
(
float
)
l_size
/
(
1
<<
10
)
);
else
else
i_retval
=
asprintf
(
&
psz_tmp
,
_
(
"%ld B"
),
l_size
);
i_retval
=
asprintf
(
&
psz_tmp
,
_
(
"%ld B"
),
l_size
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment