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
979b9b1f
Commit
979b9b1f
authored
Oct 07, 2012
by
Michael Niedermayer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
h264: switch some asserts to av_assert1/2()
Signed-off-by:
Michael Niedermayer
<
michaelni@gmx.at
>
parent
1822aee7
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
5 deletions
+5
-5
h264.c
libavcodec/h264.c
+5
-5
No files found.
libavcodec/h264.c
View file @
979b9b1f
...
...
@@ -388,7 +388,7 @@ static void await_references(H264Context *h)
}
else
{
int
i
;
a
ssert
(
IS_8X8
(
mb_type
));
a
v_assert2
(
IS_8X8
(
mb_type
));
for
(
i
=
0
;
i
<
4
;
i
++
)
{
const
int
sub_mb_type
=
h
->
sub_mb_type
[
i
];
...
...
@@ -420,7 +420,7 @@ static void await_references(H264Context *h)
nrefs
);
}
else
{
int
j
;
a
ssert
(
IS_SUB_4X4
(
sub_mb_type
));
a
v_assert2
(
IS_SUB_4X4
(
sub_mb_type
));
for
(
j
=
0
;
j
<
4
;
j
++
)
{
int
sub_y_offset
=
y_offset
+
2
*
(
j
&
2
);
get_lowest_part_y
(
h
,
refs
,
n
+
j
,
4
,
sub_y_offset
,
...
...
@@ -1789,7 +1789,7 @@ static av_always_inline void hl_decode_mb_predict_luma(H264Context *h,
uint64_t
tr_high
;
if
(
dir
==
DIAG_DOWN_LEFT_PRED
||
dir
==
VERT_LEFT_PRED
)
{
const
int
topright_avail
=
(
h
->
topright_samples_available
<<
i
)
&
0x8000
;
a
ssert
(
s
->
mb_y
||
linesize
<=
block_offset
[
i
]);
a
v_assert2
(
s
->
mb_y
||
linesize
<=
block_offset
[
i
]);
if
(
!
topright_avail
)
{
if
(
pixel_shift
)
{
tr_high
=
((
uint16_t
*
)
ptr
)[
3
-
linesize
/
2
]
*
0x0001000100010001ULL
;
...
...
@@ -2862,7 +2862,7 @@ static int decode_slice_header(H264Context *h, H264Context *h0)
s
->
current_picture_ptr
->
frame_num
=
h
->
frame_num
;
// FIXME frame_num cleanup
a
ssert
(
s
->
mb_num
==
s
->
mb_width
*
s
->
mb_height
);
a
v_assert1
(
s
->
mb_num
==
s
->
mb_width
*
s
->
mb_height
);
if
(
first_mb_in_slice
<<
FIELD_OR_MBAFF_PICTURE
>=
s
->
mb_num
||
first_mb_in_slice
>=
s
->
mb_num
)
{
av_log
(
h
->
s
.
avctx
,
AV_LOG_ERROR
,
"first_mb_in_slice overflow
\n
"
);
...
...
@@ -2872,7 +2872,7 @@ static int decode_slice_header(H264Context *h, H264Context *h0)
s
->
resync_mb_y
=
s
->
mb_y
=
(
first_mb_in_slice
/
s
->
mb_width
)
<<
FIELD_OR_MBAFF_PICTURE
;
if
(
s
->
picture_structure
==
PICT_BOTTOM_FIELD
)
s
->
resync_mb_y
=
s
->
mb_y
=
s
->
mb_y
+
1
;
a
ssert
(
s
->
mb_y
<
s
->
mb_height
);
a
v_assert1
(
s
->
mb_y
<
s
->
mb_height
);
if
(
s
->
picture_structure
==
PICT_FRAME
)
{
h
->
curr_pic_num
=
h
->
frame_num
;
...
...
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