Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
VideoLAN
x264
Commits
7833e7bb
Commit
7833e7bb
authored
Jan 17, 2010
by
Fiona Glaser
Browse files
Fix intra refresh with subme < 6
Also improve the quality of intra masking.
parent
eba30280
Changes
1
Hide whitespace changes
Inline
Side-by-side
encoder/analyse.c
View file @
7833e7bb
...
...
@@ -2592,10 +2592,14 @@ intra_analysis:
COPY2_IF_LT
(
i_cost
,
analysis
.
i_satd_i4x4
,
i_type
,
I_4x4
);
COPY2_IF_LT
(
i_cost
,
analysis
.
i_satd_pcm
,
i_type
,
I_PCM
);
h
->
mb
.
i_type
=
i_type
;
if
(
analysis
.
b_force_intra
&&
!
IS_INTRA
(
i_type
)
)
{
/* Intra masking: copy fdec to fenc and re-encode the block as intra in order to make it appear as if
* it was an inter block. */
x264_analyse_update_cache
(
h
,
&
analysis
);
x264_macroblock_encode
(
h
);
h
->
mc
.
copy
[
PIXEL_16x16
](
h
->
mb
.
pic
.
p_fenc
[
0
],
FENC_STRIDE
,
h
->
mb
.
pic
.
p_fdec
[
0
],
FDEC_STRIDE
,
16
);
h
->
mc
.
copy
[
PIXEL_8x8
]
(
h
->
mb
.
pic
.
p_fenc
[
1
],
FENC_STRIDE
,
h
->
mb
.
pic
.
p_fdec
[
1
],
FDEC_STRIDE
,
8
);
h
->
mc
.
copy
[
PIXEL_8x8
]
(
h
->
mb
.
pic
.
p_fenc
[
2
],
FENC_STRIDE
,
h
->
mb
.
pic
.
p_fdec
[
2
],
FDEC_STRIDE
,
8
);
...
...
@@ -2603,8 +2607,6 @@ intra_analysis:
goto
intra_analysis
;
}
h
->
mb
.
i_type
=
i_type
;
if
(
analysis
.
i_mbrd
>=
2
&&
h
->
mb
.
i_type
!=
I_PCM
)
{
if
(
IS_INTRA
(
h
->
mb
.
i_type
)
)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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