Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
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
a127a792
Commit
a127a792
authored
May 23, 2017
by
Alex Converse
Browse files
Remove more unused motion vector cost arrays
Change-Id: I68f8cc50d81a0cac116c6f342202b85ad2e6e3b2
parent
d85d94da
Changes
3
Hide whitespace changes
Inline
Side-by-side
av1/encoder/block.h
View file @
a127a792
...
...
@@ -142,10 +142,8 @@ struct macroblock {
int
*
nmvcost
[
NMV_CONTEXTS
][
2
];
int
*
nmvcost_hp
[
NMV_CONTEXTS
][
2
];
int
**
mv_cost_stack
[
NMV_CONTEXTS
];
int
**
mvcost
;
int
*
nmvsadcost
[
2
];
int
*
nmvsadcost_hp
[
2
];
#if CONFIG_MOTION_VAR
int32_t
*
wsrc_buf
;
int32_t
*
mask_buf
;
...
...
av1/encoder/encoder.c
View file @
a127a792
...
...
@@ -507,9 +507,6 @@ static void save_coding_context(AV1_COMP *cpi) {
av1_copy
(
cc
->
nmv_costs_hp
,
cpi
->
nmv_costs_hp
);
}
av1_copy
(
cc
->
nmvcosts
,
cpi
->
nmvcosts
);
av1_copy
(
cc
->
nmvcosts_hp
,
cpi
->
nmvcosts_hp
);
av1_copy
(
cc
->
last_ref_lf_deltas
,
cm
->
lf
.
last_ref_deltas
);
av1_copy
(
cc
->
last_mode_lf_deltas
,
cm
->
lf
.
last_mode_deltas
);
...
...
@@ -529,9 +526,6 @@ static void restore_coding_context(AV1_COMP *cpi) {
av1_copy
(
cpi
->
nmv_costs_hp
,
cc
->
nmv_costs_hp
);
}
av1_copy
(
cpi
->
nmvcosts
,
cc
->
nmvcosts
);
av1_copy
(
cpi
->
nmvcosts_hp
,
cc
->
nmvcosts_hp
);
av1_copy
(
cm
->
lf
.
last_ref_deltas
,
cc
->
last_ref_lf_deltas
);
av1_copy
(
cm
->
lf
.
last_mode_deltas
,
cc
->
last_mode_lf_deltas
);
...
...
@@ -2050,41 +2044,6 @@ void av1_change_config(struct AV1_COMP *cpi, const AV1EncoderConfig *oxcf) {
#endif // CONFIG_ANS && ANS_MAX_SYMBOLS
}
#ifndef M_LOG2_E
#define M_LOG2_E 0.693147180559945309417
#endif
#define log2f(x) (log(x) / (float)M_LOG2_E)
static
void
cal_nmvsadcosts
(
int
*
mvsadcost
[
2
])
{
int
i
=
1
;
mvsadcost
[
0
][
0
]
=
0
;
mvsadcost
[
1
][
0
]
=
0
;
do
{
double
z
=
256
*
(
2
*
(
log2f
(
8
*
i
)
+
.
6
));
mvsadcost
[
0
][
i
]
=
(
int
)
z
;
mvsadcost
[
1
][
i
]
=
(
int
)
z
;
mvsadcost
[
0
][
-
i
]
=
(
int
)
z
;
mvsadcost
[
1
][
-
i
]
=
(
int
)
z
;
}
while
(
++
i
<=
MV_MAX
);
}
static
void
cal_nmvsadcosts_hp
(
int
*
mvsadcost
[
2
])
{
int
i
=
1
;
mvsadcost
[
0
][
0
]
=
0
;
mvsadcost
[
1
][
0
]
=
0
;
do
{
double
z
=
256
*
(
2
*
(
log2f
(
8
*
i
)
+
.
6
));
mvsadcost
[
0
][
i
]
=
(
int
)
z
;
mvsadcost
[
1
][
i
]
=
(
int
)
z
;
mvsadcost
[
0
][
-
i
]
=
(
int
)
z
;
mvsadcost
[
1
][
-
i
]
=
(
int
)
z
;
}
while
(
++
i
<=
MV_MAX
);
}
static
INLINE
void
init_upsampled_ref_frame_bufs
(
AV1_COMP
*
cpi
)
{
int
i
;
...
...
@@ -2167,11 +2126,6 @@ AV1_COMP *av1_create_compressor(AV1EncoderConfig *oxcf,
memset
(
cpi
->
nmv_costs_hp
,
0
,
sizeof
(
cpi
->
nmv_costs_hp
));
}
memset
(
cpi
->
nmvcosts
,
0
,
sizeof
(
cpi
->
nmvcosts
));
memset
(
cpi
->
nmvcosts_hp
,
0
,
sizeof
(
cpi
->
nmvcosts_hp
));
memset
(
cpi
->
nmvsadcosts
,
0
,
sizeof
(
cpi
->
nmvsadcosts
));
memset
(
cpi
->
nmvsadcosts_hp
,
0
,
sizeof
(
cpi
->
nmvsadcosts_hp
));
for
(
i
=
0
;
i
<
(
sizeof
(
cpi
->
mbgraph_stats
)
/
sizeof
(
cpi
->
mbgraph_stats
[
0
]));
i
++
)
{
CHECK_MEM_ERROR
(
...
...
@@ -2239,13 +2193,6 @@ AV1_COMP *av1_create_compressor(AV1EncoderConfig *oxcf,
cpi
->
td
.
mb
.
nmvcost_hp
[
i
][
0
]
=
&
cpi
->
nmv_costs_hp
[
i
][
0
][
MV_MAX
];
cpi
->
td
.
mb
.
nmvcost_hp
[
i
][
1
]
=
&
cpi
->
nmv_costs_hp
[
i
][
1
][
MV_MAX
];
}
cpi
->
td
.
mb
.
nmvsadcost
[
0
]
=
&
cpi
->
nmvsadcosts
[
0
][
MV_MAX
];
cpi
->
td
.
mb
.
nmvsadcost
[
1
]
=
&
cpi
->
nmvsadcosts
[
1
][
MV_MAX
];
cal_nmvsadcosts
(
cpi
->
td
.
mb
.
nmvsadcost
);
cpi
->
td
.
mb
.
nmvsadcost_hp
[
0
]
=
&
cpi
->
nmvsadcosts_hp
[
0
][
MV_MAX
];
cpi
->
td
.
mb
.
nmvsadcost_hp
[
1
]
=
&
cpi
->
nmvsadcosts_hp
[
1
][
MV_MAX
];
cal_nmvsadcosts_hp
(
cpi
->
td
.
mb
.
nmvsadcost_hp
);
#ifdef OUTPUT_YUV_SKINMAP
yuv_skinmap_file
=
fopen
(
"skinmap.yuv"
,
"ab"
);
...
...
av1/encoder/encoder.h
View file @
a127a792
...
...
@@ -53,10 +53,6 @@ extern "C" {
#endif
typedef
struct
{
int
nmvjointcost
[
MV_JOINTS
];
int
nmvcosts
[
2
][
MV_VALS
];
int
nmvcosts_hp
[
2
][
MV_VALS
];
int
nmv_vec_cost
[
NMV_CONTEXTS
][
MV_JOINTS
];
int
nmv_costs
[
NMV_CONTEXTS
][
2
][
MV_VALS
];
int
nmv_costs_hp
[
NMV_CONTEXTS
][
2
][
MV_VALS
];
...
...
@@ -432,11 +428,6 @@ typedef struct AV1_COMP {
int
nmv_costs
[
NMV_CONTEXTS
][
2
][
MV_VALS
];
int
nmv_costs_hp
[
NMV_CONTEXTS
][
2
][
MV_VALS
];
int
nmvcosts
[
2
][
MV_VALS
];
int
nmvcosts_hp
[
2
][
MV_VALS
];
int
nmvsadcosts
[
2
][
MV_VALS
];
int
nmvsadcosts_hp
[
2
][
MV_VALS
];
int64_t
last_time_stamp_seen
;
int64_t
last_end_time_stamp_seen
;
int64_t
first_time_stamp_ever
;
...
...
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