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
79f03a3b
Commit
79f03a3b
authored
Apr 25, 2008
by
Fiona Glaser
Committed by
Loren Merritt
Apr 27, 2008
Browse files
compute missing nnz count in subme7 cavlc
parent
20720d6b
Changes
1
Hide whitespace changes
Inline
Side-by-side
encoder/cavlc.c
View file @
79f03a3b
...
...
@@ -282,18 +282,17 @@ static inline void x264_macroblock_luma_write_cavlc( x264_t *h, bs_t *s, int i8s
for
(
i8
=
i8start
;
i8
<=
i8end
;
i8
++
)
if
(
h
->
mb
.
i_cbp_luma
&
(
1
<<
i8
)
)
for
(
i4
=
0
;
i4
<
4
;
i4
++
)
{
for
(
i
=
0
;
i
<
16
;
i
++
)
h
->
dct
.
luma4x4
[
i4
+
i8
*
4
][
i
]
=
h
->
dct
.
luma8x8
[
i8
][
i4
+
i
*
4
];
h
->
mb
.
cache
.
non_zero_count
[
x264_scan8
[
i4
+
i8
*
4
]]
=
array_non_zero_count
(
h
->
dct
.
luma4x4
[
i4
+
i8
*
4
],
16
);
}
}
for
(
i8
=
i8start
;
i8
<=
i8end
;
i8
++
)
if
(
h
->
mb
.
i_cbp_luma
&
(
1
<<
i8
)
)
for
(
i4
=
0
;
i4
<
4
;
i4
++
)
{
h
->
mb
.
cache
.
non_zero_count
[
x264_scan8
[
i4
+
i8
*
4
]]
=
array_non_zero_count
(
h
->
dct
.
luma4x4
[
i4
+
i8
*
4
],
16
);
block_residual_write_cavlc
(
h
,
s
,
i4
+
i8
*
4
,
h
->
dct
.
luma4x4
[
i4
+
i8
*
4
],
16
);
}
}
/*****************************************************************************
...
...
@@ -646,7 +645,10 @@ void x264_macroblock_write_cavlc( x264_t *h, bs_t *s )
/* AC Luma */
if
(
h
->
mb
.
i_cbp_luma
!=
0
)
for
(
i
=
0
;
i
<
16
;
i
++
)
{
h
->
mb
.
cache
.
non_zero_count
[
x264_scan8
[
i
]]
=
array_non_zero_count
(
h
->
dct
.
luma4x4
[
i
]
+
1
,
15
);
block_residual_write_cavlc
(
h
,
s
,
i
,
h
->
dct
.
luma4x4
[
i
]
+
1
,
15
);
}
}
else
if
(
h
->
mb
.
i_cbp_luma
!=
0
||
h
->
mb
.
i_cbp_chroma
!=
0
)
{
...
...
@@ -660,7 +662,10 @@ void x264_macroblock_write_cavlc( x264_t *h, bs_t *s )
block_residual_write_cavlc
(
h
,
s
,
BLOCK_INDEX_CHROMA_DC
,
h
->
dct
.
chroma_dc
[
1
],
4
);
if
(
h
->
mb
.
i_cbp_chroma
&
0x02
)
/* Chroma AC residual present */
for
(
i
=
16
;
i
<
24
;
i
++
)
{
h
->
mb
.
cache
.
non_zero_count
[
x264_scan8
[
i
]]
=
array_non_zero_count
(
h
->
dct
.
luma4x4
[
i
]
+
1
,
15
);
block_residual_write_cavlc
(
h
,
s
,
i
,
h
->
dct
.
luma4x4
[
i
]
+
1
,
15
);
}
}
#ifndef RDO_SKIP_BS
...
...
@@ -725,10 +730,10 @@ int x264_partition_size_cavlc( x264_t *h, int i8, int i_pixel )
for
(
j
=
(
i_pixel
<
PIXEL_8x8
);
j
>=
0
;
j
--
)
{
x264_macroblock_luma_write_cavlc
(
h
,
&
s
,
i8
,
i8
);
h
->
mb
.
cache
.
non_zero_count
[
x264_scan8
[
16
+
i8
]]
=
array_non_zero_count
(
h
->
dct
.
luma4x4
[
16
+
i8
]
+
1
,
15
);
block_residual_write_cavlc
(
h
,
&
s
,
16
+
i8
,
h
->
dct
.
luma4x4
[
16
+
i8
]
+
1
,
15
);
h
->
mb
.
cache
.
non_zero_count
[
x264_scan8
[
20
+
i8
]]
=
array_non_zero_count
(
h
->
dct
.
luma4x4
[
20
+
i8
]
+
1
,
15
);
block_residual_write_cavlc
(
h
,
&
s
,
20
+
i8
,
h
->
dct
.
luma4x4
[
20
+
i8
]
+
1
,
15
);
i8
+=
x264_pixel_size
[
i_pixel
].
h
>>
3
;
}
...
...
@@ -777,7 +782,10 @@ static int x264_i8x8_chroma_size_cavlc( x264_t *h )
{
int
i
;
for
(
i
=
16
;
i
<
24
;
i
++
)
{
h
->
mb
.
cache
.
non_zero_count
[
x264_scan8
[
i
]]
=
array_non_zero_count
(
h
->
dct
.
luma4x4
[
i
]
+
1
,
15
);
block_residual_write_cavlc
(
h
,
&
h
->
out
.
bs
,
i
,
h
->
dct
.
luma4x4
[
i
]
+
1
,
15
);
}
}
}
return
h
->
out
.
bs
.
i_bits_encoded
;
...
...
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