Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Xiph.Org
aom-rav1e
Commits
77a865d9
Commit
77a865d9
authored
Nov 20, 2013
by
Dmitry Kovalev
Committed by
Gerrit Code Review
Nov 20, 2013
Browse files
Merge "Removing old code."
parents
a218a967
87ff7f2a
Changes
2
Hide whitespace changes
Inline
Side-by-side
vp9/encoder/vp9_bitstream.c
View file @
77a865d9
...
...
@@ -1474,53 +1474,3 @@ void vp9_pack_bitstream(VP9_COMP *cpi, uint8_t *dest, unsigned long *size) {
*
size
=
data
-
dest
;
}
#ifdef ENTROPY_STATS
static
void
print_tree_update_for_type
(
FILE
*
f
,
vp9_coeff_stats
*
tree_update_hist
,
int
block_types
,
const
char
*
header
)
{
int
i
,
j
,
k
,
l
,
m
;
fprintf
(
f
,
"const vp9_coeff_prob %s = {
\n
"
,
header
);
for
(
i
=
0
;
i
<
block_types
;
i
++
)
{
fprintf
(
f
,
" {
\n
"
);
for
(
j
=
0
;
j
<
REF_TYPES
;
j
++
)
{
fprintf
(
f
,
" {
\n
"
);
for
(
k
=
0
;
k
<
COEF_BANDS
;
k
++
)
{
fprintf
(
f
,
" {
\n
"
);
for
(
l
=
0
;
l
<
PREV_COEF_CONTEXTS
;
l
++
)
{
fprintf
(
f
,
" {"
);
for
(
m
=
0
;
m
<
ENTROPY_NODES
;
m
++
)
{
fprintf
(
f
,
"%3d, "
,
get_binary_prob
(
tree_update_hist
[
i
][
j
][
k
][
l
][
m
][
0
],
tree_update_hist
[
i
][
j
][
k
][
l
][
m
][
1
]));
}
fprintf
(
f
,
"},
\n
"
);
}
fprintf
(
f
,
"},
\n
"
);
}
fprintf
(
f
,
" },
\n
"
);
}
fprintf
(
f
,
" },
\n
"
);
}
fprintf
(
f
,
"};
\n
"
);
}
void
print_tree_update_probs
()
{
FILE
*
f
=
fopen
(
"coefupdprob.h"
,
"w"
);
fprintf
(
f
,
"
\n
/* Update probabilities for token entropy tree. */
\n\n
"
);
print_tree_update_for_type
(
f
,
tree_update_hist
[
TX_4X4
],
BLOCK_TYPES
,
"vp9_coef_update_probs_4x4[BLOCK_TYPES]"
);
print_tree_update_for_type
(
f
,
tree_update_hist
[
TX_8X8
],
BLOCK_TYPES
,
"vp9_coef_update_probs_8x8[BLOCK_TYPES]"
);
print_tree_update_for_type
(
f
,
tree_update_hist
[
TX_16X16
],
BLOCK_TYPES
,
"vp9_coef_update_probs_16x16[BLOCK_TYPES]"
);
print_tree_update_for_type
(
f
,
tree_update_hist
[
TX_32X32
],
BLOCK_TYPES
,
"vp9_coef_update_probs_32x32[BLOCK_TYPES]"
);
fclose
(
f
);
f
=
fopen
(
"treeupdate.bin"
,
"wb"
);
fwrite
(
tree_update_hist
,
sizeof
(
tree_update_hist
),
1
,
f
);
fclose
(
f
);
}
#endif
vp9/encoder/vp9_onyx_if.c
View file @
77a865d9
...
...
@@ -37,9 +37,6 @@
#include
"vpx_ports/vpx_timer.h"
extern
void
print_tree_update_probs
();
static
void
set_default_lf_deltas
(
struct
loopfilter
*
lf
);
#define DEFAULT_INTERP_FILTER SWITCHABLE
...
...
@@ -467,69 +464,6 @@ static void configure_static_seg_features(VP9_COMP *cpi) {
}
}
#ifdef ENTROPY_STATS
void
vp9_update_mode_context_stats
(
VP9_COMP
*
cpi
)
{
VP9_COMMON
*
cm
=
&
cpi
->
common
;
int
i
,
j
;
unsigned
int
(
*
inter_mode_counts
)[
INTER_MODES
-
1
][
2
]
=
cm
->
fc
.
inter_mode_counts
;
int64_t
(
*
mv_ref_stats
)[
INTER_MODES
-
1
][
2
]
=
cpi
->
mv_ref_stats
;
FILE
*
f
;
// Read the past stats counters
f
=
fopen
(
"mode_context.bin"
,
"rb"
);
if
(
!
f
)
{
vpx_memset
(
cpi
->
mv_ref_stats
,
0
,
sizeof
(
cpi
->
mv_ref_stats
));
}
else
{
fread
(
cpi
->
mv_ref_stats
,
sizeof
(
cpi
->
mv_ref_stats
),
1
,
f
);
fclose
(
f
);
}
// Add in the values for this frame
for
(
i
=
0
;
i
<
INTER_MODE_CONTEXTS
;
i
++
)
{
for
(
j
=
0
;
j
<
INTER_MODES
-
1
;
j
++
)
{
mv_ref_stats
[
i
][
j
][
0
]
+=
(
int64_t
)
inter_mode_counts
[
i
][
j
][
0
];
mv_ref_stats
[
i
][
j
][
1
]
+=
(
int64_t
)
inter_mode_counts
[
i
][
j
][
1
];
}
}
// Write back the accumulated stats
f
=
fopen
(
"mode_context.bin"
,
"wb"
);
fwrite
(
cpi
->
mv_ref_stats
,
sizeof
(
cpi
->
mv_ref_stats
),
1
,
f
);
fclose
(
f
);
}
void
print_mode_context
(
VP9_COMP
*
cpi
)
{
FILE
*
f
=
fopen
(
"vp9_modecont.c"
,
"a"
);
int
i
,
j
;
fprintf
(
f
,
"#include
\"
vp9_entropy.h
\"\n
"
);
fprintf
(
f
,
"const int inter_mode_probs[INTER_MODE_CONTEXTS][INTER_MODES - 1] ="
);
fprintf
(
f
,
"{
\n
"
);
for
(
j
=
0
;
j
<
INTER_MODE_CONTEXTS
;
j
++
)
{
fprintf
(
f
,
" {/* %d */ "
,
j
);
fprintf
(
f
,
" "
);
for
(
i
=
0
;
i
<
INTER_MODES
-
1
;
i
++
)
{
int
this_prob
;
int64_t
count
=
cpi
->
mv_ref_stats
[
j
][
i
][
0
]
+
cpi
->
mv_ref_stats
[
j
][
i
][
1
];
if
(
count
)
this_prob
=
((
cpi
->
mv_ref_stats
[
j
][
i
][
0
]
*
256
)
+
(
count
>>
1
))
/
count
;
else
this_prob
=
128
;
// context probs
fprintf
(
f
,
"%5d, "
,
this_prob
);
}
fprintf
(
f
,
" },
\n
"
);
}
fprintf
(
f
,
"};
\n
"
);
fclose
(
f
);
}
#endif // ENTROPY_STATS
// DEBUG: Print out the segment id of each MB in the current frame.
static
void
print_seg_map
(
VP9_COMP
*
cpi
)
{
VP9_COMMON
*
cm
=
&
cpi
->
common
;
...
...
@@ -1902,14 +1836,6 @@ void vp9_remove_compressor(VP9_PTR *ptr) {
vp9_end_second_pass
(
cpi
);
}
#ifdef ENTROPY_STATS
if
(
cpi
->
pass
!=
1
)
{
print_context_counters
();
print_tree_update_probs
();
print_mode_context
(
cpi
);
}
#endif
#ifdef MODE_STATS
if
(
cpi
->
pass
!=
1
)
{
write_tx_count_stats
();
...
...
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