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
b82722df
Commit
b82722df
authored
Jan 25, 2015
by
Hendrik Leppkes
Committed by
Anton Khirnov
Jan 27, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
hevc: reindent after previous commit
Signed-off-by:
Anton Khirnov
<
anton@khirnov.net
>
parent
e72e8c5a
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
32 additions
and
32 deletions
+32
-32
hevc.c
libavcodec/hevc.c
+20
-20
hevc_refs.c
libavcodec/hevc_refs.c
+12
-12
No files found.
libavcodec/hevc.c
View file @
b82722df
...
...
@@ -2591,19 +2591,19 @@ static int decode_nal_unit(HEVCContext *s, const HEVCNAL *nal)
if
(
ret
<
0
)
goto
fail
;
}
else
{
ctb_addr_ts
=
hls_slice_data
(
s
);
if
(
ctb_addr_ts
>=
(
s
->
sps
->
ctb_width
*
s
->
sps
->
ctb_height
))
{
s
->
is_decoded
=
1
;
if
((
s
->
pps
->
transquant_bypass_enable_flag
||
(
s
->
sps
->
pcm
.
loop_filter_disable_flag
&&
s
->
sps
->
pcm_enabled_flag
))
&&
s
->
sps
->
sao_enabled
)
restore_tqb_pixels
(
s
);
}
ctb_addr_ts
=
hls_slice_data
(
s
);
if
(
ctb_addr_ts
>=
(
s
->
sps
->
ctb_width
*
s
->
sps
->
ctb_height
))
{
s
->
is_decoded
=
1
;
if
((
s
->
pps
->
transquant_bypass_enable_flag
||
(
s
->
sps
->
pcm
.
loop_filter_disable_flag
&&
s
->
sps
->
pcm_enabled_flag
))
&&
s
->
sps
->
sao_enabled
)
restore_tqb_pixels
(
s
);
}
if
(
ctb_addr_ts
<
0
)
{
ret
=
ctb_addr_ts
;
goto
fail
;
}
if
(
ctb_addr_ts
<
0
)
{
ret
=
ctb_addr_ts
;
goto
fail
;
}
}
break
;
case
NAL_EOS_NUT
:
...
...
@@ -2917,16 +2917,16 @@ static int hevc_decode_frame(AVCodecContext *avctx, void *data, int *got_output,
av_log
(
avctx
,
AV_LOG_ERROR
,
"hardware accelerator failed to decode picture
\n
"
);
}
else
{
/* verify the SEI checksum */
if
(
avctx
->
err_recognition
&
AV_EF_CRCCHECK
&&
s
->
is_decoded
&&
s
->
is_md5
)
{
ret
=
verify_md5
(
s
,
s
->
ref
->
frame
);
if
(
ret
<
0
&&
avctx
->
err_recognition
&
AV_EF_EXPLODE
)
{
ff_hevc_unref_frame
(
s
,
s
->
ref
,
~
0
);
return
ret
;
/* verify the SEI checksum */
if
(
avctx
->
err_recognition
&
AV_EF_CRCCHECK
&&
s
->
is_decoded
&&
s
->
is_md5
)
{
ret
=
verify_md5
(
s
,
s
->
ref
->
frame
);
if
(
ret
<
0
&&
avctx
->
err_recognition
&
AV_EF_EXPLODE
)
{
ff_hevc_unref_frame
(
s
,
s
->
ref
,
~
0
);
return
ret
;
}
}
}
}
s
->
is_md5
=
0
;
if
(
s
->
is_decoded
)
{
...
...
libavcodec/hevc_refs.c
View file @
b82722df
...
...
@@ -356,18 +356,18 @@ static HEVCFrame *generate_missing_ref(HEVCContext *s, int poc)
return
NULL
;
if
(
!
s
->
avctx
->
hwaccel
)
{
if
(
!
s
->
sps
->
pixel_shift
)
{
for
(
i
=
0
;
frame
->
frame
->
buf
[
i
];
i
++
)
memset
(
frame
->
frame
->
buf
[
i
]
->
data
,
1
<<
(
s
->
sps
->
bit_depth
-
1
),
frame
->
frame
->
buf
[
i
]
->
size
);
}
else
{
for
(
i
=
0
;
frame
->
frame
->
data
[
i
];
i
++
)
for
(
y
=
0
;
y
<
(
s
->
sps
->
height
>>
s
->
sps
->
vshift
[
i
]);
y
++
)
for
(
x
=
0
;
x
<
(
s
->
sps
->
width
>>
s
->
sps
->
hshift
[
i
]);
x
++
)
{
AV_WN16
(
frame
->
frame
->
data
[
i
]
+
y
*
frame
->
frame
->
linesize
[
i
]
+
2
*
x
,
1
<<
(
s
->
sps
->
bit_depth
-
1
));
}
}
if
(
!
s
->
sps
->
pixel_shift
)
{
for
(
i
=
0
;
frame
->
frame
->
buf
[
i
];
i
++
)
memset
(
frame
->
frame
->
buf
[
i
]
->
data
,
1
<<
(
s
->
sps
->
bit_depth
-
1
),
frame
->
frame
->
buf
[
i
]
->
size
);
}
else
{
for
(
i
=
0
;
frame
->
frame
->
data
[
i
];
i
++
)
for
(
y
=
0
;
y
<
(
s
->
sps
->
height
>>
s
->
sps
->
vshift
[
i
]);
y
++
)
for
(
x
=
0
;
x
<
(
s
->
sps
->
width
>>
s
->
sps
->
hshift
[
i
]);
x
++
)
{
AV_WN16
(
frame
->
frame
->
data
[
i
]
+
y
*
frame
->
frame
->
linesize
[
i
]
+
2
*
x
,
1
<<
(
s
->
sps
->
bit_depth
-
1
));
}
}
}
frame
->
poc
=
poc
;
...
...
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