Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
F
ffmpeg.wasm-core
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Linshizhi
ffmpeg.wasm-core
Commits
5ebef79a
Commit
5ebef79a
authored
Jul 29, 2016
by
Anton Khirnov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix instances of broken indentation found by gcc 6
parent
5ed4644d
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
73 additions
and
72 deletions
+73
-72
ivi_dsp.c
libavcodec/ivi_dsp.c
+4
-4
mpegvideo.c
libavcodec/mpegvideo.c
+9
-9
qdm2.c
libavcodec/qdm2.c
+58
-57
mxfdec.c
libavformat/mxfdec.c
+2
-2
No files found.
libavcodec/ivi_dsp.c
View file @
5ebef79a
...
...
@@ -542,8 +542,8 @@ void ff_ivi_inverse_slant_8x8(const int32_t *in, int16_t *out, uint32_t pitch, c
}
else
dst
[
0
]
=
dst
[
8
]
=
dst
[
16
]
=
dst
[
24
]
=
dst
[
32
]
=
dst
[
40
]
=
dst
[
48
]
=
dst
[
56
]
=
0
;
src
++
;
dst
++
;
src
++
;
dst
++
;
}
#undef COMPENSATE
...
...
@@ -582,8 +582,8 @@ void ff_ivi_inverse_slant_4x4(const int32_t *in, int16_t *out, uint32_t pitch, c
}
else
dst
[
0
]
=
dst
[
4
]
=
dst
[
8
]
=
dst
[
12
]
=
0
;
src
++
;
dst
++
;
src
++
;
dst
++
;
}
#undef COMPENSATE
...
...
libavcodec/mpegvideo.c
View file @
5ebef79a
...
...
@@ -548,7 +548,7 @@ do {\
av_fast_malloc
(
&
s
->
bitstream_buffer
,
&
s
->
allocated_bitstream_buffer_size
,
s1
->
allocated_bitstream_buffer_size
);
s
->
bitstream_buffer_size
=
s1
->
bitstream_buffer_size
;
s
->
bitstream_buffer_size
=
s1
->
bitstream_buffer_size
;
memcpy
(
s
->
bitstream_buffer
,
s1
->
bitstream_buffer
,
s1
->
bitstream_buffer_size
);
memset
(
s
->
bitstream_buffer
+
s
->
bitstream_buffer_size
,
0
,
...
...
@@ -850,10 +850,10 @@ av_cold int ff_mpv_common_init(MpegEncContext *s)
for
(
i
=
0
;
i
<
nb_slices
;
i
++
)
{
if
(
init_duplicate_context
(
s
->
thread_context
[
i
])
<
0
)
goto
fail
;
s
->
thread_context
[
i
]
->
start_mb_y
=
(
s
->
mb_height
*
(
i
)
+
nb_slices
/
2
)
/
nb_slices
;
s
->
thread_context
[
i
]
->
end_mb_y
=
(
s
->
mb_height
*
(
i
+
1
)
+
nb_slices
/
2
)
/
nb_slices
;
s
->
thread_context
[
i
]
->
start_mb_y
=
(
s
->
mb_height
*
(
i
)
+
nb_slices
/
2
)
/
nb_slices
;
s
->
thread_context
[
i
]
->
end_mb_y
=
(
s
->
mb_height
*
(
i
+
1
)
+
nb_slices
/
2
)
/
nb_slices
;
}
}
else
{
if
(
init_duplicate_context
(
s
)
<
0
)
...
...
@@ -974,10 +974,10 @@ int ff_mpv_common_frame_size_change(MpegEncContext *s)
for
(
i
=
0
;
i
<
nb_slices
;
i
++
)
{
if
((
err
=
init_duplicate_context
(
s
->
thread_context
[
i
]))
<
0
)
goto
fail
;
s
->
thread_context
[
i
]
->
start_mb_y
=
(
s
->
mb_height
*
(
i
)
+
nb_slices
/
2
)
/
nb_slices
;
s
->
thread_context
[
i
]
->
end_mb_y
=
(
s
->
mb_height
*
(
i
+
1
)
+
nb_slices
/
2
)
/
nb_slices
;
s
->
thread_context
[
i
]
->
start_mb_y
=
(
s
->
mb_height
*
(
i
)
+
nb_slices
/
2
)
/
nb_slices
;
s
->
thread_context
[
i
]
->
end_mb_y
=
(
s
->
mb_height
*
(
i
+
1
)
+
nb_slices
/
2
)
/
nb_slices
;
}
}
else
{
if
(
init_duplicate_context
(
s
)
<
0
)
...
...
libavcodec/qdm2.c
View file @
5ebef79a
...
...
@@ -722,67 +722,68 @@ static void fill_coding_method_array(sb_int8_array tone_level_idx,
}
tone_level_idx_temp
[
ch
][
sb
][
0
]
=
tone_level_idx_temp
[
ch
][
sb
][
1
];
}
acc
=
0
;
for
(
ch
=
0
;
ch
<
nb_channels
;
ch
++
)
for
(
sb
=
0
;
sb
<
30
;
sb
++
)
for
(
j
=
0
;
j
<
64
;
j
++
)
acc
+=
tone_level_idx_temp
[
ch
][
sb
][
j
];
multres
=
0x66666667LL
*
(
acc
*
10
);
esp_40
=
(
multres
>>
32
)
/
8
+
((
multres
&
0xffffffff
)
>>
31
);
for
(
ch
=
0
;
ch
<
nb_channels
;
ch
++
)
for
(
sb
=
0
;
sb
<
30
;
sb
++
)
for
(
j
=
0
;
j
<
64
;
j
++
)
{
comp
=
tone_level_idx_temp
[
ch
][
sb
][
j
]
*
esp_40
*
10
;
if
(
comp
<
0
)
comp
+=
0xff
;
comp
/=
256
;
// signed shift
switch
(
sb
)
{
case
0
:
if
(
comp
<
30
)
comp
=
30
;
comp
+=
15
;
break
;
case
1
:
if
(
comp
<
24
)
comp
=
24
;
comp
+=
10
;
break
;
case
2
:
case
3
:
case
4
:
if
(
comp
<
16
)
comp
=
16
;
}
if
(
comp
<=
5
)
tmp
=
0
;
else
if
(
comp
<=
10
)
tmp
=
10
;
else
if
(
comp
<=
16
)
tmp
=
16
;
else
if
(
comp
<=
24
)
tmp
=
-
1
;
else
tmp
=
0
;
coding_method
[
ch
][
sb
][
j
]
=
((
tmp
&
0xfffa
)
+
30
)
&
0xff
;
acc
=
0
;
for
(
ch
=
0
;
ch
<
nb_channels
;
ch
++
)
for
(
sb
=
0
;
sb
<
30
;
sb
++
)
for
(
j
=
0
;
j
<
64
;
j
++
)
acc
+=
tone_level_idx_temp
[
ch
][
sb
][
j
];
multres
=
0x66666667LL
*
(
acc
*
10
);
esp_40
=
(
multres
>>
32
)
/
8
+
((
multres
&
0xffffffff
)
>>
31
);
for
(
ch
=
0
;
ch
<
nb_channels
;
ch
++
)
for
(
sb
=
0
;
sb
<
30
;
sb
++
)
for
(
j
=
0
;
j
<
64
;
j
++
)
{
comp
=
tone_level_idx_temp
[
ch
][
sb
][
j
]
*
esp_40
*
10
;
if
(
comp
<
0
)
comp
+=
0xff
;
comp
/=
256
;
// signed shift
switch
(
sb
)
{
case
0
:
if
(
comp
<
30
)
comp
=
30
;
comp
+=
15
;
break
;
case
1
:
if
(
comp
<
24
)
comp
=
24
;
comp
+=
10
;
break
;
case
2
:
case
3
:
case
4
:
if
(
comp
<
16
)
comp
=
16
;
}
if
(
comp
<=
5
)
tmp
=
0
;
else
if
(
comp
<=
10
)
tmp
=
10
;
else
if
(
comp
<=
16
)
tmp
=
16
;
else
if
(
comp
<=
24
)
tmp
=
-
1
;
else
tmp
=
0
;
coding_method
[
ch
][
sb
][
j
]
=
((
tmp
&
0xfffa
)
+
30
)
&
0xff
;
}
for
(
sb
=
0
;
sb
<
30
;
sb
++
)
fix_coding_method_array
(
sb
,
nb_channels
,
coding_method
);
for
(
ch
=
0
;
ch
<
nb_channels
;
ch
++
)
for
(
sb
=
0
;
sb
<
30
;
sb
++
)
fix_coding_method_array
(
sb
,
nb_channels
,
coding_method
);
for
(
ch
=
0
;
ch
<
nb_channels
;
ch
++
)
for
(
sb
=
0
;
sb
<
30
;
sb
++
)
for
(
j
=
0
;
j
<
64
;
j
++
)
if
(
sb
>=
10
)
{
if
(
coding_method
[
ch
][
sb
][
j
]
<
10
)
coding_method
[
ch
][
sb
][
j
]
=
10
;
for
(
j
=
0
;
j
<
64
;
j
++
)
if
(
sb
>=
10
)
{
if
(
coding_method
[
ch
][
sb
][
j
]
<
10
)
coding_method
[
ch
][
sb
][
j
]
=
10
;
}
else
{
if
(
sb
>=
2
)
{
if
(
coding_method
[
ch
][
sb
][
j
]
<
16
)
coding_method
[
ch
][
sb
][
j
]
=
16
;
}
else
{
if
(
sb
>=
2
)
{
if
(
coding_method
[
ch
][
sb
][
j
]
<
16
)
coding_method
[
ch
][
sb
][
j
]
=
16
;
}
else
{
if
(
coding_method
[
ch
][
sb
][
j
]
<
30
)
coding_method
[
ch
][
sb
][
j
]
=
30
;
}
if
(
coding_method
[
ch
][
sb
][
j
]
<
30
)
coding_method
[
ch
][
sb
][
j
]
=
30
;
}
}
}
else
{
// superblocktype_2_3 != 0
for
(
ch
=
0
;
ch
<
nb_channels
;
ch
++
)
for
(
sb
=
0
;
sb
<
30
;
sb
++
)
...
...
libavformat/mxfdec.c
View file @
5ebef79a
...
...
@@ -2479,8 +2479,8 @@ static int mxf_read_packet(AVFormatContext *s, AVPacket *pkt)
if
((
ret64
=
avio_seek
(
s
->
pb
,
pos
,
SEEK_SET
))
<
0
)
return
ret64
;
if
((
ret
=
av_get_packet
(
s
->
pb
,
pkt
,
size
))
!=
size
)
return
ret
<
0
?
ret
:
AVERROR_EOF
;
if
((
ret
=
av_get_packet
(
s
->
pb
,
pkt
,
size
))
!=
size
)
return
ret
<
0
?
ret
:
AVERROR_EOF
;
pkt
->
stream_index
=
0
;
...
...
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