Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-1.1
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-1.1
Commits
d2bd568b
Commit
d2bd568b
authored
Mar 25, 2008
by
Jean-Paul Saman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Cleanup whitespace and use fastmemcpy.
parent
6f6396b6
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
6 deletions
+7
-6
modules/codec/faad.c
modules/codec/faad.c
+5
-4
modules/codec/x264.c
modules/codec/x264.c
+2
-2
No files found.
modules/codec/faad.c
View file @
d2bd568b
...
@@ -188,7 +188,7 @@ static int Open( vlc_object_t *p_this )
...
@@ -188,7 +188,7 @@ static int Open( vlc_object_t *p_this )
/* buffer */
/* buffer */
p_sys
->
i_buffer
=
p_sys
->
i_buffer_size
=
0
;
p_sys
->
i_buffer
=
p_sys
->
i_buffer_size
=
0
;
p_sys
->
p_buffer
=
0
;
p_sys
->
p_buffer
=
NULL
;
p_sys
->
i_input_rate
=
INPUT_RATE_DEFAULT
;
p_sys
->
i_input_rate
=
INPUT_RATE_DEFAULT
;
...
@@ -231,7 +231,7 @@ static aout_buffer_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
...
@@ -231,7 +231,7 @@ static aout_buffer_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
/* FIXME: multiple blocks per frame */
/* FIXME: multiple blocks per frame */
if
(
p_block
->
i_buffer
>
i_header_size
)
if
(
p_block
->
i_buffer
>
i_header_size
)
{
{
memcpy
(
p_block
->
p_buffer
,
p_dec
->
p_libvlc
->
pf_
memcpy
(
p_block
->
p_buffer
,
p_block
->
p_buffer
+
i_header_size
,
p_block
->
p_buffer
+
i_header_size
,
p_block
->
i_buffer
-
i_header_size
);
p_block
->
i_buffer
-
i_header_size
);
p_block
->
i_buffer
-=
i_header_size
;
p_block
->
i_buffer
-=
i_header_size
;
...
@@ -246,9 +246,9 @@ static aout_buffer_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
...
@@ -246,9 +246,9 @@ static aout_buffer_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
p_sys
->
p_buffer
=
realloc
(
p_sys
->
p_buffer
,
p_sys
->
i_buffer_size
);
p_sys
->
p_buffer
=
realloc
(
p_sys
->
p_buffer
,
p_sys
->
i_buffer_size
);
}
}
if
(
p_block
->
i_buffer
)
if
(
p_block
->
i_buffer
>
0
)
{
{
memcpy
(
&
p_sys
->
p_buffer
[
p_sys
->
i_buffer
],
p_dec
->
p_libvlc
->
pf_
memcpy
(
&
p_sys
->
p_buffer
[
p_sys
->
i_buffer
],
p_block
->
p_buffer
,
p_block
->
i_buffer
);
p_block
->
p_buffer
,
p_block
->
i_buffer
);
p_sys
->
i_buffer
+=
p_block
->
i_buffer
;
p_sys
->
i_buffer
+=
p_block
->
i_buffer
;
p_block
->
i_buffer
=
0
;
p_block
->
i_buffer
=
0
;
...
@@ -492,3 +492,4 @@ static void DoReordering( uint32_t *p_out, uint32_t *p_in, int i_samples,
...
@@ -492,3 +492,4 @@ static void DoReordering( uint32_t *p_out, uint32_t *p_in, int i_samples,
((
uint16_t
*
)
p_out
)[
i
*
i_nb_channels
+
pi_chan_table
[
j
]]
=
((
uint16_t
*
)
p_out
)[
i
*
i_nb_channels
+
pi_chan_table
[
j
]]
=
((
uint16_t
*
)
p_in
)[
i
*
i_nb_channels
+
j
];
((
uint16_t
*
)
p_in
)[
i
*
i_nb_channels
+
j
];
}
}
modules/codec/x264.c
View file @
d2bd568b
...
@@ -1351,7 +1351,7 @@ static void Close( vlc_object_t *p_this )
...
@@ -1351,7 +1351,7 @@ static void Close( vlc_object_t *p_this )
{
{
encoder_t
*
p_enc
=
(
encoder_t
*
)
p_this
;
encoder_t
*
p_enc
=
(
encoder_t
*
)
p_this
;
encoder_sys_t
*
p_sys
=
p_enc
->
p_sys
;
encoder_sys_t
*
p_sys
=
p_enc
->
p_sys
;
free
(
p_sys
->
psz_stat_name
);
free
(
p_sys
->
psz_stat_name
);
x264_encoder_close
(
p_sys
->
h
);
x264_encoder_close
(
p_sys
->
h
);
...
@@ -1369,7 +1369,7 @@ static void Close( vlc_object_t *p_this )
...
@@ -1369,7 +1369,7 @@ static void Close( vlc_object_t *p_this )
var_Set
(
p_enc
->
p_libvlc
,
"pthread_win32_count"
,
count
);
var_Set
(
p_enc
->
p_libvlc
,
"pthread_win32_count"
,
count
);
if
(
count
.
i_int
==
0
)
if
(
count
.
i_int
==
0
)
{
{
pthread_win32_thread_detach_np
();
pthread_win32_thread_detach_np
();
pthread_win32_process_detach_np
();
pthread_win32_process_detach_np
();
msg_Dbg
(
p_enc
,
"pthread-win32 deinitialized"
);
msg_Dbg
(
p_enc
,
"pthread-win32 deinitialized"
);
...
...
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