Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
A
aom-rav1e
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Xiph.Org
aom-rav1e
Commits
8b71b8a6
Commit
8b71b8a6
authored
Apr 02, 2013
by
John Koleszar
Committed by
Gerrit Code Review
Apr 02, 2013
Browse files
Options
Browse Files
Download
Plain Diff
Merge "Renaming sb32_coded and sb64_coded fields." into experimental
parents
dc12e6c0
dca8ad17
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
18 additions
and
18 deletions
+18
-18
vp9/common/vp9_onyxc_int.h
vp9/common/vp9_onyxc_int.h
+2
-2
vp9/decoder/vp9_decodframe.c
vp9/decoder/vp9_decodframe.c
+4
-4
vp9/encoder/vp9_bitstream.c
vp9/encoder/vp9_bitstream.c
+6
-6
vp9/encoder/vp9_encodeframe.c
vp9/encoder/vp9_encodeframe.c
+4
-4
vp9/encoder/vp9_onyx_if.c
vp9/encoder/vp9_onyx_if.c
+2
-2
No files found.
vp9/common/vp9_onyxc_int.h
View file @
8b71b8a6
...
...
@@ -271,8 +271,8 @@ typedef struct VP9Common {
vp9_prob
prob_intra_coded
;
vp9_prob
prob_last_coded
;
vp9_prob
prob_gf_coded
;
vp9_prob
sb32_coded
;
vp9_prob
sb64_coded
;
vp9_prob
prob_
sb32_coded
;
vp9_prob
prob_
sb64_coded
;
// Context probabilities when using predictive coding of segment id
vp9_prob
segment_pred_probs
[
PREDICTION_PROBS
];
...
...
vp9/decoder/vp9_decodframe.c
View file @
8b71b8a6
...
...
@@ -992,7 +992,7 @@ static void decode_sb_row(VP9D_COMP *pbi, VP9_COMMON *pc,
for
(
mb_col
=
pc
->
cur_tile_mb_col_start
;
mb_col
<
pc
->
cur_tile_mb_col_end
;
mb_col
+=
4
)
{
if
(
vp9_read
(
bc
,
pc
->
sb64_coded
))
{
if
(
vp9_read
(
bc
,
pc
->
prob_
sb64_coded
))
{
#ifdef DEC_DEBUG
dec_debug
=
(
pc
->
current_video_frame
==
11
&&
pc
->
show_frame
&&
mb_row
==
8
&&
mb_col
==
0
);
...
...
@@ -1018,7 +1018,7 @@ static void decode_sb_row(VP9D_COMP *pbi, VP9_COMMON *pc,
xd
->
sb_index
=
j
;
if
(
vp9_read
(
bc
,
pc
->
sb32_coded
))
{
if
(
vp9_read
(
bc
,
pc
->
prob_
sb32_coded
))
{
#ifdef DEC_DEBUG
dec_debug
=
(
pc
->
current_video_frame
==
11
&&
pc
->
show_frame
&&
mb_row
+
y_idx_sb
==
8
&&
mb_col
+
x_idx_sb
==
0
);
...
...
@@ -1696,8 +1696,8 @@ int vp9_decode_frame(VP9D_COMP *pbi, const uint8_t **p_data_end) {
}
}
pc
->
sb64_coded
=
vp9_read_prob
(
&
header_bc
);
pc
->
sb32_coded
=
vp9_read_prob
(
&
header_bc
);
pc
->
prob_
sb64_coded
=
vp9_read_prob
(
&
header_bc
);
pc
->
prob_
sb32_coded
=
vp9_read_prob
(
&
header_bc
);
xd
->
lossless
=
vp9_read_bit
(
&
header_bc
);
if
(
xd
->
lossless
)
{
pc
->
txfm_mode
=
ONLY_4X4
;
...
...
vp9/encoder/vp9_bitstream.c
View file @
8b71b8a6
...
...
@@ -1690,7 +1690,7 @@ static void write_modes(VP9_COMP *cpi, vp9_writer* const bc,
m
=
m_ptr
;
for
(
mb_col
=
c
->
cur_tile_mb_col_start
;
mb_col
<
c
->
cur_tile_mb_col_end
;
mb_col
+=
4
,
m
+=
4
)
{
vp9_write
(
bc
,
m
->
mbmi
.
sb_type
==
BLOCK_SIZE_SB64X64
,
c
->
sb64_coded
);
vp9_write
(
bc
,
m
->
mbmi
.
sb_type
==
BLOCK_SIZE_SB64X64
,
c
->
prob_
sb64_coded
);
if
(
m
->
mbmi
.
sb_type
==
BLOCK_SIZE_SB64X64
)
{
write_modes_b
(
cpi
,
m
,
bc
,
tok
,
tok_end
,
mb_row
,
mb_col
);
}
else
{
...
...
@@ -1704,7 +1704,7 @@ static void write_modes(VP9_COMP *cpi, vp9_writer* const bc,
mb_row
+
y_idx_sb
>=
c
->
mb_rows
)
continue
;
vp9_write
(
bc
,
sb_m
->
mbmi
.
sb_type
,
c
->
sb32_coded
);
vp9_write
(
bc
,
sb_m
->
mbmi
.
sb_type
,
c
->
prob_
sb32_coded
);
if
(
sb_m
->
mbmi
.
sb_type
)
{
assert
(
sb_m
->
mbmi
.
sb_type
==
BLOCK_SIZE_SB32X32
);
write_modes_b
(
cpi
,
sb_m
,
bc
,
tok
,
tok_end
,
...
...
@@ -2494,10 +2494,10 @@ void vp9_pack_bitstream(VP9_COMP *cpi, unsigned char *dest,
}
}
pc
->
sb64_coded
=
get_binary_prob
(
cpi
->
sb64_count
[
0
],
cpi
->
sb64_count
[
1
]);
vp9_write_literal
(
&
header_bc
,
pc
->
sb64_coded
,
8
);
pc
->
sb32_coded
=
get_binary_prob
(
cpi
->
sb32_count
[
0
],
cpi
->
sb32_count
[
1
]);
vp9_write_literal
(
&
header_bc
,
pc
->
sb32_coded
,
8
);
pc
->
prob_
sb64_coded
=
get_binary_prob
(
cpi
->
sb64_count
[
0
],
cpi
->
sb64_count
[
1
]);
vp9_write_literal
(
&
header_bc
,
pc
->
prob_
sb64_coded
,
8
);
pc
->
prob_
sb32_coded
=
get_binary_prob
(
cpi
->
sb32_count
[
0
],
cpi
->
sb32_count
[
1
]);
vp9_write_literal
(
&
header_bc
,
pc
->
prob_
sb32_coded
,
8
);
vp9_write_bit
(
&
header_bc
,
cpi
->
mb
.
e_mbd
.
lossless
);
if
(
cpi
->
mb
.
e_mbd
.
lossless
)
{
...
...
vp9/encoder/vp9_encodeframe.c
View file @
8b71b8a6
...
...
@@ -1086,7 +1086,7 @@ static void encode_sb_row(VP9_COMP *cpi,
splitmodes_used
=
pick_mb_modes
(
cpi
,
mb_row
+
y_idx
,
mb_col
+
x_idx
,
tp
,
&
mb_rate
,
&
mb_dist
);
mb_rate
+=
vp9_cost_bit
(
cm
->
sb32_coded
,
0
);
mb_rate
+=
vp9_cost_bit
(
cm
->
prob_
sb32_coded
,
0
);
if
(
cpi
->
sf
.
splitmode_breakout
)
{
sb32_skip
=
splitmodes_used
;
...
...
@@ -1099,7 +1099,7 @@ static void encode_sb_row(VP9_COMP *cpi,
/* Pick a mode assuming that it applies to all 4 of the MBs in the SB */
pick_sb_modes
(
cpi
,
mb_row
+
y_idx
,
mb_col
+
x_idx
,
tp
,
&
sb_rate
,
&
sb_dist
);
sb_rate
+=
vp9_cost_bit
(
cm
->
sb32_coded
,
1
);
sb_rate
+=
vp9_cost_bit
(
cm
->
prob_
sb32_coded
,
1
);
}
/* Decide whether to encode as a SB or 4xMBs */
...
...
@@ -1131,13 +1131,13 @@ static void encode_sb_row(VP9_COMP *cpi,
memcpy
(
cm
->
above_context
+
mb_col
,
&
a
,
sizeof
(
a
));
memcpy
(
cm
->
left_context
,
&
l
,
sizeof
(
l
));
sb32_rate
+=
vp9_cost_bit
(
cm
->
sb64_coded
,
0
);
sb32_rate
+=
vp9_cost_bit
(
cm
->
prob_
sb64_coded
,
0
);
if
(
!
sb64_skip
&&
!
(((
cm
->
mb_cols
&
3
)
&&
mb_col
+
3
>=
cm
->
mb_cols
)
||
((
cm
->
mb_rows
&
3
)
&&
mb_row
+
3
>=
cm
->
mb_rows
)))
{
pick_sb64_modes
(
cpi
,
mb_row
,
mb_col
,
tp
,
&
sb64_rate
,
&
sb64_dist
);
sb64_rate
+=
vp9_cost_bit
(
cm
->
sb64_coded
,
1
);
sb64_rate
+=
vp9_cost_bit
(
cm
->
prob_
sb64_coded
,
1
);
}
/* Decide whether to encode as a SB or 4xMBs */
...
...
vp9/encoder/vp9_onyx_if.c
View file @
8b71b8a6
...
...
@@ -1374,8 +1374,8 @@ VP9_PTR vp9_create_compressor(VP9_CONFIG *oxcf) {
cm
->
prob_last_coded
=
128
;
cm
->
prob_gf_coded
=
128
;
cm
->
prob_intra_coded
=
63
;
cm
->
sb32_coded
=
200
;
cm
->
sb64_coded
=
200
;
cm
->
prob_sb32_coded
=
200
;
cm
->
prob_sb64_coded
=
200
;
for
(
i
=
0
;
i
<
COMP_PRED_CONTEXTS
;
i
++
)
cm
->
prob_comppred
[
i
]
=
128
;
for
(
i
=
0
;
i
<
TX_SIZE_MAX_SB
-
1
;
i
++
)
...
...
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